PartitionAlloc: Centralize Partition allocators into one place (Part 1)

Source/wtf/Partitions.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 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "WTF.h"
+#include "wtf/Partitions.h"
 
 #include "wtf/DefaultAllocator.h"
 #include "wtf/FastMalloc.h"
 
 namespace WTF {
 
 extern void initializeThreading();
 
 bool s_initialized;
 bool s_shutdown;
 bool Partitions::s_initialized;
+
 PartitionAllocatorGeneric Partitions::m_bufferAllocator;
+SizeSpecificPartitionAllocator<3328> Partitions::m_objectModelAllocator;
+SizeSpecificPartitionAllocator<1024> Partitions::m_renderingAllocator;
 
 void initialize(TimeFunction currentTimeFunction, TimeFunction monotonicallyIncreasingTimeFunction)
 {
     // WTF, and Blink in general, cannot handle being re-initialized, even if shutdown first.
     // Make that explicit here.
     ASSERT(!s_initialized);
     ASSERT(!s_shutdown);
     s_initialized = true;
     Partitions::initialize();
     setCurrentTimeFunction(currentTimeFunction);
@@ skipping 14 matching lines @@
     return s_shutdown;
 }
 
 void Partitions::initialize()
 {
     static int lock = 0;
     // Guard against two threads hitting here in parallel.
     spinLockLock(&lock);
     if (!s_initialized) {
         m_bufferAllocator.init();
+        m_objectModelAllocator.init();
+        m_renderingAllocator.init();
         s_initialized = true;
     }
     spinLockUnlock(&lock);
 }
 
 void Partitions::shutdown()
 {
     fastMallocShutdown();
+
+    // We could ASSERT here for a memory leak within the partition, but it leads
+    // to very hard to diagnose ASSERTs, so it's best to leave leak checking for
+    // the valgrind and heapcheck bots, which run without partitions.
+    (void) m_renderingAllocator.shutdown();
+    (void) m_objectModelAllocator.shutdown();
     m_bufferAllocator.shutdown();

[Chris Evans, 2015/03/30 18:41:36]

Nit: we're also ignoring a fairly useful return code from this third shutdown,
so I recommend making it explicit that this is deliberate too with another
(void) prefix.

[haraken, 2015/03/30 23:06:18]

Done.

 }
 
 } // namespace WTF