Chromium Code Reviews| Index: Source/wtf/Partitions.cpp |
| diff --git a/Source/wtf/Partitions.cpp b/Source/wtf/Partitions.cpp |
| index c8f6e7500d803eea15b326e87bbd67075f7f1111..21f009d1fba76ae4fe68184a33d0cfb3282c149e 100644 |
| --- a/Source/wtf/Partitions.cpp |
| +++ b/Source/wtf/Partitions.cpp |
| @@ -45,20 +45,24 @@ SizeSpecificPartitionAllocator<3328> Partitions::m_objectModelAllocator; |
| SizeSpecificPartitionAllocator<1024> Partitions::m_layoutAllocator; |
| HistogramEnumerationFunction Partitions::m_histogramEnumeration = nullptr; |
| -void Partitions::initialize(HistogramEnumerationFunction histogramEnumeration) |
| +void Partitions::initialize() |
| { |
| - static int lock = 0; |
| - // Guard against two threads hitting here in parallel. |
| - spinLockLock(&lock); |
| + // TODO(bashi): Add ASSERT(isMainThread()). |
| + // This could be called before WTF::initialize() is called so we can't |
| + // rely on isMainThread() at this point. |
|
haraken
2015/06/17 14:20:33
Sorry, I noticed this file is already including Ma
bashi
2015/06/18 22:53:37
Removed.
|
| if (!s_initialized) { |
| m_fastMallocAllocator.init(); |
| m_bufferAllocator.init(); |
| m_objectModelAllocator.init(); |
| m_layoutAllocator.init(); |
| - m_histogramEnumeration = histogramEnumeration; |
| s_initialized = true; |
| } |
| - spinLockUnlock(&lock); |
| +} |
| + |
| +void Partitions::setHistogramEnumeration(HistogramEnumerationFunction histogramEnumeration) |
| +{ |
| + ASSERT(!m_histogramEnumeration); |
| + m_histogramEnumeration = histogramEnumeration; |
| } |
| void Partitions::shutdown() |