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

Unified Diff: base/trace_event/trace_log.cc

Issue 1424703003: Kills TraceTicks, which was functionally the same as TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review 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_log.cc
diff --git a/base/trace_event/trace_log.cc b/base/trace_event/trace_log.cc
index d5a02dd8a010a7c147cd67420433d04ab5044c7a..6f289048cdb0eefa18bfcc8ed0f2ff74b2a78c3b 100644
--- a/base/trace_event/trace_log.cc
+++ b/base/trace_event/trace_log.cc
@@ -137,7 +137,7 @@ void InitializeMetadataEvent(TraceEvent* trace_event,
::trace_event_internal::SetTraceValue(value, &arg_type, &arg_value);
trace_event->Initialize(
thread_id,
- TraceTicks(),
+ TimeTicks(),
ThreadTicks(),
TRACE_EVENT_PHASE_METADATA,
&g_category_group_enabled[g_category_metadata],
@@ -1079,7 +1079,7 @@ TraceEventHandle TraceLog::AddTraceEvent(
const scoped_refptr<ConvertableToTraceFormat>* convertable_values,
unsigned int flags) {
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,
@@ -1110,7 +1110,7 @@ TraceEventHandle TraceLog::AddTraceEventWithContextId(
const scoped_refptr<ConvertableToTraceFormat>* convertable_values,
unsigned int flags) {
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,
@@ -1137,7 +1137,7 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp(
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,
@@ -1169,7 +1169,7 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp(
unsigned long long context_id,
unsigned long long bind_id,
int thread_id,
- const TraceTicks& timestamp,
+ const TimeTicks& timestamp,
int num_args,
const char** arg_names,
const unsigned char* arg_types,
@@ -1198,7 +1198,7 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp(
id = MangleEventId(id);
}
- TraceTicks offset_event_timestamp = OffsetTimestamp(timestamp);
+ TimeTicks offset_event_timestamp = OffsetTimestamp(timestamp);
ThreadTicks thread_now = ThreadNow();
// |thread_local_event_buffer_| can be null if the current thread doesn't have
@@ -1347,7 +1347,7 @@ void TraceLog::AddMetadataEvent(
scoped_ptr<TraceEvent> trace_event(new TraceEvent);
trace_event->Initialize(
0, // thread_id
- TraceTicks(), ThreadTicks(), TRACE_EVENT_PHASE_METADATA,
+ TimeTicks(), ThreadTicks(), TRACE_EVENT_PHASE_METADATA,
&g_category_group_enabled[g_category_metadata], name,
trace_event_internal::kNoId, // id
trace_event_internal::kNoId, // context_id
@@ -1360,7 +1360,7 @@ void TraceLog::AddMetadataEvent(
// May be called when a COMPELETE event ends and the unfinished event has been
// recycled (phase == TRACE_EVENT_PHASE_END and trace_event == NULL).
std::string TraceLog::EventToConsoleMessage(unsigned char phase,
- const TraceTicks& timestamp,
+ const TimeTicks& timestamp,
TraceEvent* trace_event) {
AutoLock thread_info_lock(thread_info_lock_);
@@ -1418,7 +1418,7 @@ void TraceLog::UpdateTraceEventDuration(
AutoThreadLocalBoolean thread_is_in_trace_event(&thread_is_in_trace_event_);
ThreadTicks thread_now = ThreadNow();
- TraceTicks now = OffsetNow();
+ TimeTicks now = OffsetNow();
std::string console_message;
if (*category_group_enabled & ENABLED_FOR_RECORDING) {
@@ -1714,7 +1714,7 @@ ScopedTraceBinaryEfficient::ScopedTraceBinaryEfficient(
trace_event_internal::kNoId, // id
trace_event_internal::kNoId, // context_id
static_cast<int>(base::PlatformThread::CurrentId()), // thread_id
- base::TraceTicks::Now(),
+ base::TimeTicks::Now(),
trace_event_internal::kZeroNumArgs,
nullptr,
nullptr,

Powered by Google App Engine
This is Rietveld 408576698