Remove orphaned pages from Oilpan

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 188 matching lines @@
 
 void ThreadState::attachMainThread() {
   s_threadSpecific = new WTF::ThreadSpecific<ThreadState*>();
   new (s_mainThreadStateStorage) ThreadState();
 }
 
 void ThreadState::attachCurrentThread() {
   new ThreadState();
 }
 
-void ThreadState::cleanupPages() {
+void ThreadState::removeAllPages() {
   ASSERT(checkThread());
   for (int i = 0; i < BlinkGC::NumberOfArenas; ++i)
-    m_arenas[i]->cleanupPages();
+    m_arenas[i]->removeAllPages();
 }
 
 void ThreadState::runTerminationGC() {
   if (isMainThread()) {
-    cleanupPages();
+    removeAllPages();
     return;
   }
   ASSERT(checkThread());
 
   // Finish sweeping.
   completeSweep();
 
   releaseStaticPersistentNodes();
 
   // From here on ignore all conservatively discovered
@@ skipping 24 matching lines @@
     oldCount = currentCount;
     currentCount = getPersistentRegion()->numberOfPersistents();
   }
   // We should not have any persistents left when getting to this point,
   // if we have it is probably a bug so adding a debug ASSERT to catch this.
   ASSERT(!currentCount);
   // All of pre-finalizers should be consumed.
   ASSERT(m_orderedPreFinalizers.isEmpty());
   RELEASE_ASSERT(gcState() == NoGCScheduled);
 
-  // Add pages to the orphaned page pool to ensure any global GCs from this
-  // point on will not trace objects on this thread's arenas.
-  cleanupPages();
+  removeAllPages();
 }
 
 void ThreadState::detachCurrentThread() {
   ThreadState* state = current();
   state->heap().detach(state);
   RELEASE_ASSERT(state->gcState() == ThreadState::NoGCScheduled);
   delete state;
 }
 
 NO_SANITIZE_ADDRESS
@@ skipping 84 matching lines @@
       deadSize(Vector<size_t>(numObjectTypes)) {}
 
 void ThreadState::pushThreadLocalWeakCallback(void* object,
                                               WeakCallback callback) {
   CallbackStack::Item* slot = m_threadLocalWeakCallbackStack->allocateEntry();
   *slot = CallbackStack::Item(object, callback);
 }
 
 bool ThreadState::popAndInvokeThreadLocalWeakCallback(Visitor* visitor) {
   ASSERT(checkThread());
-  // For weak processing we should never reach orphaned pages since orphaned
-  // pages are not traced and thus objects on those pages are never be
-  // registered as objects on orphaned pages. We cannot assert this here since
-  // we might have an off-heap collection. We assert it in
-  // ThreadHeap::pushThreadLocalWeakCallback.
   if (CallbackStack::Item* item = m_threadLocalWeakCallbackStack->pop()) {
     item->call(visitor);
     return true;
   }
   return false;
 }
 
 void ThreadState::threadLocalWeakProcessing() {
   ASSERT(checkThread());
   ASSERT(!sweepForbidden());
@@ skipping 1267 matching lines @@
       // state.
       heap().visitStackRoots(visitor.get());
 
       // 3. Transitive closure to trace objects including ephemerons.
       heap().processMarkingStack(visitor.get());
 
       heap().postMarkingProcessing(visitor.get());
       heap().globalWeakProcessing(visitor.get());
     }
 
-    // Now we can delete all orphaned pages because there are no dangling
-    // pointers to the orphaned pages.  (If we have such dangling pointers,
-    // we should have crashed during marking before getting here.)
-    heap().getOrphanedPagePool()->decommitOrphanedPages();
-
     double markingTimeInMilliseconds = WTF::currentTimeMS() - startTime;
     heap().heapStats().setEstimatedMarkingTimePerByte(
         totalObjectSize ? (markingTimeInMilliseconds / 1000 / totalObjectSize)
                         : 0);
 
 #if PRINT_HEAP_STATS
     dataLogF(
         "ThreadHeap::collectGarbage (gcReason=%s, lazySweeping=%d, "
         "time=%.1lfms)\n",
         gcReasonString(reason), gcType == BlinkGC::GCWithoutSweep,
@@ skipping 79 matching lines @@
     collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep,
                    BlinkGC::ForcedGC);
     size_t liveObjects = heap().heapStats().markedObjectSize();
     if (liveObjects == previousLiveObjects)
       break;
     previousLiveObjects = liveObjects;
   }
 }
 
 }  // namespace blink