Backed out changeset aa78b751e325 (bug 1083694)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 21 Nov 2014 08:04:01 +0100
changeset 241088 76f62a288b7246954e34bcd86a61fe0749c8b3cd
parent 241087 95e10b3f1765f32a5e2d0e40f9c9c47cd1283bc4
child 241089 48cffc294f48a6a937b4f00079afcf709900e46a
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1083694
milestone36.0a1
backs outaa78b751e325dff76e9238280809d3c612b9e8cc
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 changeset aa78b751e325 (bug 1083694)
js/src/vm/TraceLogging.cpp
--- a/js/src/vm/TraceLogging.cpp
+++ b/js/src/vm/TraceLogging.cpp
@@ -418,22 +418,20 @@ TraceLoggerThread::stopEvent(uint32_t id
 
 void
 TraceLoggerThread::logTimestamp(uint32_t id)
 {
     if (enabled == 0)
         return;
 
     if (!events.ensureSpaceBeforeAdd()) {
-        uint64_t start = 0;
+        uint64_t start = rdtsc() - traceLoggers.startupTime;
 
-        if (graph.get()) {
-            start = rdtsc() - traceLoggers.startupTime;
+        if (graph.get())
             graph->log(events);
-        }
 
         iteration_++;
         events.clear();
 
         // Log the time it took to flush the events as being from the
         // Tracelogger.
         if (graph.get()) {
             MOZ_ASSERT(events.capacity() > 2);
@@ -442,17 +440,17 @@ TraceLoggerThread::logTimestamp(uint32_t
             entryStart.textId = TraceLogger_Internal;
 
             EventEntry &entryStop = events.pushUninitialized();
             entryStop.time = rdtsc() - traceLoggers.startupTime;
             entryStop.textId = TraceLogger_Stop;
         }
     }
 
-    uint64_t time = graph.get() ? rdtsc() - traceLoggers.startupTime : 0;
+    uint64_t time = rdtsc() - traceLoggers.startupTime;
 
     EventEntry &entry = events.pushUninitialized();
     entry.time = time;
     entry.textId = id;
 }
 
 TraceLoggerThreadState::TraceLoggerThreadState()
 {