Introduce ProcessHeap

third_party/WebKit/Source/platform/heap/Heap.h

 /*
  * 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 85 matching lines @@
     STATIC_ONLY(ObjectAliveTrait);
 public:
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     static bool isHeapObjectAlive(T* object)
     {
         static_assert(sizeof(T), "T must be fully defined");
         return object->isHeapObjectAlive();
     }
 };
 
+class PLATFORM_EXPORT ProcessHeap {
+    STATIC_ONLY(ProcessHeap);
+public:
+    static void init();
+
+    static CrossThreadPersistentRegion& crossThreadPersistentRegion();
+
+    static bool isLowEndDevice() { return s_isLowEndDevice; }
+    static void increaseTotalAllocatedObjectSize(size_t delta) { atomicAdd(&s_totalAllocatedObjectSize, static_cast<long>(delta)); }
+    static void decreaseTotalAllocatedObjectSize(size_t delta) { atomicSubtract(&s_totalAllocatedObjectSize, static_cast<long>(delta)); }
+    static size_t totalAllocatedObjectSize() { return acquireLoad(&s_totalAllocatedObjectSize); }
+    static void increaseTotalMarkedObjectSize(size_t delta) { atomicAdd(&s_totalMarkedObjectSize, static_cast<long>(delta)); }
+    static size_t totalMarkedObjectSize() { return acquireLoad(&s_totalMarkedObjectSize); }
+    static void increaseTotalAllocatedSpace(size_t delta) { atomicAdd(&s_totalAllocatedSpace, static_cast<long>(delta)); }
+    static void decreaseTotalAllocatedSpace(size_t delta) { atomicSubtract(&s_totalAllocatedSpace, static_cast<long>(delta)); }
+    static size_t totalAllocatedSpace() { return acquireLoad(&s_totalAllocatedSpace); }
+
+private:
+    static bool s_isLowEndDevice;
+    static size_t s_totalAllocatedSpace;
+    static size_t s_totalAllocatedObjectSize;
+    static size_t s_totalMarkedObjectSize;
+
+    friend class ThreadState;
+};
+
 class PLATFORM_EXPORT Heap {
     STATIC_ONLY(Heap);
 public:
     static void init();
     static void shutdown();
 
-    static CrossThreadPersistentRegion& crossThreadPersistentRegion();
-
 #if ENABLE(ASSERT)
     static BasePage* findPageFromAddress(Address);
     static BasePage* findPageFromAddress(const void* pointer) { return findPageFromAddress(reinterpret_cast<Address>(const_cast<void*>(pointer))); }
 #endif
 
     template<typename T>
     static inline bool isHeapObjectAlive(T* object)
     {
         static_assert(sizeof(T), "T must be fully defined");
         // The strongification of collections relies on the fact that once a
@@ skipping 142 matching lines @@
         ASSERT(gcInfoIndex >= 1);
         ASSERT(gcInfoIndex < GCInfoTable::maxIndex);
         ASSERT(s_gcInfoTable);
         const GCInfo* info = s_gcInfoTable[gcInfoIndex];
         ASSERT(info);
         return info;
     }
 
     static void setMarkedObjectSizeAtLastCompleteSweep(size_t size) { releaseStore(&s_markedObjectSizeAtLastCompleteSweep, size); }
     static size_t markedObjectSizeAtLastCompleteSweep() { return acquireLoad(&s_markedObjectSizeAtLastCompleteSweep); }
-    static void increaseAllocatedObjectSize(size_t delta) { atomicAdd(&s_allocatedObjectSize, static_cast<long>(delta)); }
-    static void decreaseAllocatedObjectSize(size_t delta) { atomicSubtract(&s_allocatedObjectSize, static_cast<long>(delta)); }
+    static void increaseAllocatedObjectSize(size_t delta)
+    {
+        atomicAdd(&s_allocatedObjectSize, static_cast<long>(delta));
+        ProcessHeap::increaseTotalAllocatedObjectSize(delta);
+    }
+    static void decreaseAllocatedObjectSize(size_t delta)
+    {
+        atomicSubtract(&s_allocatedObjectSize, static_cast<long>(delta));
+        ProcessHeap::decreaseTotalAllocatedObjectSize(delta);
+    }
     static size_t allocatedObjectSize() { return acquireLoad(&s_allocatedObjectSize); }
-    static void increaseMarkedObjectSize(size_t delta) { atomicAdd(&s_markedObjectSize, static_cast<long>(delta)); }
+    static void increaseMarkedObjectSize(size_t delta)
+    {
+        atomicAdd(&s_markedObjectSize, static_cast<long>(delta));
+        ProcessHeap::increaseTotalMarkedObjectSize(delta);
+    }
     static size_t markedObjectSize() { return acquireLoad(&s_markedObjectSize); }
-    static void increaseAllocatedSpace(size_t delta) { atomicAdd(&s_allocatedSpace, static_cast<long>(delta)); }
-    static void decreaseAllocatedSpace(size_t delta) { atomicSubtract(&s_allocatedSpace, static_cast<long>(delta)); }
+    static void increaseAllocatedSpace(size_t delta)
+    {
+        atomicAdd(&s_allocatedSpace, static_cast<long>(delta));
+        ProcessHeap::increaseTotalAllocatedSpace(delta);
+    }
+    static void decreaseAllocatedSpace(size_t delta)
+    {
+        atomicSubtract(&s_allocatedSpace, static_cast<long>(delta));
+        ProcessHeap::decreaseTotalAllocatedSpace(delta);
+    }
     static size_t allocatedSpace() { return acquireLoad(&s_allocatedSpace); }
     static size_t objectSizeAtLastGC() { return acquireLoad(&s_objectSizeAtLastGC); }
     static void increaseWrapperCount(size_t delta) { atomicAdd(&s_wrapperCount, static_cast<long>(delta)); }
     static void decreaseWrapperCount(size_t delta) { atomicSubtract(&s_wrapperCount, static_cast<long>(delta)); }
     static size_t wrapperCount() { return acquireLoad(&s_wrapperCount); }
     static size_t wrapperCountAtLastGC() { return acquireLoad(&s_wrapperCountAtLastGC); }
     static void increaseCollectedWrapperCount(size_t delta) { atomicAdd(&s_collectedWrapperCount, static_cast<long>(delta)); }
     static size_t collectedWrapperCount() { return acquireLoad(&s_collectedWrapperCount); }
     static size_t partitionAllocSizeAtLastGC() { return acquireLoad(&s_partitionAllocSizeAtLastGC); }
 
     static double estimatedMarkingTime();
     static void reportMemoryUsageHistogram();
     static void reportMemoryUsageForTracing();
-    static bool isLowEndDevice() { return s_isLowEndDevice; }
     static BlinkGC::GCReason lastGCReason() { return s_lastGCReason; }
 
-#if ENABLE(ASSERT)
-    static uint16_t gcGeneration() { return s_gcGeneration; }
-#endif
-
 private:
     // Reset counters that track live and allocated-since-last-GC sizes.
     static void resetHeapCounters();
 
     static int arenaIndexForObjectSize(size_t);
     static bool isNormalArenaIndex(int);
 
     static void decommitCallbackStacks();
 
     static CallbackStack* s_markingStack;
     static CallbackStack* s_postMarkingCallbackStack;
     static CallbackStack* s_globalWeakCallbackStack;
     static CallbackStack* s_ephemeronStack;
     static HeapDoesNotContainCache* s_heapDoesNotContainCache;
     static FreePagePool* s_freePagePool;
     static OrphanedPagePool* s_orphanedPagePool;
     static size_t s_allocatedSpace;
     static size_t s_allocatedObjectSize;
     static size_t s_objectSizeAtLastGC;
     static size_t s_markedObjectSize;
     static size_t s_markedObjectSizeAtLastCompleteSweep;
     static size_t s_wrapperCount;
     static size_t s_wrapperCountAtLastGC;
     static size_t s_collectedWrapperCount;
     static size_t s_partitionAllocSizeAtLastGC;
     static double s_estimatedMarkingTimePerByte;
-    static bool s_isLowEndDevice;
     static BlinkGC::GCReason s_lastGCReason;
-#if ENABLE(ASSERT)
-    static uint16_t s_gcGeneration;
-#endif
 
     friend class ThreadState;
 };
 
 template<typename T>
 struct IsEagerlyFinalizedType {
     STATIC_ONLY(IsEagerlyFinalizedType);
 private:
     typedef char YesType;
     struct NoType {
@@ skipping 186 matching lines @@
 void VisitorHelper<Derived>::handleWeakCell(Visitor* self, void* object)
 {
     T** cell = reinterpret_cast<T**>(object);
     if (*cell && !ObjectAliveTrait<T>::isHeapObjectAlive(*cell))
         *cell = nullptr;
 }
 
 } // namespace blink
 
 #endif // Heap_h