base/trace_event/trace_event_android.cc - Issue 1122153002: Fixit: Fork base::TimeTicks --> TimeTicks + ThreadTicks + TraceTicks

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/trace_event/trace_event_android.cc

Issue 1122153002: Fixit: Fork base::TimeTicks --> TimeTicks + ThreadTicks + TraceTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@FIXIT_timeclasses_1of2

Patch Set: REBASE after it passed CQ but did not commit to tree Created 5 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/trace_event/trace_event_android.cc

diff --git a/base/trace_event/trace_event_android.cc b/base/trace_event/trace_event_android.cc

index 26bd0c777d4be216db025546b9d2f4932e0b1395..91ed6e3cf08f5c140c3b68b458ea5dbaf6eaa84d 100644

--- a/base/trace_event/trace_event_android.cc

+++ b/base/trace_event/trace_event_android.cc

@@ -187,8 +187,7 @@ void TraceLog::AddClockSyncMetadataEvent() {

// debugfs that takes the written data and pushes it onto the trace

// buffer. So, to establish clock sync, we write our monotonic clock into that

// trace buffer.

- TimeTicks now = TimeTicks::NowFromSystemTraceTime();

- double now_in_seconds = now.ToInternalValue() / 1000000.0;

+ double now_in_seconds = (TraceTicks::Now() - TraceTicks()).InSecondsF();

std::string marker = StringPrintf(

"trace_event_clock_sync: parent_ts=%f\n", now_in_seconds);

if (write(atrace_fd, marker.c_str(), marker.size()) == -1)

« no previous file with comments | « base/trace_event/trace_event.h ('k') | base/trace_event/trace_event_impl.h » ('j') | no next file with comments »