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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
558 DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, totalAllocatedSpaceHis togram, new CustomCountHistogram("BlinkGC.TotalAllocatedSpace", 0, 4 * 1024 * 10 24, 50)); | 559 DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, totalAllocatedSpaceHis togram, new CustomCountHistogram("BlinkGC.TotalAllocatedSpace", 0, 4 * 1024 * 10 24, 50)); |
559 totalAllocatedSpaceHistogram.count(ProcessHeap::totalAllocatedSpace() / 1024 ); | 560 totalAllocatedSpaceHistogram.count(ProcessHeap::totalAllocatedSpace() / 1024 ); |
560 DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, gcReasonHistogram, new EnumerationHistogram("BlinkGC.GCReason", BlinkGC::NumberOfGCReason)); | 561 DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, gcReasonHistogram, new EnumerationHistogram("BlinkGC.GCReason", BlinkGC::NumberOfGCReason)); |
561 gcReasonHistogram.count(reason); | 562 gcReasonHistogram.count(reason); |
562 | 563 |
563 state->heap().m_lastGCReason = reason; | 564 state->heap().m_lastGCReason = reason; |
564 | 565 |
565 ThreadHeap::reportMemoryUsageHistogram(); | 566 ThreadHeap::reportMemoryUsageHistogram(); |
566 WTF::Partitions::reportMemoryUsageHistogram(); | 567 WTF::Partitions::reportMemoryUsageHistogram(); |
567 | 568 |
569 if (RuntimeEnabledFeatures::traceWrappablesEnabled()) { | |
570 state->invalidateDeadObjectsInWrappersMarkingDeque(); | |
haraken
2016/06/09 06:28:31
I begin to think it is not enough to call invalida
Marcel Hlopko
2016/06/09 09:00:50
You are right. Done.
| |
571 } | |
572 | |
568 state->heap().postGC(gcType); | 573 state->heap().postGC(gcType); |
569 state->heap().decommitCallbackStacks(); | 574 state->heap().decommitCallbackStacks(); |
570 } | 575 } |
571 | 576 |
572 void ThreadHeap::collectGarbageForTerminatingThread(ThreadState* state) | 577 void ThreadHeap::collectGarbageForTerminatingThread(ThreadState* state) |
573 { | 578 { |
574 { | 579 { |
575 // A thread-specific termination GC must not allow other global GCs to g o | 580 // A thread-specific termination GC must not allow other global GCs to g o |
576 // ahead while it is running, hence the termination GC does not enter a | 581 // ahead while it is running, hence the termination GC does not enter a |
577 // safepoint. VisitorScope will not enter also a safepoint scope for | 582 // safepoint. VisitorScope will not enter also a safepoint scope for |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
793 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize()); | 798 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize()); |
794 | 799 |
795 m_stats.reset(); | 800 m_stats.reset(); |
796 for (ThreadState* state : m_threads) | 801 for (ThreadState* state : m_threads) |
797 state->resetHeapCounters(); | 802 state->resetHeapCounters(); |
798 } | 803 } |
799 | 804 |
800 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr; | 805 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr; |
801 | 806 |
802 } // namespace blink | 807 } // namespace blink |
OLD | NEW |