Changeset 96760 in webkit for trunk/Source/JavaScriptCore/heap

Timestamp:

Oct 5, 2011, 3:44:36 PM (14 years ago)

Author:

[email protected]

Message:

Added a simpler mechanism for registering one-off finalizers
​https://bugs.webkit.org/show_bug.cgi?id=69466

Reviewed by Oliver Hunt.

• heap/Heap.cpp:

(JSC::Heap::addFinalizer):
(JSC::Heap::FinalizerOwner::finalize):

• heap/Heap.h: New function for adding an arbitrary finalizer for an

arbitrary cell without declaring any special classes or Handles yourself.

• JavaScriptCore.exp: Fix build.

• runtime/Executable.cpp:

(JSC::ExecutableBase::clearCode):
(JSC::ExecutableBase::clearCodeVirtual):
(JSC::EvalExecutable::clearCodeVirtual):
(JSC::ProgramExecutable::clearCodeVirtual):
(JSC::FunctionExecutable::discardCode):
(JSC::FunctionExecutable::clearCodeVirtual):

• runtime/Executable.h:

(JSC::ExecutableBase::finishCreation): Use the new mechanism for eager
finalization of executables.

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::clearRareData):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::createRareDataIfNeeded):
(JSC::JSGlobalObject::registerWeakMap): Use the new mechanism for eager
finalization of weak maps.

Location:

trunk/Source/JavaScriptCore/heap

Files:

• Heap.cpp (modified) (1 diff)
• Heap.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -809 +809 @@
 }
 
+void Heap::addFinalizer(JSCell* cell, Finalizer finalizer)
+{
+    Weak<JSCell> weak(*globalData(), cell, &m_finalizerOwner, reinterpret_cast<void*>(finalizer));
+    weak.leakHandle(); // Balanced by FinalizerOwner::finalize().
+}
+
+void Heap::FinalizerOwner::finalize(Handle<Unknown> handle, void* context)
+{
+    Weak<JSCell> weak(Weak<JSCell>::Adopt, handle);
+    Finalizer finalizer = reinterpret_cast<Finalizer>(context);
+    finalizer(weak.get());
+}
+
 } // namespace JSC

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -93 +93 @@
         void* allocate(size_t);
 
+        typedef void (*Finalizer)(JSCell*);
+        void addFinalizer(JSCell*, Finalizer);
+
         void notifyIsSafeToCollect() { m_isSafeToCollect = true; }
         void collectAllGarbage();
@@ -131 +134 @@
         static const size_t minExtraCost = 256;
         static const size_t maxExtraCost = 1024 * 1024;
+        
+        class FinalizerOwner : public WeakHandleOwner {
+            virtual void finalize(Handle<Unknown>, void* context);
+        };
 
         bool isValidAllocation(size_t);
@@ -194 +201 @@
         HandleStack m_handleStack;
         JettisonedCodeBlocks m_jettisonedCodeBlocks;
+        FinalizerOwner m_finalizerOwner;
         
         bool m_isSafeToCollect;