Changeset 285653 in webkit

Timestamp:

Nov 11, 2021, 1:24:11 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Rename Heap::isCurrentThreadBusy() to Heap::currentThreadIsDoingGCWork().
​https://bugs.webkit.org/show_bug.cgi?id=233005
rdar://85307204

Reviewed by Saam Barati.

Source/JavaScriptCore:

This rename clarifies what the "busy" part is about. Also remove some unused code:
Heap::isValidAllocation(), isValidThreadState(), and isValidSharedInstanceThreadState().

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::jettison):

• heap/Heap.cpp:

(JSC::Heap::currentThreadIsDoingGCWork):
(JSC::Heap::isValidAllocation): Deleted.
(JSC::Heap::isCurrentThreadBusy): Deleted.

• heap/Heap.h:
• jsc.cpp:

(jscmain):

• runtime/VM.h:

(JSC::VM::isCollectorBusyOnCurrentThread):

Source/WebCore:

• bindings/js/GCController.cpp:

(WebCore::GCController::garbageCollectNow):
(WebCore::GCController::garbageCollectNowIfNotDoneRecently):

• workers/WorkerGlobalScope.cpp:

(WebCore::WorkerGlobalScope::deleteJSCodeAndGC):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/bytecode/CodeBlock.cpp (modified) (2 diffs)
• JavaScriptCore/heap/Heap.cpp (modified) (3 diffs)
• JavaScriptCore/heap/Heap.h (modified) (2 diffs)
• JavaScriptCore/jsc.cpp (modified) (1 diff)
• JavaScriptCore/runtime/VM.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/GCController.cpp (modified) (2 diffs)
• WebCore/workers/WorkerGlobalScope.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-11-11  Mark Lam  <mark.lam@apple.com>
+
+        Rename Heap::isCurrentThreadBusy() to Heap::currentThreadIsDoingGCWork().
+        https://bugs.webkit.org/show_bug.cgi?id=233005
+        rdar://85307204
+
+        Reviewed by Saam Barati.
+
+        This rename clarifies what the "busy" part is about.  Also remove some unused code:
+        Heap::isValidAllocation(), isValidThreadState(), and isValidSharedInstanceThreadState().
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::jettison):
+        * heap/Heap.cpp:
+        (JSC::Heap::currentThreadIsDoingGCWork):
+        (JSC::Heap::isValidAllocation): Deleted.
+        (JSC::Heap::isCurrentThreadBusy): Deleted.
+        * heap/Heap.h:
+        * jsc.cpp:
+        (jscmain):
+        * runtime/VM.h:
+        (JSC::VM::isCollectorBusyOnCurrentThread):
+
 2021-11-11  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -2295 +2295 @@
         if (!jitCode()->dfgCommon()->invalidate()) {
             // We've already been invalidated.
-            RELEASE_ASSERT(this != replacement() || (vm.heap.isCurrentThreadBusy() && !vm.heap.isMarked(ownerExecutable())));
+            RELEASE_ASSERT(this != replacement() || (vm.heap.currentThreadIsDoingGCWork() && !vm.heap.isMarked(ownerExecutable())));
             return;
         }
@@ -2327 +2327 @@
     // Jettison can happen during GC. We don't want to install code to a dead executable
     // because that would add a dead object to the remembered set.
-    if (vm.heap.isCurrentThreadBusy() && !vm.heap.isMarked(ownerExecutable()))
+    if (vm.heap.currentThreadIsDoingGCWork() && !vm.heap.isMarked(ownerExecutable()))
         return;
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -139 +139 @@
 }
 
-bool isValidSharedInstanceThreadState(VM& vm)
-{
-    return vm.currentThreadIsHoldingAPILock();
-}
-
-bool isValidThreadState(VM& vm)
-{
-    if (vm.atomStringTable() != Thread::current().atomStringTable())
-        return false;
-
-    if (vm.isSharedInstance() && !isValidSharedInstanceThreadState(vm))
-        return false;
-
-    return true;
-}
-
 void recordType(VM& vm, TypeCountSet& set, JSCell* cell)
 {
@@ -2380 +2364 @@
 }
 
