Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Side by Side Diff: third_party/WebKit/Source/platform/heap/Heap.cpp

Issue 2700123003: DO NOT COMMIT: Results of running old (current) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 12 matching lines...) Expand all
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 "platform/heap/Heap.h" 31 #include "platform/heap/Heap.h"
32 32
33 #include <memory>
33 #include "platform/Histogram.h" 34 #include "platform/Histogram.h"
34 #include "platform/RuntimeEnabledFeatures.h" 35 #include "platform/RuntimeEnabledFeatures.h"
35 #include "platform/ScriptForbiddenScope.h" 36 #include "platform/ScriptForbiddenScope.h"
36 #include "platform/heap/BlinkGCMemoryDumpProvider.h" 37 #include "platform/heap/BlinkGCMemoryDumpProvider.h"
37 #include "platform/heap/CallbackStack.h" 38 #include "platform/heap/CallbackStack.h"
38 #include "platform/heap/HeapCompact.h" 39 #include "platform/heap/HeapCompact.h"
39 #include "platform/heap/PageMemory.h" 40 #include "platform/heap/PageMemory.h"
40 #include "platform/heap/PagePool.h" 41 #include "platform/heap/PagePool.h"
41 #include "platform/heap/SafePoint.h" 42 #include "platform/heap/SafePoint.h"
42 #include "platform/heap/ThreadState.h" 43 #include "platform/heap/ThreadState.h"
43 #include "platform/instrumentation/tracing/TraceEvent.h" 44 #include "platform/instrumentation/tracing/TraceEvent.h"
44 #include "platform/instrumentation/tracing/web_memory_allocator_dump.h" 45 #include "platform/instrumentation/tracing/web_memory_allocator_dump.h"
45 #include "platform/instrumentation/tracing/web_process_memory_dump.h" 46 #include "platform/instrumentation/tracing/web_process_memory_dump.h"
46 #include "public/platform/Platform.h" 47 #include "public/platform/Platform.h"
47 #include "wtf/Assertions.h" 48 #include "wtf/Assertions.h"
48 #include "wtf/CurrentTime.h" 49 #include "wtf/CurrentTime.h"
49 #include "wtf/DataLog.h" 50 #include "wtf/DataLog.h"
50 #include "wtf/LeakAnnotations.h" 51 #include "wtf/LeakAnnotations.h"
51 #include "wtf/PtrUtil.h" 52 #include "wtf/PtrUtil.h"
52 #include "wtf/allocator/Partitions.h" 53 #include "wtf/allocator/Partitions.h"
53 #include <memory>
54 54
55 namespace blink { 55 namespace blink {
56 56
57 HeapAllocHooks::AllocationHook* HeapAllocHooks::m_allocationHook = nullptr; 57 HeapAllocHooks::AllocationHook* HeapAllocHooks::m_allocationHook = nullptr;
58 HeapAllocHooks::FreeHook* HeapAllocHooks::m_freeHook = nullptr; 58 HeapAllocHooks::FreeHook* HeapAllocHooks::m_freeHook = nullptr;
59 59
60 void ThreadHeap::flushHeapDoesNotContainCache() { 60 void ThreadHeap::flushHeapDoesNotContainCache() {
61 m_heapDoesNotContainCache->flush(); 61 m_heapDoesNotContainCache->flush();
62 } 62 }
63 63
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 m_safePointBarrier(WTF::makeUnique<SafePointBarrier>()), 151 m_safePointBarrier(WTF::makeUnique<SafePointBarrier>()),
152 m_freePagePool(WTF::wrapUnique(new PagePool)), 152 m_freePagePool(WTF::wrapUnique(new PagePool)),
153 m_markingStack(CallbackStack::create()), 153 m_markingStack(CallbackStack::create()),
154 m_postMarkingCallbackStack(CallbackStack::create()), 154 m_postMarkingCallbackStack(CallbackStack::create()),
155 m_globalWeakCallbackStack(CallbackStack::create()), 155 m_globalWeakCallbackStack(CallbackStack::create()),
156 m_ephemeronStack(CallbackStack::create()) { 156 m_ephemeronStack(CallbackStack::create()) {
157 if (ThreadState::current()->isMainThread()) 157 if (ThreadState::current()->isMainThread())
158 s_mainThreadHeap = this; 158 s_mainThreadHeap = this;
159 } 159 }
160 160
161 ThreadHeap::~ThreadHeap() { 161 ThreadHeap::~ThreadHeap() {}
162 }
163 162
164 void ThreadHeap::attach(ThreadState* thread) { 163 void ThreadHeap::attach(ThreadState* thread) {
165 MutexLocker locker(m_threadAttachMutex); 164 MutexLocker locker(m_threadAttachMutex);
166 m_threads.insert(thread); 165 m_threads.insert(thread);
167 } 166 }
168 167
169 void ThreadHeap::detach(ThreadState* thread) { 168 void ThreadHeap::detach(ThreadState* thread) {
170 ASSERT(ThreadState::current() == thread); 169 ASSERT(ThreadState::current() == thread);
171 bool isLastThread = false; 170 bool isLastThread = false;
172 { 171 {
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize()); 563 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize());
565 564
566 m_stats.reset(); 565 m_stats.reset();
567 for (ThreadState* state : m_threads) 566 for (ThreadState* state : m_threads)
568 state->resetHeapCounters(); 567 state->resetHeapCounters();
569 } 568 }
570 569
571 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr; 570 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr;
572 571
573 } // namespace blink 572 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/Heap.h ('k') | third_party/WebKit/Source/platform/heap/HeapAllocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698