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

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

Issue 1689823003: Revert of Oilpan: Decommit backing storage of CallbackStacks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « third_party/WebKit/Source/platform/heap/Heap.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 // resurrected or mutate a HashTable (because HashTable's weak processing 477 // resurrected or mutate a HashTable (because HashTable's weak processing
478 // assumes that the HashTable hasn't been mutated since the latest marking). 478 // assumes that the HashTable hasn't been mutated since the latest marking).
479 // Due to the complexity, we just forbid allocations. 479 // Due to the complexity, we just forbid allocations.
480 NoAllocationScope noAllocationScope(this); 480 NoAllocationScope noAllocationScope(this);
481 481
482 MarkingVisitor<Visitor::WeakProcessing> weakProcessingVisitor; 482 MarkingVisitor<Visitor::WeakProcessing> weakProcessingVisitor;
483 483
484 // Perform thread-specific weak processing. 484 // Perform thread-specific weak processing.
485 while (popAndInvokeThreadLocalWeakCallback(&weakProcessingVisitor)) { } 485 while (popAndInvokeThreadLocalWeakCallback(&weakProcessingVisitor)) { }
486 486
487 m_threadLocalWeakCallbackStack->decommit();
488
489 if (isMainThread()) { 487 if (isMainThread()) {
490 double timeForThreadLocalWeakProcessing = WTF::currentTimeMS() - startTi me; 488 double timeForThreadLocalWeakProcessing = WTF::currentTimeMS() - startTi me;
491 DEFINE_STATIC_LOCAL(CustomCountHistogram, timeForWeakHistogram, ("BlinkG C.timeForThreadLocalWeakProcessing", 1, 10 * 1000, 50)); 489 DEFINE_STATIC_LOCAL(CustomCountHistogram, timeForWeakHistogram, ("BlinkG C.timeForThreadLocalWeakProcessing", 1, 10 * 1000, 50));
492 timeForWeakHistogram.count(timeForThreadLocalWeakProcessing); 490 timeForWeakHistogram.count(timeForThreadLocalWeakProcessing);
493 } 491 }
494 } 492 }
495 493
496 size_t ThreadState::totalMemorySize() 494 size_t ThreadState::totalMemorySize()
497 { 495 {
498 return Heap::allocatedObjectSize() + Heap::markedObjectSize() + WTF::Partiti ons::totalSizeOfCommittedPages(); 496 return Heap::allocatedObjectSize() + Heap::markedObjectSize() + WTF::Partiti ons::totalSizeOfCommittedPages();
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 threadDump->addScalar("dead_count", "objects", totalDeadCount); 1498 threadDump->addScalar("dead_count", "objects", totalDeadCount);
1501 threadDump->addScalar("live_size", "bytes", totalLiveSize); 1499 threadDump->addScalar("live_size", "bytes", totalLiveSize);
1502 threadDump->addScalar("dead_size", "bytes", totalDeadSize); 1500 threadDump->addScalar("dead_size", "bytes", totalDeadSize);
1503 1501
1504 WebMemoryAllocatorDump* heapsDump = BlinkGCMemoryDumpProvider::instance()->c reateMemoryAllocatorDumpForCurrentGC(heapsDumpName); 1502 WebMemoryAllocatorDump* heapsDump = BlinkGCMemoryDumpProvider::instance()->c reateMemoryAllocatorDumpForCurrentGC(heapsDumpName);
1505 WebMemoryAllocatorDump* classesDump = BlinkGCMemoryDumpProvider::instance()- >createMemoryAllocatorDumpForCurrentGC(classesDumpName); 1503 WebMemoryAllocatorDump* classesDump = BlinkGCMemoryDumpProvider::instance()- >createMemoryAllocatorDumpForCurrentGC(classesDumpName);
1506 BlinkGCMemoryDumpProvider::instance()->currentProcessMemoryDump()->addOwners hipEdge(classesDump->guid(), heapsDump->guid()); 1504 BlinkGCMemoryDumpProvider::instance()->currentProcessMemoryDump()->addOwners hipEdge(classesDump->guid(), heapsDump->guid());
1507 } 1505 }
1508 1506
1509 } // namespace blink 1507 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/Heap.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698