Index: third_party/WebKit/Source/wtf/Partitions.cpp |
diff --git a/third_party/WebKit/Source/wtf/Partitions.cpp b/third_party/WebKit/Source/wtf/Partitions.cpp |
index 39914b4a9c89e2712cf0ac58fb024839bfaaa612..2e97e011efebd74f183c15f915778ec8ca7b9a0e 100644 |
--- a/third_party/WebKit/Source/wtf/Partitions.cpp |
+++ b/third_party/WebKit/Source/wtf/Partitions.cpp |
@@ -39,7 +39,7 @@ namespace WTF { |
const char* const Partitions::kAllocatedObjectPoolName = "partition_alloc/allocated_objects"; |
-int Partitions::s_initializationLock = 0; |
+SpinLock Partitions::s_initializationLock; |
Primiano Tucci (use gerrit)
2015/12/07 10:11:57
This is now a static initializer, some bots are un
|
bool Partitions::s_initialized = false; |
PartitionAllocatorGeneric Partitions::m_fastMallocAllocator; |
@@ -50,7 +50,7 @@ HistogramEnumerationFunction Partitions::m_histogramEnumeration = nullptr; |
void Partitions::initialize(HistogramEnumerationFunction histogramEnumeration) |
{ |
- spinLockLock(&s_initializationLock); |
+ SpinLock::Guard guard(s_initializationLock); |
if (!s_initialized) { |
partitionAllocGlobalInit(&Partitions::handleOutOfMemory); |
@@ -61,13 +61,11 @@ void Partitions::initialize(HistogramEnumerationFunction histogramEnumeration) |
m_histogramEnumeration = histogramEnumeration; |
s_initialized = true; |
} |
- |
- spinLockUnlock(&s_initializationLock); |
} |
void Partitions::shutdown() |
{ |
- spinLockLock(&s_initializationLock); |
+ SpinLock::Guard guard(s_initializationLock); |
// 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 |
@@ -78,8 +76,6 @@ void Partitions::shutdown() |
(void) m_bufferAllocator.shutdown(); |
(void) m_fastMallocAllocator.shutdown(); |
} |
- |
- spinLockUnlock(&s_initializationLock); |
} |
void Partitions::decommitFreeableMemory() |