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

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

Issue 1670463002: [Oilpan] Unify memory usage reporters of Oilpan (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up Created 4 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 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 ASSERT(ThreadState::current()->isInGC()); 688 ASSERT(ThreadState::current()->isInGC());
689 689
690 Heap::reportMemoryUsageForTracing(); 690 Heap::reportMemoryUsageForTracing();
691 691
692 s_objectSizeAtLastGC = s_allocatedObjectSize + s_markedObjectSize; 692 s_objectSizeAtLastGC = s_allocatedObjectSize + s_markedObjectSize;
693 s_partitionAllocSizeAtLastGC = WTF::Partitions::totalSizeOfCommittedPages(); 693 s_partitionAllocSizeAtLastGC = WTF::Partitions::totalSizeOfCommittedPages();
694 s_allocatedObjectSize = 0; 694 s_allocatedObjectSize = 0;
695 s_markedObjectSize = 0; 695 s_markedObjectSize = 0;
696 s_wrapperCountAtLastGC = s_wrapperCount; 696 s_wrapperCountAtLastGC = s_wrapperCount;
697 s_collectedWrapperCount = 0; 697 s_collectedWrapperCount = 0;
698 for (ThreadState* state : ThreadState::attachedThreads())
699 state->resetHeapSizes();
haraken 2016/02/12 09:30:54 resetHeapSizes => resetHeapCounters (for consisten
peria 2016/02/15 04:16:59 Done.
698 } 700 }
699 701
700 CallbackStack* Heap::s_markingStack; 702 CallbackStack* Heap::s_markingStack;
701 CallbackStack* Heap::s_postMarkingCallbackStack; 703 CallbackStack* Heap::s_postMarkingCallbackStack;
702 CallbackStack* Heap::s_globalWeakCallbackStack; 704 CallbackStack* Heap::s_globalWeakCallbackStack;
703 CallbackStack* Heap::s_ephemeronStack; 705 CallbackStack* Heap::s_ephemeronStack;
704 HeapDoesNotContainCache* Heap::s_heapDoesNotContainCache; 706 HeapDoesNotContainCache* Heap::s_heapDoesNotContainCache;
705 bool Heap::s_shutdownCalled = false; 707 bool Heap::s_shutdownCalled = false;
706 FreePagePool* Heap::s_freePagePool; 708 FreePagePool* Heap::s_freePagePool;
707 OrphanedPagePool* Heap::s_orphanedPagePool; 709 OrphanedPagePool* Heap::s_orphanedPagePool;
708 RegionTree* Heap::s_regionTree = nullptr; 710 RegionTree* Heap::s_regionTree = nullptr;
709 size_t Heap::s_allocatedSpace = 0; 711 size_t Heap::s_allocatedSpace = 0;
710 size_t Heap::s_allocatedObjectSize = 0; 712 size_t Heap::s_allocatedObjectSize = 0;
711 size_t Heap::s_objectSizeAtLastGC = 0; 713 size_t Heap::s_objectSizeAtLastGC = 0;
712 size_t Heap::s_markedObjectSize = 0; 714 size_t Heap::s_markedObjectSize = 0;
713 size_t Heap::s_markedObjectSizeAtLastCompleteSweep = 0; 715 size_t Heap::s_markedObjectSizeAtLastCompleteSweep = 0;
714 size_t Heap::s_wrapperCount = 0; 716 size_t Heap::s_wrapperCount = 0;
715 size_t Heap::s_wrapperCountAtLastGC = 0; 717 size_t Heap::s_wrapperCountAtLastGC = 0;
716 size_t Heap::s_collectedWrapperCount = 0; 718 size_t Heap::s_collectedWrapperCount = 0;
717 size_t Heap::s_partitionAllocSizeAtLastGC = 0; 719 size_t Heap::s_partitionAllocSizeAtLastGC = 0;
718 double Heap::s_estimatedMarkingTimePerByte = 0.0; 720 double Heap::s_estimatedMarkingTimePerByte = 0.0;
719 #if ENABLE(ASSERT) 721 #if ENABLE(ASSERT)
720 uint16_t Heap::s_gcGeneration = 0; 722 uint16_t Heap::s_gcGeneration = 0;
721 #endif 723 #endif
722 724
723 } // namespace blink 725 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698