Chromium Code Reviews| 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 14 matching lines...) Expand all Loading... | |
| 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 "base/sys_info.h" | 33 #include "base/sys_info.h" |
| 34 #include "platform/Histogram.h" | 34 #include "platform/Histogram.h" |
| 35 #include "platform/RuntimeEnabledFeatures.h" | |
| 35 #include "platform/ScriptForbiddenScope.h" | 36 #include "platform/ScriptForbiddenScope.h" |
| 36 #include "platform/TraceEvent.h" | 37 #include "platform/TraceEvent.h" |
| 37 #include "platform/heap/BlinkGCMemoryDumpProvider.h" | 38 #include "platform/heap/BlinkGCMemoryDumpProvider.h" |
| 38 #include "platform/heap/CallbackStack.h" | 39 #include "platform/heap/CallbackStack.h" |
| 39 #include "platform/heap/MarkingVisitor.h" | 40 #include "platform/heap/MarkingVisitor.h" |
| 40 #include "platform/heap/PageMemory.h" | 41 #include "platform/heap/PageMemory.h" |
| 41 #include "platform/heap/PagePool.h" | 42 #include "platform/heap/PagePool.h" |
| 42 #include "platform/heap/SafePoint.h" | 43 #include "platform/heap/SafePoint.h" |
| 43 #include "platform/heap/ThreadState.h" | 44 #include "platform/heap/ThreadState.h" |
| 44 #include "platform/web_memory_allocator_dump.h" | 45 #include "platform/web_memory_allocator_dump.h" |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 563 DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, totalAllocatedSpaceHis togram, new CustomCountHistogram("BlinkGC.TotalAllocatedSpace", 0, 4 * 1024 * 10 24, 50)); | 564 DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, totalAllocatedSpaceHis togram, new CustomCountHistogram("BlinkGC.TotalAllocatedSpace", 0, 4 * 1024 * 10 24, 50)); |
| 564 totalAllocatedSpaceHistogram.count(ProcessHeap::totalAllocatedSpace() / 1024 ); | 565 totalAllocatedSpaceHistogram.count(ProcessHeap::totalAllocatedSpace() / 1024 ); |
| 565 DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, gcReasonHistogram, new EnumerationHistogram("BlinkGC.GCReason", BlinkGC::NumberOfGCReason)); | 566 DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, gcReasonHistogram, new EnumerationHistogram("BlinkGC.GCReason", BlinkGC::NumberOfGCReason)); |
| 566 gcReasonHistogram.count(reason); | 567 gcReasonHistogram.count(reason); |
| 567 | 568 |
| 568 state->heap().m_lastGCReason = reason; | 569 state->heap().m_lastGCReason = reason; |
| 569 | 570 |
| 570 ThreadHeap::reportMemoryUsageHistogram(); | 571 ThreadHeap::reportMemoryUsageHistogram(); |
| 571 WTF::Partitions::reportMemoryUsageHistogram(); | 572 WTF::Partitions::reportMemoryUsageHistogram(); |
| 572 | 573 |
| 574 if (RuntimeEnabledFeatures::traceWrappablesEnabled()) { | |
| 575 state->invalidateDeadObjectsInWrappersMarkingDeque(); | |
|
haraken
2016/06/20 11:10:38
Why do you need this? Don't you already invalidate
Marcel Hlopko
2016/06/20 11:29:13
You're right, this is just a result of bad rebase.
| |
| 576 } | |
| 577 | |
| 573 state->heap().postGC(gcType); | 578 state->heap().postGC(gcType); |
| 574 state->heap().decommitCallbackStacks(); | 579 state->heap().decommitCallbackStacks(); |
| 575 } | 580 } |
| 576 | 581 |
| 577 void ThreadHeap::collectGarbageForTerminatingThread(ThreadState* state) | 582 void ThreadHeap::collectGarbageForTerminatingThread(ThreadState* state) |
| 578 { | 583 { |
| 579 { | 584 { |
| 580 // A thread-specific termination GC must not allow other global GCs to g o | 585 // A thread-specific termination GC must not allow other global GCs to g o |
| 581 // ahead while it is running, hence the termination GC does not enter a | 586 // ahead while it is running, hence the termination GC does not enter a |
| 582 // safepoint. VisitorScope will not enter also a safepoint scope for | 587 // safepoint. VisitorScope will not enter also a safepoint scope for |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 796 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize()); | 801 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize()); |
| 797 | 802 |
| 798 m_stats.reset(); | 803 m_stats.reset(); |
| 799 for (ThreadState* state : m_threads) | 804 for (ThreadState* state : m_threads) |
| 800 state->resetHeapCounters(); | 805 state->resetHeapCounters(); |
| 801 } | 806 } |
| 802 | 807 |
| 803 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr; | 808 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr; |
| 804 | 809 |
| 805 } // namespace blink | 810 } // namespace blink |
| OLD | NEW |