Bug 1330013: Correcting module names for captured stacks. r?gfritzsche draft
authorIaroslav (yarik) Sheptykin <yarik.sheptykin@googlemail.com>
Wed, 11 Jan 2017 21:34:42 +0100
changeset 459356 1267d19ab4e134f248fecb08055ebdbb08fe9ff7
parent 459259 63ad56438630b389efdb01632e153143cf3008ec
child 541874 a30f071366905eb70e844f71c85e278b361bc325
push id41199
push useryarik.sheptykin@googlemail.com
push dateWed, 11 Jan 2017 20:37:45 +0000
reviewersgfritzsche
bugs1330013
milestone53.0a1
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
@@ -2924,18 +2924,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 = {