Bug 919078 - Add js to async profiler start options. r=BenWa
authorJed Davis <jld@mozilla.com>
Sat, 12 Oct 2013 13:56:21 -0400
changeset 164407 331fb081db007dc3751d11ee6177bc11421b1215
parent 164406 18c8f9d64847dbd0f20b3e44dbddc757defd3b7a
child 164408 761097c088cdc103936bfc78a653b17942c0b657
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
bugs919078
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 919078 - Add js to async profiler start options. r=BenWa
tools/profiler/platform-linux.cc
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -461,20 +461,22 @@ static void StartSignalHandler(int signa
   // XXX: Everything we do here is NOT async signal safe. We risk nasty things
   // like deadlocks but we typically only do this once so it tends to be ok.
   // See bug 909403
   const char* threadName = NULL;
   uint32_t threadCount = 0;
   char thread[256];
 
   // TODO support selecting features from profiler.options
-  const char* features[2] = {NULL, NULL};
+  const char* features[3] = {NULL, NULL, NULL};
   uint32_t featureCount = 0;
   features[0] = "leaf";
   featureCount++;
+  features[1] = "js";
+  featureCount++;
   const char* threadFeature = "threads";
 
   std::ifstream infile;
   infile.open("/data/local/tmp/profiler.options");
   if (infile.is_open()) {
     infile.getline(thread, 256);
     threadName = thread;
     threadCount = 1;