From b89c24ee2094d1b7e73f7e3620f31a6c9727eb55 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 6 May 2014 17:25:26 -0700
Subject: [PATCH] Bug 958353 - Add finishCC() and ccSlice() methods for testing
 incremental cycle collection. r=smaug

---
 .../mochitest/chrome/test_cyclecollector.xul  | 16 +++++--
 js/xpconnect/idl/xpccomponents.idl            | 18 ++++++-
 js/xpconnect/src/XPCComponents.cpp            | 16 +++++++
 .../specialpowers/content/specialpowersAPI.js |  8 ++++
 xpcom/base/nsCycleCollector.cpp               | 48 +++++++++++++++++--
 xpcom/base/nsCycleCollector.h                 | 12 +++--
 6 files changed, 105 insertions(+), 13 deletions(-)

diff --git a/dom/tests/mochitest/chrome/test_cyclecollector.xul b/dom/tests/mochitest/chrome/test_cyclecollector.xul
index 57c133eead44..7c5c2bd2ceef 100644
--- a/dom/tests/mochitest/chrome/test_cyclecollector.xul
+++ b/dom/tests/mochitest/chrome/test_cyclecollector.xul
@@ -18,13 +18,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <script type="application/javascript">
   <![CDATA[
   /** Test for Bug  **/
+  let Ci = Components.interfaces;
   var obs = Components.classes["@mozilla.org/observer-service;1"]
-                      .getService(Components.interfaces.nsIObserverService);
+                      .getService(Ci.nsIObserverService);
   var didCall = false;
   var observer = {
     QueryInterface: function QueryInterface(aIID) {
-      if (aIID.equals(Components.interfaces.nsIObserver) ||
-          aIID.equals(Components.interfaces.nsISupports))
+      if (aIID.equals(Ci.nsIObserver) ||
+          aIID.equals(Ci.nsISupports))
         return this;
       throw Components.results.NS_NOINTERFACE;
     },
@@ -35,9 +36,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
     }
   };
 
+  // Make sure that we call the observer even if we're in the middle
+  // of an ICC when we add the observer. See bug 981033.
+  SpecialPowers.finishCC();
+  SpecialPowers.ccSlice(1);
+
   obs.addObserver(observer, "cycle-collector-begin", false);
-  window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-        .getInterface(Components.interfaces.nsIDOMWindowUtils).cycleCollect();
+
+  SpecialPowers.DOMWindowUtils.cycleCollect();
 
   ok(didCall, "Observer should have been called!");
   ]]>
diff --git a/js/xpconnect/idl/xpccomponents.idl b/js/xpconnect/idl/xpccomponents.idl
index fcb45c4265f3..2ccf9a982d0a 100644
--- a/js/xpconnect/idl/xpccomponents.idl
+++ b/js/xpconnect/idl/xpccomponents.idl
@@ -121,7 +121,7 @@ interface ScheduledGCCallback : nsISupports
 /**
 * interface of Components.utils
 */
