| Index: base/android/early_trace_event_binding.cc
|
| diff --git a/base/android/early_trace_event_binding.cc b/base/android/early_trace_event_binding.cc
|
| index 08cd4ee5a6a312294f4b3d9c49ed218965526f57..91ccade9e9aa02ec769bc37e26cc94487680d244 100644
|
| --- a/base/android/early_trace_event_binding.cc
|
| +++ b/base/android/early_trace_event_binding.cc
|
| @@ -19,21 +19,21 @@ const char kEarlyJavaCategory[] = "EarlyJava";
|
| static void RecordEarlyEvent(JNIEnv* env,
|
| const JavaParamRef<jclass>& clazz,
|
| const JavaParamRef<jstring>& jname,
|
| - jlong begin_time_ms,
|
| - jlong end_time_ms,
|
| - jint thread_id) {
|
| + jlong begin_time_ns,
|
| + jlong end_time_ns,
|
| + jint thread_id,
|
| + jlong thread_duration_ms) {
|
| std::string name = ConvertJavaStringToUTF8(env, jname);
|
| - int64_t begin_us = begin_time_ms * 1000;
|
| - int64_t end_us = end_time_ms * 1000;
|
| -
|
| - INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(
|
| - TRACE_EVENT_PHASE_BEGIN, kEarlyJavaCategory, name.c_str(),
|
| - trace_event_internal::kNoId, thread_id,
|
| - TimeTicks::FromInternalValue(begin_us), TRACE_EVENT_FLAG_COPY);
|
| - INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(
|
| - TRACE_EVENT_PHASE_END, kEarlyJavaCategory, name.c_str(),
|
| - trace_event_internal::kNoId, thread_id,
|
| - TimeTicks::FromInternalValue(end_us), TRACE_EVENT_FLAG_COPY);
|
| + int64_t begin_us = begin_time_ns / 1000;
|
| + int64_t end_us = end_time_ns / 1000;
|
| + int64_t thread_duration_us = thread_duration_ms * 1000;
|
| +
|
| + INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMPS(
|
| + kEarlyJavaCategory, name.c_str(), trace_event_internal::kNoId, thread_id,
|
| + TimeTicks::FromInternalValue(begin_us),
|
| + TimeTicks::FromInternalValue(end_us),
|
| + ThreadTicks::Now() + TimeDelta::FromMicroseconds(thread_duration_us),
|
| + TRACE_EVENT_FLAG_COPY);
|
| }
|
|
|
| bool RegisterEarlyTraceEvent(JNIEnv* env) {
|
|
|