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

Unified Diff: base/debug/trace_event_impl.cc

Issue 15418002: Record Chrome trace events in tcmalloc heap profiles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup, run in all renderers Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/debug/trace_event.h ('k') | base/debug/trace_memory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/debug/trace_event_impl.cc
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index 6e3516e2c2bface6552466a6828ff201a8a97bee..5cc28e9cfc939e11e372b0c4f1af408c1365f833 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -1050,6 +1050,8 @@ void TraceLog::SetEventCallback(EventCallback cb) {
};
void TraceLog::Flush(const TraceLog::OutputCallback& cb) {
+ // Ignore memory allocations from here down.
+ TRACE_MEMORY(TRACE_DISABLED_BY_DEFAULT("memory"), TRACE_MEMORY_IGNORE);
scoped_ptr<TraceBuffer> previous_logged_events;
{
AutoLock lock(lock_);
« no previous file with comments | « base/debug/trace_event.h ('k') | base/debug/trace_memory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698