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

Unified Diff: base/android/java/src/org/chromium/base/TraceEvent.java

Issue 1486053003: Android: Add support for TraceEvent before the native library is loaded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Proper locking. Created 5 years 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/android/java/src/org/chromium/base/TraceEvent.java
diff --git a/base/android/java/src/org/chromium/base/TraceEvent.java b/base/android/java/src/org/chromium/base/TraceEvent.java
index 878275c2b80a60b28a8b763a53cdc5441d3c0a83..9e17ff132d4389a75f9f735c3b71f8989cee0c00 100644
--- a/base/android/java/src/org/chromium/base/TraceEvent.java
+++ b/base/android/java/src/org/chromium/base/TraceEvent.java
@@ -179,6 +179,7 @@ public class TraceEvent {
*/
@CalledByNative
public static void setEnabled(boolean enabled) {
+ if (enabled) EarlyTraceEvent.disable();
pasko 2015/12/15 17:52:59 Some observations: 1. we may miss a few early tra
Benoit L 2016/01/06 12:50:06 Per offline discussion, my understanding is that w
pasko 2016/01/06 13:50:10 I do not remember the details :( Can you outline
sEnabled = enabled;
// Android M+ systrace logs this on its own. Only log it if not writing to Android systrace.
if (sATraceEnabled) return;
@@ -186,6 +187,10 @@ public class TraceEvent {
enabled ? LooperMonitorHolder.sInstance : null);
}
+ public static void enableEarlyTracing() {
+ EarlyTraceEvent.enable();
+ }
+
/**
* Enables or disabled Android systrace path of Chrome tracing. If enabled, all Chrome
* traces will be also output to Android systrace. Because of the overhead of Android
@@ -254,7 +259,7 @@ public class TraceEvent {
* @param name The name of the event.
*/
public static void begin(String name) {
- if (sEnabled) nativeBegin(name, null);
+ begin(name, null);
}
/**
@@ -263,6 +268,7 @@ public class TraceEvent {
* @param arg The arguments of the event.
*/
public static void begin(String name, String arg) {
+ EarlyTraceEvent.begin(name);
if (sEnabled) nativeBegin(name, arg);
}
@@ -271,7 +277,7 @@ public class TraceEvent {
* @param name The name of the event.
*/
public static void end(String name) {
- if (sEnabled) nativeEnd(name, null);
+ end(name, null);
}
/**
@@ -280,6 +286,7 @@ public class TraceEvent {
* @param arg The arguments of the event.
*/
public static void end(String name, String arg) {
+ EarlyTraceEvent.end(name);
if (sEnabled) nativeEnd(name, arg);
}

Powered by Google App Engine
This is Rietveld 408576698