Ticket #2808: ShrinkingGCHack.diff

source/gui/GUIManager.cpp

@@ -379 +379 @@
 
     // We share the script runtime with everything else that runs in the same thread.
     // This call makes sure we trigger GC regularly even if the simulation is not running.
-    m_ScriptInterface->MaybeIncrementalRuntimeGC(1.0f);
     
+    //m_ScriptInterface->MaybeIncrementalRuntimeGC(1.0f);
+    
+    m_ScriptInterface->ShrinkingGC();
+    
     // Save an immutable copy so iterators aren't invalidated by tick handlers
     PageStackType pageStack = m_PageStack;
 

source/scriptinterface/ScriptInterface.cpp

@@ -230 +231 @@
         }
     }
     
+    void ShrinkingGC()
+    {    
+        int gcBytes = JS_GetGCParameter(m_rt, JSGC_BYTES);
+        int gcUnusedChunks = JS_GetGCParameter(m_rt, JSGC_UNUSED_CHUNKS);
+        int gcTotalChunks = JS_GetGCParameter(m_rt, JSGC_TOTAL_CHUNKS);
+        std::cout << "gcBytes: " << gcBytes << std::endl; // debugging
+        std::cout << "gcUnusedChunks: " << gcUnusedChunks << std::endl; // debugging
+        std::cout << "gcTotalChunks: " << gcTotalChunks << std::endl; // debugging
+
+        std::cout << "Calling a shrinking GC!" << std::endl;
+        
+        JS::PrepareForFullGC(m_rt);
+        JS::ShrinkingGC(m_rt, JS::gcreason::REFRESH_FRAME);
+        
+        std::cout << "gcBytes: " << gcBytes << std::endl; // debugging
+        std::cout << "gcUnusedChunks: " << gcUnusedChunks << std::endl; // debugging
+        std::cout << "gcTotalChunks: " << gcTotalChunks << std::endl; // debugging
+    }
+    
+    
     void RegisterContext(JSContext* cx)
     {
         m_Contexts.push_back(cx);
@@ -1424 +1445 @@
     m->m_runtime->MaybeIncrementalGC(delay);
 }
 
+void ScriptInterface::ShrinkingGC()
+{
+    m->m_runtime->ShrinkingGC();
+}
+
 void ScriptInterface::MaybeGC()
 {
     JS_MaybeGC(m->m_cx);

source/scriptinterface/ScriptInterface.h

@@ -363 +363 @@
      */
     void MaybeIncrementalRuntimeGC(double delay);
     
+    void ShrinkingGC();
+    
     /**
      * Triggers a full non-incremental garbage collection immediately. That should only be required in special cases and normally
      * you should try to use MaybeIncrementalRuntimeGC instead.