Bug 579586 - TM: remove doubles from GCTIMER (r=jorendorff)
authorGregor Wagner <anygregor@gmail.com>
Tue, 20 Jul 2010 09:52:02 -0700
changeset 48509 c82cc721f6d98dd74a178ec1b881f7cb5a7f123a
parent 48508 a8d0c83fe7c7b9da0d8f86ade122869def3eef00
child 48511 63647e3ee0d513a4a64c36dbd85b8725af9a9e1f
push id14748
push userrsayre@mozilla.com
push dateSun, 01 Aug 2010 00:33:23 +0000
treeherdermozilla-central@f0df797bb2a9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs579586
milestone2.0b2pre
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 579586 - TM: remove doubles from GCTIMER (r=jorendorff)
js/src/gnuplot/gcTimer.gnu
js/src/jsgc.cpp
--- a/js/src/gnuplot/gcTimer.gnu
+++ b/js/src/gnuplot/gcTimer.gnu
@@ -1,10 +1,10 @@
 # gnuplot script to visualize GCMETER results.
-# usage: "gnuplot gcTimer.pl >outputfile.png"
+# usage: "gnuplot gcTimer.gnu >outputfile.png"
 
 set terminal png
 # set Title
 set title "Title goes here!"
 set datafile missing "-"
 set noxtics
 set ytics nomirror
 set ylabel "Cycles [1E6]"
@@ -15,11 +15,10 @@ set style data linespoints
 
 #set data file
 plot 'gcTimer.dat' using 2 title columnheader(2), \
 '' u 3 title columnheader(3), \
 '' u 4 title columnheader(4), \
 '' u 5 title columnheader(5) with points, \
 '' u 6 title columnheader(6) with points, \
 '' u 7 title columnheader(7) with points, \
-'' u 8 title columnheader(8) with points, \
-'' u 9 title columnheader(9) with points axis x1y2, \
-'' u 10 title columnheader(10) with points axis x1y2
+'' u 8 title columnheader(8) with points axis x1y2, \
+'' u 9 title columnheader(9) with points axis x1y2
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2864,23 +2864,21 @@ struct GCTimer {
                         (double)(startSweep - startMark) / 1e6,
                         (double)(sweepDestroyEnd - startSweep) / 1e6);
             } else {
                 static FILE *gcFile;
 
                 if (!gcFile) {
                     gcFile = fopen("gcTimer.dat", "w");
 
-                    fprintf(gcFile, "     AppTime,  Total,   Mark,  Sweep,");
-                    fprintf(gcFile, " FinObj, FinStr, FinDbl,");
-                    fprintf(gcFile, " Destroy,  newChunks, destoyChunks\n");
+                    fprintf(gcFile, "     AppTime,  Total,   Mark,  Sweep, FinObj,");
+                    fprintf(gcFile, " FinStr,  Destroy,  newChunks, destoyChunks\n");
                 }
                 JS_ASSERT(gcFile);
-                fprintf(gcFile, "%12.1f, %6.1f, %6.1f, %6.1f, %6.1f, %6.1f,"\
-                                 " %6.1f, %7.1f, ",
+                fprintf(gcFile, "%12.1f, %6.1f, %6.1f, %6.1f, %6.1f, %6.1f,  %7.1f, ",
                         (double)(enter - getFirstEnter()) / 1e6,
                         (double)(end - enter) / 1e6,
                         (double)(startSweep - startMark) / 1e6,
                         (double)(sweepDestroyEnd - startSweep) / 1e6,
                         (double)(sweepObjectEnd - startSweep) / 1e6,
                         (double)(sweepStringEnd - sweepObjectEnd) / 1e6,
                         (double)(sweepDestroyEnd - sweepStringEnd) / 1e6);
                 fprintf(gcFile, "%10d, %10d \n", newChunkCount,