Commits

Andrew Sutherland committed e6eeba3

compilation passed; last commit had a dumb oversight

  • Participants
  • Parent commits eb07827

Comments (0)

Files changed (1)

File jsprobes-dispatch-integration

 # HG changeset patch
-# Parent e370f4f4853a70c0a335985bb291cc4a1607e1c8
+# Parent d4ef1c7150681cf048b3f3edc7c2ce8a5c8d8d56
 integrate ProbeManager with jsprobes.h and the js shell (js.cpp)
 
 diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp
 +        if (!mgr || !mgr->fireProbe(GLOBAL_GC_DID_START, rt))
 +            ok = false;
 +    } else {
-+        if (!mgr || !mgr->fireProbe(COMPARTMENT_GC_DID_START, rt, compartment))
++        if (!mgr || !mgr->fireProbe(COMPARTMENT_GC_DID_START, rt))
 +            ok = false;
 +    }
 +#endif
 +        if (!mgr || !mgr->fireProbe(GLOBAL_GC_WILL_END, rt))
 +            ok = false;
 +    } else {
-+        if (!mgr || !mgr->fireProbe(COMPARTMENT_GC_WILL_END, rt, compartment))
++        if (!mgr || !mgr->fireProbe(COMPARTMENT_GC_WILL_END, rt))
 +            ok = false;
 +    }
 +#endif
  #endif
 +#ifdef MOZ_JSPROBES
 +    ProbeManager *mgr = ProbeManager::manager();
-+    if (!mgr || !mgr->fireProbe(GC_MARK_PHASE_START, compartment))
++    if (!mgr || !mgr->fireProbe(GC_MARK_PHASE_START))
 +        ok = false;
 +#endif
  
  #endif
 +#ifdef MOZ_JSPROBES
 +    ProbeManager *mgr = ProbeManager::manager();
-+    if (!mgr || !mgr->fireProbe(GC_MARK_PHASE_END, compartment))
++    if (!mgr || !mgr->fireProbe(GC_MARK_PHASE_END))
 +        ok = false;
 +#endif