OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 11 matching lines...) Expand all Loading... |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "platform/Partitions.h" | 32 #include "wtf/Partitions.h" |
33 | 33 |
34 namespace blink { | 34 #include "wtf/DefaultAllocator.h" |
| 35 #include "wtf/FastMalloc.h" |
35 | 36 |
| 37 namespace WTF { |
| 38 |
| 39 bool Partitions::s_initialized; |
| 40 |
| 41 PartitionAllocatorGeneric Partitions::m_bufferAllocator; |
36 SizeSpecificPartitionAllocator<3328> Partitions::m_objectModelAllocator; | 42 SizeSpecificPartitionAllocator<3328> Partitions::m_objectModelAllocator; |
37 SizeSpecificPartitionAllocator<1024> Partitions::m_renderingAllocator; | 43 SizeSpecificPartitionAllocator<1024> Partitions::m_renderingAllocator; |
38 | 44 |
39 void Partitions::init() | 45 void Partitions::initialize() |
40 { | 46 { |
41 m_objectModelAllocator.init(); | 47 static int lock = 0; |
42 m_renderingAllocator.init(); | 48 // Guard against two threads hitting here in parallel. |
| 49 spinLockLock(&lock); |
| 50 if (!s_initialized) { |
| 51 m_bufferAllocator.init(); |
| 52 m_objectModelAllocator.init(); |
| 53 m_renderingAllocator.init(); |
| 54 s_initialized = true; |
| 55 } |
| 56 spinLockUnlock(&lock); |
43 } | 57 } |
44 | 58 |
45 void Partitions::shutdown() | 59 void Partitions::shutdown() |
46 { | 60 { |
| 61 fastMallocShutdown(); |
| 62 |
47 // We could ASSERT here for a memory leak within the partition, but it leads | 63 // We could ASSERT here for a memory leak within the partition, but it leads |
48 // to very hard to diagnose ASSERTs, so it's best to leave leak checking for | 64 // to very hard to diagnose ASSERTs, so it's best to leave leak checking for |
49 // the valgrind and heapcheck bots, which run without partitions. | 65 // the valgrind and heapcheck bots, which run without partitions. |
50 (void) m_renderingAllocator.shutdown(); | 66 (void) m_renderingAllocator.shutdown(); |
51 (void) m_objectModelAllocator.shutdown(); | 67 (void) m_objectModelAllocator.shutdown(); |
| 68 (void) m_bufferAllocator.shutdown(); |
52 } | 69 } |
53 | 70 |
54 } // namespace blink | 71 } // namespace WTF |
OLD | NEW |