Backed out a57ade621efb, 2a8fef2bd228, 632ce3e7d3ef (bug 799638) for bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sat, 13 Oct 2012 21:22:30 -0400
changeset 118147 dfbaea0d50d1e032f9d879d0d03f6998087683b1
parent 118146 a57ade621efb04143daaa21c148cf4fd58605fe7
child 118148 ad6c79681a21a8984f831197719aa4c7150cda13
push id1997
push userakeybl@mozilla.com
push dateMon, 07 Jan 2013 21:25:26 +0000
treeherdermozilla-beta@4baf45cdcf21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs799638
milestone19.0a1
backs outa57ade621efb04143daaa21c148cf4fd58605fe7
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
Backed out a57ade621efb, 2a8fef2bd228, 632ce3e7d3ef (bug 799638) for bustage.
toolkit/components/startup/StartupTimeline.h
tools/profiler/TableTicker.cpp
--- a/toolkit/components/startup/StartupTimeline.h
+++ b/toolkit/components/startup/StartupTimeline.h
@@ -18,17 +18,16 @@ mozilla_StartupTimeline_Event(LIBRARIES_
 mozilla_StartupTimeline_Event(FIRST_LOAD_URI, "firstLoadURI")
 #else
 
 #ifndef mozilla_StartupTimeline
 #define mozilla_StartupTimeline
 
 #include "prtime.h"
 #include "nscore.h"
-#include "sampler.h"
 
 #ifdef MOZ_LINKER
 extern "C" {
 /* This symbol is resolved by the custom linker. The function it resolves
  * to dumps some statistics about the linker at the key events recorded
  * by the startup timeline. */
 extern void __moz_linker_stats(const char *str)
 NS_VISIBILITY_DEFAULT __attribute__((weak));
@@ -54,17 +53,16 @@ public:
     return sStartupTimeline[ev];
   }
 
   static const char *Describe(Event ev) {
     return sStartupTimelineDesc[ev];
   }
 
   static void Record(Event ev, PRTime when = PR_Now()) {
-    SAMPLE_MARKER(Describe(ev));
     sStartupTimeline[ev] = when;
 #ifdef MOZ_LINKER
     if (__moz_linker_stats)
       __moz_linker_stats(Describe(ev));
 #endif
   }
 
   static void RecordOnce(Event ev) {
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -285,17 +285,16 @@ public:
     JSObjectBuilder b(aCx);
 
     JSObject *profile = b.CreateObject();
     JSObject *samples = b.CreateArray();
     b.DefineProperty(profile, "samples", samples);
 
     JSObject *sample = NULL;
     JSObject *frames = NULL;
-    JSObject *marker = NULL;
 
     int readPos = mReadPos;
     while (readPos != mLastFlushPos) {
       // Number of tag consumed
       int incBy = 1;
       ProfileEntry entry = mEntries[readPos];
 
       // Read ahead to the next tag, if it's a 'd' tag process it now
@@ -311,29 +310,16 @@ public:
 
       switch (entry.mTagName) {
         case 's':
           sample = b.CreateObject();
           b.DefineProperty(sample, "name", tagStringData);
           frames = b.CreateArray();
           b.DefineProperty(sample, "frames", frames);
           b.ArrayPush(samples, sample);
-          // Created lazily
-          marker = NULL;
-          break;
-        case 'm':
-          {
-            if (sample) {
-              if (!marker) {
-                marker = b.CreateArray();
-                b.DefineProperty(sample, "marker", marker);
-              }
-              b.ArrayPush(marker, tagStringData);
-            }
-          }
           break;
         case 'r':
           {
             if (sample) {
               b.DefineProperty(sample, "responsiveness", entry.mTagFloat);
             }
           }
           break;
@@ -1019,23 +1005,19 @@ void mozilla_sampler_init()
   // We can't open pref so we use an environment variable
   // to know if we should trigger the profiler on startup
   // NOTE: Default
   const char *val = PR_GetEnv("MOZ_PROFILER_STARTUP");
   if (!val || !*val) {
     return;
   }
 
-  const char* features[] = {"js"
-#if defined(XP_WIN) || defined(XP_MACOSX)
-                         , "stackwalk"
-#endif
-                         };
+  const char* features = "js";
   mozilla_sampler_start(PROFILE_DEFAULT_ENTRY, PROFILE_DEFAULT_INTERVAL,
-                        features, mozilla::ArrayLength(features));
+                        &features, 1);
 }
 
 void mozilla_sampler_deinit()
 {
   mozilla_sampler_stop();
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
   // TODO Need to find a safe time to delete Stack