Bug 929763: Don't call TickSample::PopulateContext unless native stack walking is enabled; r=BenWa
authorAaron Klotz <aklotz@mozilla.com>
Tue, 22 Oct 2013 21:56:50 -0700
changeset 165567 ac4f0cba097a38a663760983f47b2b1eea810272
parent 165566 25ca894f17163b4545ec085fed8c51786f7e4539
child 165568 9d86e7b4520804b84224a9b862a0a1a388beb1a7
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBenWa
bugs929763
milestone27.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 929763: Don't call TickSample::PopulateContext unless native stack walking is enabled; r=BenWa
tools/profiler/TableTicker.cpp
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -615,22 +615,24 @@ SyncProfile* NewSyncProfile()
 
 SyncProfile* TableTicker::GetBacktrace()
 {
   SyncProfile* profile = NewSyncProfile();
 
   TickSample sample;
   sample.threadProfile = profile;
 
+#if defined(HAVE_NATIVE_UNWIND)
 #if defined(XP_WIN) || defined(LINUX)
   tickcontext_t context;
   sample.PopulateContext(&context);
 #elif defined(XP_MACOSX)
   sample.PopulateContext(nullptr);
 #endif
+#endif
 
   sample.isSamplingCurrentThread = true;
   sample.timestamp = mozilla::TimeStamp::Now();
 
   if (!HasUnwinderThread()) {
     profile->BeginUnwind();
   }