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

Side by Side Diff: android/trace_event_binding.cc

Issue 2050803003: Update to Chromium //base at Chromium commit e3a753f17bac62738b0dbf0b36510f767b081e4b. (Closed) Base URL: https://github.com/domokit/base.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « android/scoped_java_ref.h ('k') | base_unittests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/trace_event_binding.h" 5 #include "base/android/trace_event_binding.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include <set> 9 #include <set>
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 void OnTraceLogDisabled() override { 62 void OnTraceLogDisabled() override {
63 JNIEnv* env = base::android::AttachCurrentThread(); 63 JNIEnv* env = base::android::AttachCurrentThread();
64 base::android::Java_TraceEvent_setEnabled(env, false); 64 base::android::Java_TraceEvent_setEnabled(env, false);
65 } 65 }
66 }; 66 };
67 67
68 base::LazyInstance<TraceEnabledObserver>::Leaky g_trace_enabled_state_observer_; 68 base::LazyInstance<TraceEnabledObserver>::Leaky g_trace_enabled_state_observer_;
69 69
70 } // namespace 70 } // namespace
71 71
72 static void RegisterEnabledObserver(JNIEnv* env, jclass clazz) { 72 static void RegisterEnabledObserver(JNIEnv* env,
73 const JavaParamRef<jclass>& clazz) {
73 bool enabled = trace_event::TraceLog::GetInstance()->IsEnabled(); 74 bool enabled = trace_event::TraceLog::GetInstance()->IsEnabled();
74 base::android::Java_TraceEvent_setEnabled(env, enabled); 75 base::android::Java_TraceEvent_setEnabled(env, enabled);
75 trace_event::TraceLog::GetInstance()->AddEnabledStateObserver( 76 trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(
76 g_trace_enabled_state_observer_.Pointer()); 77 g_trace_enabled_state_observer_.Pointer());
77 } 78 }
78 79
79 static void StartATrace(JNIEnv* env, jclass clazz) { 80 static void StartATrace(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
80 base::trace_event::TraceLog::GetInstance()->StartATrace(); 81 base::trace_event::TraceLog::GetInstance()->StartATrace();
81 } 82 }
82 83
83 static void StopATrace(JNIEnv* env, jclass clazz) { 84 static void StopATrace(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
84 base::trace_event::TraceLog::GetInstance()->StopATrace(); 85 base::trace_event::TraceLog::GetInstance()->StopATrace();
85 } 86 }
86 87
87 static void Instant(JNIEnv* env, jclass clazz, 88 static void Instant(JNIEnv* env,
88 jstring jname, jstring jarg) { 89 const JavaParamRef<jclass>& clazz,
90 const JavaParamRef<jstring>& jname,
91 const JavaParamRef<jstring>& jarg) {
89 TraceEventDataConverter converter(env, jname, jarg); 92 TraceEventDataConverter converter(env, jname, jarg);
90 if (converter.arg()) { 93 if (converter.arg()) {
91 TRACE_EVENT_COPY_INSTANT1(kJavaCategory, converter.name(), 94 TRACE_EVENT_COPY_INSTANT1(kJavaCategory, converter.name(),
92 TRACE_EVENT_SCOPE_THREAD, 95 TRACE_EVENT_SCOPE_THREAD,
93 converter.arg_name(), converter.arg()); 96 converter.arg_name(), converter.arg());
94 } else { 97 } else {
95 TRACE_EVENT_COPY_INSTANT0(kJavaCategory, converter.name(), 98 TRACE_EVENT_COPY_INSTANT0(kJavaCategory, converter.name(),
96 TRACE_EVENT_SCOPE_THREAD); 99 TRACE_EVENT_SCOPE_THREAD);
97 } 100 }
98 } 101 }
99 102
100 static void Begin(JNIEnv* env, jclass clazz, 103 static void Begin(JNIEnv* env,
101 jstring jname, jstring jarg) { 104 const JavaParamRef<jclass>& clazz,
105 const JavaParamRef<jstring>& jname,
106 const JavaParamRef<jstring>& jarg) {
102 TraceEventDataConverter converter(env, jname, jarg); 107 TraceEventDataConverter converter(env, jname, jarg);
103 if (converter.arg()) { 108 if (converter.arg()) {
104 TRACE_EVENT_COPY_BEGIN1(kJavaCategory, converter.name(), 109 TRACE_EVENT_COPY_BEGIN1(kJavaCategory, converter.name(),
105 converter.arg_name(), converter.arg()); 110 converter.arg_name(), converter.arg());
106 } else { 111 } else {
107 TRACE_EVENT_COPY_BEGIN0(kJavaCategory, converter.name()); 112 TRACE_EVENT_COPY_BEGIN0(kJavaCategory, converter.name());
108 } 113 }
109 } 114 }
110 115
111 static void End(JNIEnv* env, jclass clazz, 116 static void End(JNIEnv* env,
112 jstring jname, jstring jarg) { 117 const JavaParamRef<jclass>& clazz,
118 const JavaParamRef<jstring>& jname,
119 const JavaParamRef<jstring>& jarg) {
113 TraceEventDataConverter converter(env, jname, jarg); 120 TraceEventDataConverter converter(env, jname, jarg);
114 if (converter.arg()) { 121 if (converter.arg()) {
115 TRACE_EVENT_COPY_END1(kJavaCategory, converter.name(), 122 TRACE_EVENT_COPY_END1(kJavaCategory, converter.name(),
116 converter.arg_name(), converter.arg()); 123 converter.arg_name(), converter.arg());
117 } else { 124 } else {
118 TRACE_EVENT_COPY_END0(kJavaCategory, converter.name()); 125 TRACE_EVENT_COPY_END0(kJavaCategory, converter.name());
119 } 126 }
120 } 127 }
121 128
122 static void BeginToplevel(JNIEnv* env, jclass clazz) { 129 static void BeginToplevel(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
123 TRACE_EVENT_BEGIN0(kToplevelCategory, kLooperDispatchMessage); 130 TRACE_EVENT_BEGIN0(kToplevelCategory, kLooperDispatchMessage);
124 } 131 }
125 132
126 static void EndToplevel(JNIEnv* env, jclass clazz) { 133 static void EndToplevel(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
127 TRACE_EVENT_END0(kToplevelCategory, kLooperDispatchMessage); 134 TRACE_EVENT_END0(kToplevelCategory, kLooperDispatchMessage);
128 } 135 }
129 136
130 static void StartAsync(JNIEnv* env, jclass clazz, jstring jname, jlong jid) { 137 static void StartAsync(JNIEnv* env,
138 const JavaParamRef<jclass>& clazz,
139 const JavaParamRef<jstring>& jname,
140 jlong jid) {
131 TraceEventDataConverter converter(env, jname, nullptr); 141 TraceEventDataConverter converter(env, jname, nullptr);
132 TRACE_EVENT_COPY_ASYNC_BEGIN0(kJavaCategory, converter.name(), jid); 142 TRACE_EVENT_COPY_ASYNC_BEGIN0(kJavaCategory, converter.name(), jid);
133 } 143 }
134 144
135 static void FinishAsync(JNIEnv* env, jclass clazz, jstring jname, jlong jid) { 145 static void FinishAsync(JNIEnv* env,
146 const JavaParamRef<jclass>& clazz,
147 const JavaParamRef<jstring>& jname,
148 jlong jid) {
136 TraceEventDataConverter converter(env, jname, nullptr); 149 TraceEventDataConverter converter(env, jname, nullptr);
137 TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory, converter.name(), jid); 150 TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory, converter.name(), jid);
138 } 151 }
139 152
140 bool RegisterTraceEvent(JNIEnv* env) { 153 bool RegisterTraceEvent(JNIEnv* env) {
141 return RegisterNativesImpl(env); 154 return RegisterNativesImpl(env);
142 } 155 }
143 156
144 } // namespace android 157 } // namespace android
145 } // namespace base 158 } // namespace base
OLDNEW
« no previous file with comments | « android/scoped_java_ref.h ('k') | base_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698