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

Unified Diff: base/debug/trace_event_impl.cc

Issue 13912028: Invoke trace callback even when trace buffer is full (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « no previous file | base/debug/trace_event_unittest.cc » ('j') | base/debug/trace_event_unittest.cc » ('J')
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 860d989489488b8407292b3ba9169926e39e7463..38a6c0fe311df6ae92f716559d939b19d318de28 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -1000,12 +1000,14 @@ void TraceLog::AddTraceEventWithThreadIdAndTimestamp(
NotificationHelper notifier(this);
- {
+ do {
AutoLock lock(lock_);
if (*category_group_enabled != CATEGORY_ENABLED)
return;
+
+ event_callback_copy = event_callback_;
if (logged_events_->IsFull())
- return;
+ break;
const char* new_name = ThreadIdNameManager::GetInstance()->
GetName(thread_id);
@@ -1047,9 +1049,7 @@ void TraceLog::AddTraceEventWithThreadIdAndTimestamp(
if (watch_category_ == category_group_enabled && watch_event_name_ == name)
notifier.AddNotificationWhileLocked(EVENT_WATCH_NOTIFICATION);
-
- event_callback_copy = event_callback_;
- } // release lock
+ } while (0); // release lock
notifier.SendNotificationIfAny();
if (event_callback_copy != NULL) {
« no previous file with comments | « no previous file | base/debug/trace_event_unittest.cc » ('j') | base/debug/trace_event_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698