Bug 1330013: Correcting module names for captured stacks. r=gfritzsche
authorIaroslav (yarik) Sheptykin <yarik.sheptykin@googlemail.com>
Wed, 11 Jan 2017 21:34:42 +0100
changeset 374204 7dd21e62c1f82a5635d70844598949eb2b0a29a5
parent 374203 33c475c8f360dddf70271f42c67b9a5b803c4fbb
child 374205 eca7348f32d8410559e342bff1a7698ceb2e9a30
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche
bugs1330013
milestone53.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 1330013: Correcting module names for captured stacks. r=gfritzsche MozReview-Commit-ID: L5fkEDU3Kgz
toolkit/components/telemetry/Telemetry.cpp
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -2922,18 +2922,18 @@ GetStackAndModules(const std::vector<uin
     Ret.AddFrame(frame);
   }
 
 #ifdef MOZ_ENABLE_PROFILER_SPS
   for (unsigned i = 0, n = rawModules.GetSize(); i != n; ++i) {
     const SharedLibrary &info = rawModules.GetEntry(i);
     const std::string &name = info.GetName();
     std::string basename = name;
-#ifdef XP_MACOSX
-    // FIXME: We want to use just the basename as the libname, but the
+#if defined(XP_MACOSX) || defined(XP_LINUX)
+    // We want to use just the basename as the libname, but the
     // current profiler addon needs the full path name, so we compute the
     // basename in here.
     size_t pos = name.rfind('/');
     if (pos != std::string::npos) {
       basename = name.substr(pos + 1);
     }
 #endif
     mozilla::Telemetry::ProcessedStack::Module module = {