Unify and generalize thread static persistent finalization.

third_party/WebKit/Source/platform/heap/PersistentNode.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/heap/PersistentNode.h"
 
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
+namespace {
+
+class DummyGCBase final : public GarbageCollected<DummyGCBase> {
+public:
+    DEFINE_INLINE_TRACE() { }
+};
+
+}
+
 PersistentRegion::~PersistentRegion()
 {
     PersistentNodeSlots* slots = m_slots;
     while (slots) {
         PersistentNodeSlots* deadSlots = slots;
         slots = slots->m_next;
         delete deadSlots;
     }
 }
 
@@ skipping 17 matching lines @@
     for (int i = 0; i < PersistentNodeSlots::slotCount; ++i) {
         PersistentNode* node = &slots->m_slot[i];
         node->setFreeListNext(m_freeListHead);
         m_freeListHead = node;
         ASSERT(node->isUnused());
     }
     slots->m_next = m_slots;
     m_slots = slots;
 }
 
+void PersistentRegion::releasePersistentNode(PersistentNode* persistentNode, ThreadState::PersistentClearCallback callback)
+{
+    ASSERT(!persistentNode->isUnused());
+    // 'self' is in use, containing the persistent wrapper object.
+    void* self = persistentNode->self();
+    if (callback) {
+        (*callback)(self);
+        ASSERT(persistentNode->isUnused());
+        return;
+    }
+    Persistent<DummyGCBase>* persistent = reinterpret_cast<Persistent<DummyGCBase>*>(self);
+    persistent->clear();
+    ASSERT(persistentNode->isUnused());
+}
+
 // This function traces all PersistentNodes. If we encounter
 // a PersistentNodeSlot that contains only freed PersistentNodes,
 // we delete the PersistentNodeSlot. This function rebuilds the free
 // list of PersistentNodes.
 void PersistentRegion::tracePersistentNodes(Visitor* visitor)
 {
     size_t debugMarkedObjectSize = ProcessHeap::totalMarkedObjectSize();
     base::debug::Alias(&debugMarkedObjectSize);
 
     m_freeListHead = nullptr;
@@ skipping 30 matching lines @@
                 freeListLast->setFreeListNext(m_freeListHead);
                 m_freeListHead = freeListNext;
             }
             prevNext = &slots->m_next;
             slots = slots->m_next;
         }
     }
     ASSERT(persistentCount == m_persistentCount);
 }
 
-namespace {
-class GCObject final : public GarbageCollected<GCObject> {
-public:
-    DEFINE_INLINE_TRACE() { }
-};
-}
-
 void CrossThreadPersistentRegion::prepareForThreadStateTermination(ThreadState* threadState)
 {
     // For heaps belonging to a thread that's detaching, any cross-thread persistents
     // pointing into them needs to be disabled. Do that by clearing out the underlying
     // heap reference.
     MutexLocker lock(m_mutex);
 
     // TODO(sof): consider ways of reducing overhead. (e.g., tracking number of active
     // CrossThreadPersistent<>s pointing into the heaps of each ThreadState and use that
     // count to bail out early.)
     PersistentNodeSlots* slots = m_persistentRegion->m_slots;
     while (slots) {
         for (int i = 0; i < PersistentNodeSlots::slotCount; ++i) {
             if (slots->m_slot[i].isUnused())
                 continue;
 
             // 'self' is in use, containing the cross-thread persistent wrapper object.
-            CrossThreadPersistent<GCObject>* persistent = reinterpret_cast<CrossThreadPersistent<GCObject>*>(slots->m_slot[i].self());
+            CrossThreadPersistent<DummyGCBase>* persistent = reinterpret_cast<CrossThreadPersistent<DummyGCBase>*>(slots->m_slot[i].self());
             ASSERT(persistent);
             void* rawObject = persistent->atomicGet();
             if (!rawObject)
                 continue;
             BasePage* page = pageFromObject(rawObject);
             ASSERT(page);
             // The main thread will upon detach just mark its heap pages as orphaned,
             // but not invalidate its CrossThreadPersistent<>s.
             if (page->orphaned())
                 continue;
             if (page->arena()->getThreadState() == threadState)
                 persistent->clear();
         }
         slots = slots->m_next;
     }
 }
 
 } // namespace blink