Changeset 188846 in webkit for trunk/Source/JavaScriptCore/runtime/VM.cpp

Timestamp:

Aug 23, 2015, 7:07:27 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling back in r188792.
​https://bugs.webkit.org/show_bug.cgi?id=148347

Previously reverted changesets:

"Unify code paths for manually deleting all code"
​https://bugs.webkit.org/show_bug.cgi?id=148280
​http://trac.webkit.org/changeset/188792

The previous patch caused some inspector tests to hang because it
introduced extra calls to sourceParsed, and sourceParsed is
pathologically slow in WK1 debug builds. This patch restores pre-existing
code to limit calls to sourceParsed, excluding code not being debugged
(i.e., inspector code).

File:

• trunk/Source/JavaScriptCore/runtime/VM.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -87 +87 @@
 #include "TypeProfilerLog.h"
 #include "UnlinkedCodeBlock.h"
+#include "VMEntryScope.h"
 #include "Watchdog.h"
 #include "WeakGCMapInlines.h"
@@ -471 +472 @@
 }
 
+void VM::whenIdle(std::function<void()> callback)
+{
+    if (!entryScope) {
+        callback();
+        return;
+    }
+
+    entryScope->addDidPopListener(callback);
+}
+
 void VM::deleteAllCode()
 {
-    m_codeCache->clear();
-    m_regExpCache->deleteAllCode();
+    whenIdle([this]() {
+        m_codeCache->clear();
+        m_regExpCache->deleteAllCode();
 #if ENABLE(DFG_JIT)
-    DFG::completeAllPlansForVM(*this);
-#endif
-    heap.deleteAllCompiledCode();
-    heap.deleteAllUnlinkedFunctionCode();
-    heap.reportAbandonedObjectGraph();
+        DFG::completeAllPlansForVM(*this);
+#endif
+        heap.deleteAllCompiledCode();
+        heap.deleteAllUnlinkedFunctionCode();
+        heap.reportAbandonedObjectGraph();
+    });
 }