Bug 1530815: Call RLogConnector::CreateInstance on main, not STS, because that's where we init the nr_registry stuff normally. r=mjf
authorByron Campen [:bwc] <docfaraday@gmail.com>
Thu, 28 Feb 2019 20:20:34 +0000
changeset 519699 4ee6e4e37189ee6b1753df35f0fd64e629740c5b
parent 519698 56f40b43c0d4c3331e867f2a2cbd00ef3bb28591
child 519700 1b3f624ca31a091a86b9bfd045589de388354b7b
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmjf
bugs1530815
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1530815: Call RLogConnector::CreateInstance on main, not STS, because that's where we init the nr_registry stuff normally. r=mjf Differential Revision: https://phabricator.services.mozilla.com/D21376
media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp
--- a/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp
@@ -914,28 +914,34 @@ void MediaTransportHandlerSTS::ClearIceL
 
   RLogConnector* logs = RLogConnector::GetInstance();
   if (logs) {
     logs->Clear();
   }
 }
 
 void MediaTransportHandlerSTS::EnterPrivateMode() {
+  // Do this from calling thread, because that's what we do in CreateIceCtx...
+  RLogConnector::CreateInstance();
+
   if (!mStsThread->IsOnCurrentThread()) {
     mStsThread->Dispatch(
         WrapRunnable(RefPtr<MediaTransportHandlerSTS>(this),
                      &MediaTransportHandlerSTS::EnterPrivateMode),
         NS_DISPATCH_NORMAL);
     return;
   }
 
-  RLogConnector::CreateInstance()->EnterPrivateMode();
+  RLogConnector::GetInstance()->EnterPrivateMode();
 }
 
 void MediaTransportHandlerSTS::ExitPrivateMode() {
+  // Do this from calling thread, because that's what we do in CreateIceCtx...
+  RLogConnector::CreateInstance();
+
   if (!mStsThread->IsOnCurrentThread()) {
     mStsThread->Dispatch(
         WrapRunnable(RefPtr<MediaTransportHandlerSTS>(this),
                      &MediaTransportHandlerSTS::ExitPrivateMode),
         NS_DISPATCH_NORMAL);
     return;
   }