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 20 matching lines...) Expand all Loading... |
31 #include "config.h" | 31 #include "config.h" |
32 #include "wtf/Partitions.h" | 32 #include "wtf/Partitions.h" |
33 | 33 |
34 #include "wtf/DefaultAllocator.h" | 34 #include "wtf/DefaultAllocator.h" |
35 #include "wtf/FastMalloc.h" | 35 #include "wtf/FastMalloc.h" |
36 | 36 |
37 namespace WTF { | 37 namespace WTF { |
38 | 38 |
39 bool Partitions::s_initialized; | 39 bool Partitions::s_initialized; |
40 | 40 |
| 41 PartitionAllocatorGeneric Partitions::m_fastMallocAllocator; |
41 PartitionAllocatorGeneric Partitions::m_bufferAllocator; | 42 PartitionAllocatorGeneric Partitions::m_bufferAllocator; |
42 SizeSpecificPartitionAllocator<3328> Partitions::m_objectModelAllocator; | 43 SizeSpecificPartitionAllocator<3328> Partitions::m_objectModelAllocator; |
43 SizeSpecificPartitionAllocator<1024> Partitions::m_renderingAllocator; | 44 SizeSpecificPartitionAllocator<1024> Partitions::m_renderingAllocator; |
44 | 45 |
45 void Partitions::initialize() | 46 void Partitions::initialize() |
46 { | 47 { |
47 static int lock = 0; | 48 static int lock = 0; |
48 // Guard against two threads hitting here in parallel. | 49 // Guard against two threads hitting here in parallel. |
49 spinLockLock(&lock); | 50 spinLockLock(&lock); |
50 if (!s_initialized) { | 51 if (!s_initialized) { |
| 52 m_fastMallocAllocator.init(); |
51 m_bufferAllocator.init(); | 53 m_bufferAllocator.init(); |
52 m_objectModelAllocator.init(); | 54 m_objectModelAllocator.init(); |
53 m_renderingAllocator.init(); | 55 m_renderingAllocator.init(); |
54 s_initialized = true; | 56 s_initialized = true; |
55 } | 57 } |
56 spinLockUnlock(&lock); | 58 spinLockUnlock(&lock); |
57 } | 59 } |
58 | 60 |
59 void Partitions::shutdown() | 61 void Partitions::shutdown() |
60 { | 62 { |
61 fastMallocShutdown(); | |
62 | |
63 // 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 |
64 // 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 |
65 // the valgrind and heapcheck bots, which run without partitions. | 65 // the valgrind and heapcheck bots, which run without partitions. |
66 (void) m_renderingAllocator.shutdown(); | 66 (void) m_renderingAllocator.shutdown(); |
67 (void) m_objectModelAllocator.shutdown(); | 67 (void) m_objectModelAllocator.shutdown(); |
68 (void) m_bufferAllocator.shutdown(); | 68 (void) m_bufferAllocator.shutdown(); |
| 69 (void) m_fastMallocAllocator.shutdown(); |
69 } | 70 } |
70 | 71 |
71 } // namespace WTF | 72 } // namespace WTF |
OLD | NEW |