-bool Heap::isValidAllocation(size_t)
-{
-    if (!isValidThreadState(vm()))
-        return false;
-
-    if (isCurrentThreadBusy())
-        return false;
-    
-    return true;
-}
-
 void Heap::addFinalizer(JSCell* cell, CFinalizer finalizer)
 {
@@ -2537 +2510 @@
 }
 
-bool Heap::isCurrentThreadBusy()
+bool Heap::currentThreadIsDoingGCWork()
 {
     return Thread::mayBeGCThread() || mutatorState() != MutatorState::Running;

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -165 +165 @@
     // We're always busy on the collection threads. On the main thread, this returns true if we're
     // helping heap.
-    JS_EXPORT_PRIVATE bool isCurrentThreadBusy();
+    JS_EXPORT_PRIVATE bool currentThreadIsDoingGCWork();
     
     typedef void (*CFinalizer)(JSCell*);
@@ -427 +427 @@
     };
 
-    JS_EXPORT_PRIVATE bool isValidAllocation(size_t);
     JS_EXPORT_PRIVATE void reportExtraMemoryAllocatedSlowCase(size_t);
     JS_EXPORT_PRIVATE void deprecatedReportExtraMemorySlowCase(size_t);

trunk/Source/JavaScriptCore/jsc.cpp

@@ -3766 +3766 @@
         vm.deleteAllCode(DeleteAllCodeIfNotCollecting);
 
-        if (!vm.heap.isCurrentThreadBusy()) {
+        if (!vm.heap.currentThreadIsDoingGCWork()) {
             if (isSynchronous) {
                 vm.heap.collectNow(Sync, CollectionScope::Full);

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -1087 +1087 @@
     JS_EXPORT_PRIVATE void dumpRegExpTrace();
 
-    bool isCollectorBusyOnCurrentThread() { return heap.isCurrentThreadBusy(); }
+    bool isCollectorBusyOnCurrentThread() { return heap.currentThreadIsDoingGCWork(); }
 
 #if ENABLE(GC_VALIDATION)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-11  Mark Lam  <mark.lam@apple.com>
+
+        Rename Heap::isCurrentThreadBusy() to Heap::currentThreadIsDoingGCWork().
+        https://bugs.webkit.org/show_bug.cgi?id=233005
+        rdar://85307204
+
+        Reviewed by Saam Barati.
+
+        * bindings/js/GCController.cpp:
+        (WebCore::GCController::garbageCollectNow):
+        (WebCore::GCController::garbageCollectNowIfNotDoneRecently):
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::WorkerGlobalScope::deleteJSCodeAndGC):
+
 2021-11-11  Michael Catanzaro  <mcatanzaro@gnome.org>
 

trunk/Source/WebCore/bindings/js/GCController.cpp

@@ -93 +93 @@
 {
     JSLockHolder lock(commonVM());
-    if (!commonVM().heap.isCurrentThreadBusy()) {
+    if (!commonVM().heap.currentThreadIsDoingGCWork()) {
         commonVM().heap.collectNow(Sync, CollectionScope::Full);
         WTF::releaseFastMallocFreeMemory();
@@ -103 +103 @@
 #if USE(CF) || USE(GLIB)
     JSLockHolder lock(commonVM());
-    if (!commonVM().heap.isCurrentThreadBusy())
+    if (!commonVM().heap.currentThreadIsDoingGCWork())
         commonVM().heap.collectNowFullIfNotDoneRecently(Async);
 #else

trunk/Source/WebCore/workers/WorkerGlobalScope.cpp

@@ -576 +576 @@
 
     if (synchronous == Synchronous::Yes) {
-        if (!vm().heap.isCurrentThreadBusy()) {
+        if (!vm().heap.currentThreadIsDoingGCWork()) {
             vm().heap.collectNow(JSC::Sync, JSC::CollectionScope::Full);
             WTF::releaseFastMallocFreeMemory();
@@ -583 +583 @@
     }
 #if PLATFORM(IOS_FAMILY)
-    if (!vm().heap.isCurrentThreadBusy()) {
+    if (!vm().heap.currentThreadIsDoingGCWork()) {
         vm().heap.collectNowFullIfNotDoneRecently(JSC::Async);
         return;