Backed out a57ade621efb, 2a8fef2bd228, 632ce3e7d3ef (bug 799638) for bustage.

This commit is contained in:
Ryan VanderMeulen 2012-10-13 21:22:30 -04:00
parent e5fb3b6225
commit 543edbebda
2 changed files with 2 additions and 22 deletions

View File

@ -23,7 +23,6 @@ mozilla_StartupTimeline_Event(FIRST_LOAD_URI, "firstLoadURI")
#include "prtime.h"
#include "nscore.h"
#include "sampler.h"
#ifdef MOZ_LINKER
extern "C" {
@ -59,7 +58,6 @@ public:
}
static void Record(Event ev, PRTime when = PR_Now()) {
SAMPLE_MARKER(Describe(ev));
sStartupTimeline[ev] = when;
#ifdef MOZ_LINKER
if (__moz_linker_stats)

View File

@ -290,7 +290,6 @@ public:
JSObject *sample = NULL;
JSObject *frames = NULL;
JSObject *marker = NULL;
int readPos = mReadPos;
while (readPos != mLastFlushPos) {
@ -316,19 +315,6 @@ public:
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':
{
@ -1024,13 +1010,9 @@ void mozilla_sampler_init()
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()