Merge 198825 "PartitionAlloc: Add a lock to Partitions::initiali..."

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 19 matching lines @@
 
 #include "config.h"
 #include "wtf/Partitions.h"
 
 #include "wtf/DefaultAllocator.h"
 #include "wtf/FastMalloc.h"
 #include "wtf/MainThread.h"
 
 namespace WTF {
 
-bool Partitions::s_initialized;
+int Partitions::s_initializationLock = 0;
+bool Partitions::s_initialized = false;
 
 PartitionAllocatorGeneric Partitions::m_fastMallocAllocator;
 PartitionAllocatorGeneric Partitions::m_bufferAllocator;
 SizeSpecificPartitionAllocator<3328> Partitions::m_objectModelAllocator;
 SizeSpecificPartitionAllocator<1024> Partitions::m_layoutAllocator;
 HistogramEnumerationFunction Partitions::m_histogramEnumeration = nullptr;
 
 void Partitions::initialize()
 {
+    spinLockLock(&s_initializationLock);
+
     if (!s_initialized) {
         m_fastMallocAllocator.init();
         m_bufferAllocator.init();
         m_objectModelAllocator.init();
         m_layoutAllocator.init();
         s_initialized = true;
     }
+
+    spinLockUnlock(&s_initializationLock);
 }
 
 void Partitions::setHistogramEnumeration(HistogramEnumerationFunction histogramEnumeration)
 {
     ASSERT(!m_histogramEnumeration);
     m_histogramEnumeration = histogramEnumeration;
 }
 
 void Partitions::shutdown()
 {
@@ skipping 44 matching lines @@
     // accessed only on the main thread.
     ASSERT(isMainThread());
 
     partitionDumpStatsGeneric(fastMallocPartition(), "fast_malloc_partition", partitionStatsDumper);
     partitionDumpStatsGeneric(bufferPartition(), "buffer_partition", partitionStatsDumper);
     partitionDumpStats(objectModelPartition(), "object_model_partition", partitionStatsDumper);
     partitionDumpStats(layoutPartition(), "layout_partition", partitionStatsDumper);
 }
 
 } // namespace WTF