RTCStatsCollector: Utilize network thread to minimize thread hops.

webrtc/p2p/base/transportcontroller.cc

 /*
  *  Copyright 2015 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 99 matching lines @@
 }
 
 bool TransportController::GetLocalCertificate(
     const std::string& transport_name,
     rtc::scoped_refptr<rtc::RTCCertificate>* certificate) const {
   return network_thread_->Invoke<bool>(
       RTC_FROM_HERE, rtc::Bind(&TransportController::GetLocalCertificate_n,
                                this, transport_name, certificate));
 }
 
+bool TransportController::GetLocalCertificate_n(

[hbos, 2016/12/13 14:14:34]

All of these were moved after being made public, they've not been modified.

[hbos, 2016/12/14 14:56:31]

(Reverted the move after changing so that they can be invoked on either thread)

+    const std::string& transport_name,
+    rtc::scoped_refptr<rtc::RTCCertificate>* certificate) const {
+  RTC_DCHECK(network_thread_->IsCurrent());
+
+  const JsepTransport* t = GetJsepTransport(transport_name);
+  if (!t) {
+    return false;
+  }
+  return t->GetLocalCertificate(certificate);
+}
+
 std::unique_ptr<rtc::SSLCertificate>
 TransportController::GetRemoteSSLCertificate(
     const std::string& transport_name) const {
   return network_thread_->Invoke<std::unique_ptr<rtc::SSLCertificate>>(
       RTC_FROM_HERE, rtc::Bind(&TransportController::GetRemoteSSLCertificate_n,
                                this, transport_name));
 }
 
+std::unique_ptr<rtc::SSLCertificate>
+TransportController::GetRemoteSSLCertificate_n(
+    const std::string& transport_name) const {
+  RTC_DCHECK(network_thread_->IsCurrent());
+
+  // Get the certificate from the RTP channel's DTLS handshake. Should be
+  // identical to the RTCP channel's, since they were given the same remote
+  // fingerprint.
+  const RefCountedChannel* ch = GetChannel_n(transport_name, 1);
+  if (!ch) {
+    return nullptr;
+  }
+  return ch->dtls()->GetRemoteSSLCertificate();
+}
+
 bool TransportController::SetLocalTransportDescription(
     const std::string& transport_name,
     const TransportDescription& tdesc,
     ContentAction action,
     std::string* err) {
   return network_thread_->Invoke<bool>(
       RTC_FROM_HERE,
       rtc::Bind(&TransportController::SetLocalTransportDescription_n, this,
                 transport_name, tdesc, action, err));
 }
@@ skipping 37 matching lines @@
                                this, transport_name));
 }
 
 bool TransportController::GetStats(const std::string& transport_name,
                                    TransportStats* stats) {
   return network_thread_->Invoke<bool>(
       RTC_FROM_HERE,
       rtc::Bind(&TransportController::GetStats_n, this, transport_name, stats));
 }
 
+bool TransportController::GetStats_n(const std::string& transport_name,
+                                     TransportStats* stats) {
+  RTC_DCHECK(network_thread_->IsCurrent());
+
+  JsepTransport* transport = GetJsepTransport(transport_name);
+  if (!transport) {
+    return false;
+  }
+  return transport->GetStats(stats);
+}
+
 void TransportController::SetMetricsObserver(
     webrtc::MetricsObserverInterface* metrics_observer) {
   return network_thread_->Invoke<void>(
       RTC_FROM_HERE, rtc::Bind(&TransportController::SetMetricsObserver_n, this,
                                metrics_observer));
 }
 
 TransportChannel* TransportController::CreateTransportChannel_n(
     const std::string& transport_name,
     int component) {
@@ skipping 289 matching lines @@
     kv.second->SetLocalCertificate(certificate_);
   }
   // ... and for the DTLS channel, which needs it for the DTLS handshake.
   for (auto& channel : channels_) {
     bool set_cert_success = channel.dtls()->SetLocalCertificate(certificate);
     RTC_DCHECK(set_cert_success);
   }
   return true;
 }
 
-bool TransportController::GetLocalCertificate_n(
-    const std::string& transport_name,
-    rtc::scoped_refptr<rtc::RTCCertificate>* certificate) const {
-  RTC_DCHECK(network_thread_->IsCurrent());
-
-  const JsepTransport* t = GetJsepTransport(transport_name);
-  if (!t) {
-    return false;
-  }
-  return t->GetLocalCertificate(certificate);
-}
-
-std::unique_ptr<rtc::SSLCertificate>
-TransportController::GetRemoteSSLCertificate_n(
-    const std::string& transport_name) const {
-  RTC_DCHECK(network_thread_->IsCurrent());
-
-  // Get the certificate from the RTP channel's DTLS handshake. Should be
-  // identical to the RTCP channel's, since they were given the same remote
-  // fingerprint.
-  const RefCountedChannel* ch = GetChannel_n(transport_name, 1);
-  if (!ch) {
-    return nullptr;
-  }
-  return ch->dtls()->GetRemoteSSLCertificate();
-}
-
 bool TransportController::SetLocalTransportDescription_n(
     const std::string& transport_name,
     const TransportDescription& tdesc,
     ContentAction action,
     std::string* err) {
   RTC_DCHECK(network_thread_->IsCurrent());
 
   JsepTransport* transport = GetJsepTransport(transport_name);
   if (!transport) {
     // If we didn't find a transport, that's not an error;
@@ skipping 128 matching lines @@
     const std::string& transport_name) const {
   RTC_DCHECK(network_thread_->IsCurrent());
 
   const JsepTransport* transport = GetJsepTransport(transport_name);
   if (!transport) {
     return false;
   }
   return transport->ready_for_remote_candidates();
 }
 
-bool TransportController::GetStats_n(const std::string& transport_name,
-                                     TransportStats* stats) {
-  RTC_DCHECK(network_thread_->IsCurrent());
-
-  JsepTransport* transport = GetJsepTransport(transport_name);
-  if (!transport) {
-    return false;
-  }
-  return transport->GetStats(stats);
-}
-
 void TransportController::SetMetricsObserver_n(
     webrtc::MetricsObserverInterface* metrics_observer) {
   RTC_DCHECK(network_thread_->IsCurrent());
   metrics_observer_ = metrics_observer;
   for (auto& channel : channels_) {
     channel.dtls()->SetMetricsObserver(metrics_observer);
   }
 }
 
 void TransportController::OnChannelWritableState_n(
@@ skipping 133 matching lines @@
         RTC_FROM_HERE, this, MSG_ICEGATHERINGSTATE,
         new rtc::TypedMessageData<IceGatheringState>(new_gathering_state));
   }
 }
 
 void TransportController::OnDtlsHandshakeError(rtc::SSLHandshakeError error) {
   SignalDtlsHandshakeError(error);
 }
 
 }  // namespace cricket