base/debug/trace_event_impl.cc - Issue 15892014: Allow chrome trace to be collected when atrace is enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/debug/trace_event_impl.cc

Issue 15892014: Allow chrome trace to be collected when atrace is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 7 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

Index: base/debug/trace_event_impl.cc

diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc

index e8b3083339cb14a72a2e338f2857bbfc8063f9f0..f7c7fa358ac3d6b60401f1e26c4b1eb252d30d52 100644

--- a/base/debug/trace_event_impl.cc

+++ b/base/debug/trace_event_impl.cc

@@ -1116,7 +1116,7 @@ void TraceLog::AddTraceEventWithThreadIdAndTimestamp(

do {

AutoLock lock(lock_);

- if (*category_group_enabled != CATEGORY_ENABLED)

+ if (!(*category_group_enabled & CATEGORY_ENABLED))

dsinclair 2013/05/29 13:49:20 Can we pull this out into a method? if (!isCatego

Xianzhu 2013/05/29 17:14:31 Done.

return;

event_callback_copy = event_callback_;

« no previous file with comments | « no previous file | no next file » | no next file with comments »