From 09b45a3ad96379b4181d32f8391f63e9c57dc316 Mon Sep 17 00:00:00 2001 From: Andy Stadler Date: Thu, 3 May 2012 15:00:49 -0700 Subject: Add System Tracing capability to Sync Manager This tracing code is enabled via "systrace.py --set-tags sync" Change-Id: Ia8bc01adbba345a568405b0ac8ade96e56b40cc1 --- core/java/android/content/AbstractThreadedSyncAdapter.java | 9 +++++++++ core/java/android/os/Trace.java | 1 + 2 files changed, 10 insertions(+) diff --git a/core/java/android/content/AbstractThreadedSyncAdapter.java b/core/java/android/content/AbstractThreadedSyncAdapter.java index 6bffed7..bafe67d 100644 --- a/core/java/android/content/AbstractThreadedSyncAdapter.java +++ b/core/java/android/content/AbstractThreadedSyncAdapter.java @@ -21,6 +21,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; +import android.os.Trace; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; @@ -233,9 +234,15 @@ public abstract class AbstractThreadedSyncAdapter { mThreadsKey = toSyncKey(account); } + @Override public void run() { Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); + // Trace this sync instance. Note, conceptually this should be in + // SyncStorageEngine.insertStartSyncEvent(), but the trace functions require unique + // threads in order to track overlapping operations, so we'll do it here for now. + Trace.traceBegin(Trace.TRACE_TAG_SYNC_MANAGER, mAuthority); + SyncResult syncResult = new SyncResult(); ContentProviderClient provider = null; try { @@ -250,6 +257,8 @@ public abstract class AbstractThreadedSyncAdapter { syncResult.databaseError = true; } } finally { + Trace.traceEnd(Trace.TRACE_TAG_SYNC_MANAGER); + if (provider != null) { provider.release(); } diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index 2a45506..05acd63 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -36,6 +36,7 @@ public final class Trace { public static final long TRACE_TAG_WEBVIEW = 1L << 4; public static final long TRACE_TAG_WINDOW_MANAGER = 1L << 5; public static final long TRACE_TAG_ACTIVITY_MANAGER = 1L << 6; + public static final long TRACE_TAG_SYNC_MANAGER = 1L << 7; private static final long sEnabledTags = nativeGetEnabledTags(); -- cgit v1.1