diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/util/TimingsTraceLog.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/util/TimingsTraceLog.java b/core/java/android/util/TimingsTraceLog.java index 36e9f77bb831..3e6f09bfa799 100644 --- a/core/java/android/util/TimingsTraceLog.java +++ b/core/java/android/util/TimingsTraceLog.java @@ -25,6 +25,7 @@ import java.util.Deque; /** * Helper class for reporting boot and shutdown timing metrics. + * <p>Note: This class is not thread-safe. Use a separate copy for other threads</p> * @hide */ public class TimingsTraceLog { @@ -34,10 +35,12 @@ public class TimingsTraceLog { DEBUG_BOOT_TIME ? new ArrayDeque<>() : null; private final String mTag; private long mTraceTag; + private long mThreadId; public TimingsTraceLog(String tag, long traceTag) { mTag = tag; mTraceTag = traceTag; + mThreadId = Thread.currentThread().getId(); } /** @@ -45,6 +48,7 @@ public class TimingsTraceLog { * @param name name to appear in trace */ public void traceBegin(String name) { + assertSameThread(); Trace.traceBegin(mTraceTag, name); if (DEBUG_BOOT_TIME) { mStartTimes.push(Pair.create(name, SystemClock.elapsedRealtime())); @@ -56,6 +60,7 @@ public class TimingsTraceLog { * Also {@link #logDuration logs} the duration. */ public void traceEnd() { + assertSameThread(); Trace.traceEnd(mTraceTag); if (!DEBUG_BOOT_TIME) { return; @@ -68,6 +73,15 @@ public class TimingsTraceLog { logDuration(event.first, (SystemClock.elapsedRealtime() - event.second)); } + private void assertSameThread() { + final Thread currentThread = Thread.currentThread(); + if (currentThread.getId() != mThreadId) { + throw new IllegalStateException("Instance of TimingsTraceLog can only be called from " + + "the thread it was created on (tid: " + mThreadId + "), but was from " + + currentThread.getName() + " (tid: " + currentThread.getId() + ")"); + } + } + /** * Log the duration so it can be parsed by external tools for performance reporting */ |