Merge SignalPortPruned with SignalPortsRemoved in PortAllocatorSession

webrtc/p2p/base/p2ptransportchannel.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 120 matching lines @@
 // Add the allocator session to our list so that we know which sessions
 // are still active.
 void P2PTransportChannel::AddAllocatorSession(
     std::unique_ptr<PortAllocatorSession> session) {
   ASSERT(worker_thread_ == rtc::Thread::Current());
 
   session->set_generation(static_cast<uint32_t>(allocator_sessions_.size()));
   session->SignalPortReady.connect(this, &P2PTransportChannel::OnPortReady);
   session->SignalPortsRemoved.connect(this,
                                       &P2PTransportChannel::OnPortsRemoved);
-  session->SignalPortPruned.connect(this, &P2PTransportChannel::OnPortPruned);
   session->SignalCandidatesReady.connect(
       this, &P2PTransportChannel::OnCandidatesReady);
   session->SignalCandidatesRemoved.connect(
       this, &P2PTransportChannel::OnCandidatesRemoved);
   session->SignalCandidatesAllocationDone.connect(
       this, &P2PTransportChannel::OnCandidatesAllocationDone);
 
   // We now only want to apply new candidates that we receive to the ports
   // created by this new session because these are replacing those of the
   // previous sessions.
@@ skipping 1530 matching lines @@
       std::remove(removed_ports_.begin(), removed_ports_.end(), port),
       removed_ports_.end());
   LOG(INFO) << "Removed port because it is destroyed: " << ports_.size()
             << " remaining";
 }
 
 void P2PTransportChannel::OnPortsRemoved(
     PortAllocatorSession* session,
     const std::vector<PortInterface*>& ports) {
   ASSERT(worker_thread_ == rtc::Thread::Current());
-  LOG(LS_INFO) << "Remove " << ports.size() << " ports";
   for (PortInterface* port : ports) {
     if (RemovePort(port)) {
       LOG(INFO) << "Removed port: " << port->ToString() << " " << ports_.size()
                 << " remaining";
     }
   }
 }
 
 void P2PTransportChannel::OnCandidatesRemoved(
     PortAllocatorSession* session,
@@ skipping 20 matching lines @@
   // continually, so there is an implicit check on continual gathering here.
   if (!allocator_sessions_.empty() && allocator_session()->IsCleared()) {
     allocator_session()->RegatherOnFailedNetworks();
   }
 
   thread()->PostDelayed(RTC_FROM_HERE,
                         *config_.regather_on_failed_networks_interval, this,
                         MSG_REGATHER_ON_FAILED_NETWORKS);
 }
 
-void P2PTransportChannel::OnPortPruned(PortAllocatorSession* session,
-                                       PortInterface* port) {
-  if (RemovePort(port)) {
-    LOG(INFO) << "Removed port because it is pruned: " << port->ToString()
-              << " " << ports_.size() << " remaining";
-  }
-}
-
 bool P2PTransportChannel::RemovePort(PortInterface* port) {

[pthatcher1, 2016/07/27 18:38:11]

This should probably be called OnPortPruned

[honghaiz3, 2016/07/27 21:31:26]

Done.

   auto it = std::find(ports_.begin(), ports_.end(), port);
   // Don't need to do anything if the port has been deleted from the port list.
   if (it == ports_.end()) {
     return false;
   }
   ports_.erase(it);
   removed_ports_.push_back(port);
   return true;
 }
 
@@ skipping 141 matching lines @@
 
   // During the initial state when nothing has been pinged yet, return the first
   // one in the ordered |connections_|.
   return *(std::find_if(connections_.begin(), connections_.end(),
                         [conn1, conn2](Connection* conn) {
                           return conn == conn1 || conn == conn2;
                         }));
 }
 
 }  // namespace cricket