Refactor the Heap into ThreadHeap to prepare for per thread heaps

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 {
 
@@ skipping 31 matching lines @@
         ASSERT(node->isUnused());
     }
     slots->m_next = m_slots;
     m_slots = slots;
 }
 
 // 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)
+void PersistentRegion::tracePersistentNodes(Visitor* visitor, ShouldTraceCallback shouldTrace)
 {
     m_freeListHead = nullptr;
     int persistentCount = 0;
     PersistentNodeSlots** prevNext = &m_slots;
     PersistentNodeSlots* slots = m_slots;
     while (slots) {
         PersistentNode* freeListNext = nullptr;
         PersistentNode* freeListLast = nullptr;
         int freeCount = 0;
         for (int i = 0; i < PersistentNodeSlots::slotCount; ++i) {
             PersistentNode* node = &slots->m_slot[i];
             if (node->isUnused()) {
                 if (!freeListNext)
                     freeListLast = node;
                 node->setFreeListNext(freeListNext);
                 freeListNext = node;
                 ++freeCount;
             } else {
+                if (shouldTrace && !shouldTrace(visitor, node))

[haraken, 2016/02/29 11:17:45]

Nit: Or you can implement PersistentRegion::shouldTracePersistentNode, which
unconditionally returns true. Then you won't need to check if shouldTrace is
nullptr or not.

[keishi, 2016/03/02 06:01:03]

Done.

+                    continue;
                 node->tracePersistentNode(visitor);
                 ++persistentCount;
             }
         }
         if (freeCount == PersistentNodeSlots::slotCount) {
             PersistentNodeSlots* deadSlots = slots;
             *prevNext = slots->m_next;
             slots = slots->m_next;
             delete deadSlots;
         } else {
             if (freeListLast) {
                 ASSERT(freeListNext);
                 ASSERT(!freeListLast->freeListNext());
                 freeListLast->setFreeListNext(m_freeListHead);
                 m_freeListHead = freeListNext;
             }
             prevNext = &slots->m_next;
             slots = slots->m_next;
         }
     }
-    ASSERT(persistentCount == m_persistentCount);

[haraken, 2016/02/29 11:17:45]

Can we keep this assert by incrementing persistentCount before the line 72?

[keishi, 2016/03/02 06:01:03]

Done.

 }
 
 namespace {
 class GCObject final : public GarbageCollected<GCObject> {
 public:
     DEFINE_INLINE_TRACE() { }
 };
 }
 
+bool CrossThreadPersistentRegion::shouldTracePersistentNode(Visitor* visitor, PersistentNode* node)
+{
+    CrossThreadPersistent<GCObject>* persistent = reinterpret_cast<CrossThreadPersistent<GCObject>*>(node->self());
+    ASSERT(persistent);
+    Address rawObject = reinterpret_cast<Address>(persistent->get());
+    if (!rawObject)
+        return false;
+    return visitor->visitorScope()->heap().threads().contains(ThreadState::fromObject(rawObject));
+}
+
 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());
             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->heap()->threadState() == threadState)
+            if (page->arena()->threadState() == threadState)
                 persistent->clear();
         }
         slots = slots->m_next;
     }
 }
 
 } // namespace blink