base/trace_event/trace_event.h - Issue 1424703003: Kills TraceTicks, which was functionally the same as TimeTicks

Unified Diff: base/trace_event/trace_event.h

Issue 1424703003: Kills TraceTicks, which was functionally the same as TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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.h

diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h

index 17095236f0d3b15e1eb91abf270e7d47dc45d60e..307b1db917ae1fa8795cd81af847c2780620fd65 100644

--- a/base/trace_event/trace_event.h

+++ b/base/trace_event/trace_event.h

@@ -134,7 +134,7 @@

// unsigned long long id,

// unsigned long long context_id,

// int thread_id,

-// const TraceTicks& timestamp,

+// const TimeTicks& timestamp,

// int num_args,

// const char** arg_names,

// const unsigned char* arg_types,

@@ -293,7 +293,7 @@ TRACE_EVENT_API_CLASS_EXPORT extern \

trace_event_internal::AddTraceEventWithThreadIdAndTimestamp( \

phase, INTERNAL_TRACE_EVENT_UID(category_group_enabled), \

name, trace_event_trace_id.data(), trace_event_internal::kNoId, \

- thread_id, base::TraceTicks::FromInternalValue(timestamp), \

+ thread_id, base::TimeTicks::FromInternalValue(timestamp), \

trace_event_flags | TRACE_EVENT_FLAG_EXPLICIT_TIMESTAMP, \

trace_event_internal::kNoId, ##__VA_ARGS__); \

} \

@@ -497,13 +497,6 @@ static inline void SetTraceValue(const base::ThreadTicks arg,

*value = arg.ToInternalValue();

}

-static inline void SetTraceValue(const base::TraceTicks arg,

- unsigned char* type,

- unsigned long long* value) {

- *type = TRACE_VALUE_TYPE_INT;

- *value = arg.ToInternalValue();

// These AddTraceEvent and AddTraceEventWithThreadIdAndTimestamp template

// functions are defined here instead of in the macro, because the arg_values

// could be temporary objects, such as std::string. In order to store

@@ -518,7 +511,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned long long id,

unsigned long long context_id,

int thread_id,

- const base::TraceTicks& timestamp,

+ const base::TimeTicks& timestamp,

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

@@ -540,7 +533,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned long long id,

unsigned long long context_id,

int thread_id,

- const base::TraceTicks& timestamp,

+ const base::TimeTicks& timestamp,

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

@@ -575,7 +568,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned long long id,

unsigned long long context_id,

int thread_id,

- const base::TraceTicks& timestamp,

+ const base::TimeTicks& timestamp,

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

@@ -609,7 +602,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned long long id,

unsigned long long context_id,

int thread_id,

- const base::TraceTicks& timestamp,

+ const base::TimeTicks& timestamp,

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

@@ -638,7 +631,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned long long id,

unsigned long long context_id,

int thread_id,

- const base::TraceTicks& timestamp,

+ const base::TimeTicks& timestamp,

unsigned int flags,

unsigned long long bind_id) {

return TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(

@@ -654,7 +647,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent(

unsigned int flags,

unsigned long long bind_id) {

const int thread_id = static_cast<int>(base::PlatformThread::CurrentId());

- const base::TraceTicks now = base::TraceTicks::Now();

+ const base::TimeTicks now = base::TimeTicks::Now();

return AddTraceEventWithThreadIdAndTimestamp(phase, category_group_enabled,

name, id, kNoId, thread_id, now,

flags, bind_id);

@@ -669,7 +662,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned long long id,

unsigned long long context_id,

int thread_id,

- const base::TraceTicks& timestamp,

+ const base::TimeTicks& timestamp,

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

@@ -694,7 +687,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent(

const char* arg1_name,

const ARG1_TYPE& arg1_val) {

int thread_id = static_cast<int>(base::PlatformThread::CurrentId());

- base::TraceTicks now = base::TraceTicks::Now();

+ base::TimeTicks now = base::TimeTicks::Now();

return AddTraceEventWithThreadIdAndTimestamp(phase, category_group_enabled,

name, id, kNoId, thread_id, now,

flags, bind_id,

@@ -710,7 +703,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned long long id,

unsigned long long context_id,

int thread_id,

- const base::TraceTicks& timestamp,

+ const base::TimeTicks& timestamp,

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

@@ -741,7 +734,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent(

const char* arg2_name,

const ARG2_TYPE& arg2_val) {

int thread_id = static_cast<int>(base::PlatformThread::CurrentId());

- base::TraceTicks now = base::TraceTicks::Now();

+ base::TimeTicks now = base::TimeTicks::Now();

return AddTraceEventWithThreadIdAndTimestamp(phase, category_group_enabled,

name, id, kNoId, thread_id, now,

flags, bind_id,

« no previous file with comments | « base/time/time_win_unittest.cc ('k') | base/trace_event/trace_event_android.cc » ('j') | components/scheduler/child/idle_helper.h » ('J')