Back out 77b82d0464b4 for build failures (bug 716619)

js/src/ETWProvider.man

@@ -79,29 +79,29 @@
           <!-- GC -->
           <event symbol="EvtGCStart" value="1012" version="1"
                  channel="MozillaChannel" level="win:Informational"
-                 template="BooleanTemplate" task="Allocation" opcode="GCStart"
+                 template="CompartmentTemplate" task="Allocation" opcode="GCStart"
                  keywords="SampleKeyword" message="$(string.SampleProvider.SampleEvent.message)"/>
           <event symbol="EvtGCEnd" value="1013" version="1"
                  channel="MozillaChannel" level="win:Informational"
-                 template="BooleanTemplate" task="Allocation" opcode="GCEnd"
+                 template="CompartmentTemplate" task="Allocation" opcode="GCEnd"
                  keywords="SampleKeyword" message="$(string.SampleProvider.SampleEvent.message)"/>
 
           <event symbol="EvtGCStartMarkPhase" value="1014" version="1"
                  channel="MozillaChannel" level="win:Informational"
-                 template="VoidTemplate" task="Allocation" opcode="GCMarkStart"
+                 template="CompartmentTemplate" task="Allocation" opcode="GCMarkStart"
                  keywords="SampleKeyword" message="$(string.SampleProvider.SampleEvent.message)"/>
           <event symbol="EvtGCEndMarkPhase" value="1015" version="1"
                  channel="MozillaChannel" level="win:Informational"
-                 template="VoidTemplate" task="Allocation" opcode="GCMarkEnd"
+                 template="CompartmentTemplate" task="Allocation" opcode="GCMarkEnd"
                  keywords="SampleKeyword" message="$(string.SampleProvider.SampleEvent.message)"/>
                     
           <event symbol="EvtGCStartSweepPhase" value="1016" version="1"
                  channel="MozillaChannel" level="win:Informational"
-                 template="VoidTemplate" task="Allocation" opcode="GCSweepStart"
+                 template="CompartmentTemplate" task="Allocation" opcode="GCSweepStart"
                  keywords="SampleKeyword" message="$(string.SampleProvider.SampleEvent.message)"/>
           <event symbol="EvtGCEndSweepPhase" value="1017" version="1"
                  channel="MozillaChannel" level="win:Informational"
-                 template="VoidTemplate" task="Allocation" opcode="GCSweepEnd"
+                 template="CompartmentTemplate" task="Allocation" opcode="GCSweepEnd"
                  keywords="SampleKeyword" message="$(string.SampleProvider.SampleEvent.message)"/>
 
           <event symbol="EvtMemoryAcquire" value="1018" version="1"
@@ -231,8 +231,8 @@
             <data name="Size" inType="win:Int64" outType="xs:long"/>
           </template>
 
-          <template tid="BooleanTemplate">
-            <data name="Boolean" inType="win:Boolean" outType="xs:boolean"/>
+          <template tid="CompartmentTemplate">
+            <data name="Compartment" inType="win:Int64" outType="xs:long"/>
           </template>
 
           <template tid="MemoryLocationTemplate">
@@ -259,9 +259,6 @@
             <data name="Int" inType="win:Int32" outType="xs:int"/>
           </template>
 
-          <template tid="VoidTemplate">
-          </template>
-
         </templates>
       </provider>
     </events>

js/src/gc/Statistics.cpp

@@ -206,7 +206,7 @@ Statistics::beginGC(JSCompartment *comp, gcreason::Reason reason)
     triggerReason = reason;
 
     beginPhase(PHASE_GC);
-    Probes::GCStart(!!compartment);
+    Probes::GCStart(compartment);
 
     GCCrashData crashData;
     crashData.isCompartment = !!compartment;
@@ -283,7 +283,7 @@ Statistics::printStats()
 void
 Statistics::endGC()
 {
-    Probes::GCEnd(!!compartment);
+    Probes::GCEnd(compartment);
     endPhase(PHASE_GC);
     crash::SnapshotGCStack();
 
@@ -315,10 +315,16 @@ Statistics::beginPhase(Phase phase)
 {
     phaseStarts[phase] = PRMJ_Now();
 
-    if (phase == gcstats::PHASE_MARK)
-        Probes::GCStartMarkPhase();
-    else if (phase == gcstats::PHASE_SWEEP)
-        Probes::GCStartSweepPhase();
+    if (phase == gcstats::PHASE_SWEEP) {
+        Probes::GCStartSweepPhase(NULL);
+        if (!compartment) {
+            for (JSCompartment **c = runtime->compartments.begin();
+                 c != runtime->compartments.end(); ++c)
+            {
+                Probes::GCStartSweepPhase(*c);
+            }
+        }
+    }
 }
 
 void
@@ -327,10 +333,16 @@ Statistics::endPhase(Phase phase)
     phaseEnds[phase] = PRMJ_Now();
     phaseTimes[phase] += phaseEnds[phase] - phaseStarts[phase];
 
-    if (phase == gcstats::PHASE_MARK)
-        Probes::GCEndMarkPhase();
-    else if (phase == gcstats::PHASE_SWEEP)
-        Probes::GCEndSweepPhase();
+    if (phase == gcstats::PHASE_SWEEP) {
+        if (!compartment) {
+            for (JSCompartment **c = runtime->compartments.begin();
+                 c != runtime->compartments.end(); ++c)
+            {
+                Probes::GCEndSweepPhase(*c);
+            }
+        }
+        Probes::GCEndSweepPhase(NULL);
+    }
 }
 
 } /* namespace gcstats */

js/src/jsprobes.h

@@ -197,14 +197,14 @@ bool releaseMemory(JSContext *cx, void *address, size_t nbytes);
  * Multiple compartments' GC will be interleaved during a global collection
  * (eg, compartment 1 starts, compartment 2 starts, compartment 1 ends, ...)
  */
-bool GCStart(bool isFull);
-bool GCEnd(bool isFull);
+bool GCStart(JSCompartment *compartment);
+bool GCEnd(JSCompartment *compartment);
 
-bool GCStartMarkPhase();
-bool GCEndMarkPhase();
+bool GCStartMarkPhase(JSCompartment *compartment);
+bool GCEndMarkPhase(JSCompartment *compartment);
 
-bool GCStartSweepPhase();
-bool GCEndSweepPhase();
+bool GCStartSweepPhase(JSCompartment *compartment);
+bool GCEndSweepPhase(JSCompartment *compartment);
 
 /*
  * Various APIs for inserting custom probe points. These might be used to mark