From 0c48158611e24d55d337bcf40c82d2af34db0d50 Mon Sep 17 00:00:00 2001 From: Benoit Girard Date: Mon, 16 Apr 2012 09:32:18 -0400 Subject: [PATCH] Bug 745556 - Include shared library info in text profile dump for android symbolication. r=jmuizelaar --- tools/profiler/TableTicker.cpp | 3 +++ tools/profiler/nsProfiler.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp index 61b6bbe0b5ee..cbdadab1eec5 100644 --- a/tools/profiler/TableTicker.cpp +++ b/tools/profiler/TableTicker.cpp @@ -372,6 +372,8 @@ private: bool mJankOnly; }; +std::string GetSharedLibraryInfoString(); + /** * This is an event used to save the profile on the main thread * to be sure that it is not being modified while saving. @@ -407,6 +409,7 @@ public: stream.open(buff); if (stream.is_open()) { stream << *(t->GetPrimaryThreadProfile()); + stream << "h-" << GetSharedLibraryInfoString() << std::endl; stream.close(); LOG("Saved to " FOLDER "profile_TYPE_PID.txt"); } else { diff --git a/tools/profiler/nsProfiler.cpp b/tools/profiler/nsProfiler.cpp index ca729910880c..65f2241a989a 100644 --- a/tools/profiler/nsProfiler.cpp +++ b/tools/profiler/nsProfiler.cpp @@ -105,7 +105,7 @@ AddSharedLibraryInfoToStream(std::ostream& aStream, SharedLibrary& aLib) aStream << "}"; } -static std::string +std::string GetSharedLibraryInfoString() { SharedLibraryInfo info = SharedLibraryInfo::GetInfoForSelf();