-[scriptable, uuid(45b80e00-fb0d-439e-b7bf-54f24af0c4a6)]
+[scriptable, uuid(c9b6f5a0-cfe8-11e3-9c1a-0800200c9a66)]
 interface nsIXPCComponents_Utils : nsISupports
 {
 
@@ -260,6 +260,22 @@ interface nsIXPCComponents_Utils : nsISupports
      */
     void forceCC();
 
+    /*
+     * To be called from JS only.
+     *
+     * If any incremental CC is in progress, finish it. For testing.
+     */
+    void finishCC();
+
+    /*
+     * To be called from JS only.
+     *
+     * Do some cycle collector work, with the given work budget.
+     * The cost of calling Traverse() on a single object is set as 1.
+     * For testing.
+     */
+    void ccSlice(in long long budget);
+
     /*
      * To be called from JS only.
      *
diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 52e5a7973295..ee3da747a0f0 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -2786,6 +2786,22 @@ nsXPCComponents_Utils::ForceCC()
     return NS_OK;
 }
 
+/* void finishCC(); */
+NS_IMETHODIMP
+nsXPCComponents_Utils::FinishCC()
+{
+    nsCycleCollector_finishAnyCurrentCollection();
+    return NS_OK;
+}
+
+/* void ccSlice(long long budget); */
+NS_IMETHODIMP
+nsXPCComponents_Utils::CcSlice(int64_t budget)
+{
+    nsCycleCollector_collectSliceWork(budget);
+    return NS_OK;
+}
+
 /* void forceShrinkingGC (); */
 NS_IMETHODIMP
 nsXPCComponents_Utils::ForceShrinkingGC()
diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js
index ff5e96594d76..eb268ce39c34 100644
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -1317,6 +1317,14 @@ SpecialPowersAPI.prototype = {
     Cu.forceCC();
   },
 
+  finishCC: function() {
+    Cu.finishCC();
+  },
+
+  ccSlice: function(budget) {
+    Cu.ccSlice(budget);
+  },
+
   // Due to various dependencies between JS objects and C++ objects, an ordinary
   // forceGC doesn't necessarily clear all unused objects, thus the GC and CC
   // needs to run several times and when no other JS is running.
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 8a9d26214ed7..3d3e012f7278 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -1217,6 +1217,7 @@ public:
   void RemoveObjectFromGraph(void *aPtr);
 
   void PrepareForGarbageCollection();
+  void FinishAnyCurrentCollection();
 
   bool Collect(ccType aCCType,
                SliceBudget &aBudget,
@@ -3363,8 +3364,18 @@ nsCycleCollector::PrepareForGarbageCollection()
     return;
   }
 
+  FinishAnyCurrentCollection();
+}
+
+void
+nsCycleCollector::FinishAnyCurrentCollection()
+{
+  if (mIncrementalPhase == IdlePhase) {
+    return;
+  }
+
   SliceBudget unlimitedBudget;
-  PrintPhase("PrepareForGarbageCollection");
+  PrintPhase("FinishAnyCurrentCollection");
   // Use SliceCC because we only want to finish the CC in progress.
   Collect(SliceCC, unlimitedBudget, nullptr);
   MOZ_ASSERT(mIncrementalPhase == IdlePhase);
@@ -3871,10 +3882,25 @@ nsCycleCollector_collectSlice(int64_t aSliceTime)
 
   PROFILER_LABEL("CC", "nsCycleCollector_collectSlice");
   SliceBudget budget;
-  if (aSliceTime > 0) {
+  if (aSliceTime >= 0) {
     budget = SliceBudget::TimeBudget(aSliceTime);
-  } else if (aSliceTime == 0) {
-    budget = SliceBudget::WorkBudget(1);
+  }
+  data->mCollector->Collect(SliceCC, budget, nullptr);
+}
+
+void
+nsCycleCollector_collectSliceWork(int64_t aSliceWork)
+{
+  CollectorData *data = sCollectorData.get();
+
+  // We should have started the cycle collector by now.
+  MOZ_ASSERT(data);
+  MOZ_ASSERT(data->mCollector);
+
+  PROFILER_LABEL("CC", "nsCycleCollector_collectSliceWork");
+  SliceBudget budget;
+  if (aSliceWork >= 0) {
+    budget = SliceBudget::WorkBudget(aSliceWork);
   }
   data->mCollector->Collect(SliceCC, budget, nullptr);
 }
@@ -3893,6 +3919,20 @@ nsCycleCollector_prepareForGarbageCollection()
   data->mCollector->PrepareForGarbageCollection();
 }
 
+void
+nsCycleCollector_finishAnyCurrentCollection()
+{
+    CollectorData *data = sCollectorData.get();
+
+    MOZ_ASSERT(data);
+
+    if (!data->mCollector) {
+        return;
+    }
+
+    data->mCollector->FinishAnyCurrentCollection();
+}
+
 void
 nsCycleCollector_shutdown()
 {
diff --git a/xpcom/base/nsCycleCollector.h b/xpcom/base/nsCycleCollector.h
index 8f986a931453..40e44d87214c 100644
--- a/xpcom/base/nsCycleCollector.h
+++ b/xpcom/base/nsCycleCollector.h
@@ -37,16 +37,22 @@ void nsCycleCollector_forgetSkippable(bool aRemoveChildlessNodes = false,
 
 void nsCycleCollector_prepareForGarbageCollection();
 
+// If an incremental cycle collection is in progress, finish it.
+void nsCycleCollector_finishAnyCurrentCollection();
+
 void nsCycleCollector_dispatchDeferredDeletion(bool aContinuation = false);
 bool nsCycleCollector_doDeferredDeletion();
 
 void nsCycleCollector_collect(nsICycleCollectorListener *aManualListener);
 
-// If aSliceTime is negative, the CC will run to completion.  If aSliceTime
-// is 0, only a minimum quantum of work will be done.  Otherwise, aSliceTime
-// will be used as the time budget for the slice, in ms.
+// If aSliceTime is negative, the CC will run to completion. Otherwise,
+// aSliceTime will be used as the time budget for the slice, in ms.
 void nsCycleCollector_collectSlice(int64_t aSliceTime);
 
+// If aSliceTime is negative, the CC will run to completion. Otherwise,
+// aSliceTime will be used as the work budget for the slice.
+void nsCycleCollector_collectSliceWork(int64_t aSliceWork);
+
 uint32_t nsCycleCollector_suspectedCount();
 void nsCycleCollector_shutdown();