We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Fri, 25 Jun 2021 15:12:00 -0500
|
|
Subject: Bug 1654112 - Mirror Bug 1714577 - Part 3 - Register WebRTC threads
|
|
with the Gecko Profiler. r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D119412
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/d881b16dd8a6813feb5ce1516c2a7ebe0270e72d
|
|
---
|
|
rtc_base/platform_thread.cc | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc
|
|
index f75ce8c3dc..81e115b568 100644
|
|
--- a/rtc_base/platform_thread.cc
|
|
+++ b/rtc_base/platform_thread.cc
|
|
@@ -19,6 +19,8 @@
|
|
|
|
#include "rtc_base/checks.h"
|
|
|
|
+#include "MicroGeckoProfiler.h"
|
|
+
|
|
namespace rtc {
|
|
namespace {
|
|
|
|
@@ -183,6 +185,10 @@ PlatformThread PlatformThread::SpawnThread(
|
|
new std::function<void()>([thread_function = std::move(thread_function),
|
|
name = std::string(name), attributes] {
|
|
rtc::SetCurrentThreadName(name.c_str());
|
|
+
|
|
+ char stacktop;
|
|
+ AutoRegisterProfiler profiler(name.c_str(), &stacktop);
|
|
+
|
|
SetPriority(attributes.priority);
|
|
thread_function();
|
|
});
|