Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev

Browse Source 
am: cf70671a75

Change-Id: Ib7e61f66b52525d59fc8fe111124b859ddc52e04
This commit is contained in:
Wei Wang
2017-07-14 20:56:13 +00:00
committed by android-build-merger
parent 486ce65234 cf70671a75
commit dc458c33d6
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/SystemServiceManager.java
View File

@@ -18,6 +18,7 @@ package com.android.server;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
import android.os.SystemClock;
import android.os.Trace; import android.os.Trace;
import android.util.Slog; import android.util.Slog;
@@ -118,14 +119,14 @@ public class SystemServiceManager {
// Register it. // Register it.
mServices.add(service); mServices.add(service);
// Start it. // Start it.
long time = System.currentTimeMillis(); long time = SystemClock.elapsedRealtime();
try { try {
service.onStart(); service.onStart();
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
throw new RuntimeException("Failed to start service " + service.getClass().getName() throw new RuntimeException("Failed to start service " + service.getClass().getName()
+ ": onStart threw an exception", ex); + ": onStart threw an exception", ex);
} }
warnIfTooLong(System.currentTimeMillis() - time, service, "onStart"); warnIfTooLong(SystemClock.elapsedRealtime() - time, service, "onStart");
} }
/** /**
@@ -146,7 +147,7 @@ public class SystemServiceManager {
final int serviceLen = mServices.size(); final int serviceLen = mServices.size();
for (int i = 0; i < serviceLen; i++) { for (int i = 0; i < serviceLen; i++) {
final SystemService service = mServices.get(i); final SystemService service = mServices.get(i);
long time = System.currentTimeMillis(); long time = SystemClock.elapsedRealtime();
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, service.getClass().getName()); Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, service.getClass().getName());
try { try {
service.onBootPhase(mCurrentPhase); service.onBootPhase(mCurrentPhase);
@@ -156,7 +157,7 @@ public class SystemServiceManager {
+ ": onBootPhase threw an exception during phase " + ": onBootPhase threw an exception during phase "
+ mCurrentPhase, ex); + mCurrentPhase, ex);
} }
warnIfTooLong(System.currentTimeMillis() - time, service, "onBootPhase"); warnIfTooLong(SystemClock.elapsedRealtime() - time, service, "onBootPhase");
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
} }
} finally { } finally {
@@ -178,14 +179,14 @@ public class SystemServiceManager {
final SystemService service = mServices.get(i); final SystemService service = mServices.get(i);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onStartUser " Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onStartUser "
+ service.getClass().getName()); + service.getClass().getName());
long time = System.currentTimeMillis(); long time = SystemClock.elapsedRealtime();
try { try {
service.onStartUser(userHandle); service.onStartUser(userHandle);
} catch (Exception ex) { } catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting start of user " + userHandle Slog.wtf(TAG, "Failure reporting start of user " + userHandle
+ " to service " + service.getClass().getName(), ex); + " to service " + service.getClass().getName(), ex);
} }
warnIfTooLong(System.currentTimeMillis() - time, service, "onStartUser "); warnIfTooLong(SystemClock.elapsedRealtime() - time, service, "onStartUser ");
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
} }
} }
@@ -197,14 +198,14 @@ public class SystemServiceManager {
final SystemService service = mServices.get(i); final SystemService service = mServices.get(i);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onUnlockUser " Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onUnlockUser "
+ service.getClass().getName()); + service.getClass().getName());
long time = System.currentTimeMillis(); long time = SystemClock.elapsedRealtime();
try { try {
service.onUnlockUser(userHandle); service.onUnlockUser(userHandle);
} catch (Exception ex) { } catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting unlock of user " + userHandle Slog.wtf(TAG, "Failure reporting unlock of user " + userHandle
+ " to service " + service.getClass().getName(), ex); + " to service " + service.getClass().getName(), ex);
} }
warnIfTooLong(System.currentTimeMillis() - time, service, "onUnlockUser "); warnIfTooLong(SystemClock.elapsedRealtime() - time, service, "onUnlockUser ");
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
} }
} }
@@ -216,14 +217,14 @@ public class SystemServiceManager {
final SystemService service = mServices.get(i); final SystemService service = mServices.get(i);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onSwitchUser " Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onSwitchUser "
+ service.getClass().getName()); + service.getClass().getName());
long time = System.currentTimeMillis(); long time = SystemClock.elapsedRealtime();
try { try {
service.onSwitchUser(userHandle); service.onSwitchUser(userHandle);
} catch (Exception ex) { } catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting switch of user " + userHandle Slog.wtf(TAG, "Failure reporting switch of user " + userHandle
+ " to service " + service.getClass().getName(), ex); + " to service " + service.getClass().getName(), ex);
} }
warnIfTooLong(System.currentTimeMillis() - time, service, "onSwitchUser"); warnIfTooLong(SystemClock.elapsedRealtime() - time, service, "onSwitchUser");
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
} }
} }
@@ -235,14 +236,14 @@ public class SystemServiceManager {
final SystemService service = mServices.get(i); final SystemService service = mServices.get(i);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onStopUser " Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onStopUser "
+ service.getClass().getName()); + service.getClass().getName());
long time = System.currentTimeMillis(); long time = SystemClock.elapsedRealtime();
try { try {
service.onStopUser(userHandle); service.onStopUser(userHandle);
} catch (Exception ex) { } catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting stop of user " + userHandle Slog.wtf(TAG, "Failure reporting stop of user " + userHandle
+ " to service " + service.getClass().getName(), ex); + " to service " + service.getClass().getName(), ex);
} }
warnIfTooLong(System.currentTimeMillis() - time, service, "onStopUser"); warnIfTooLong(SystemClock.elapsedRealtime() - time, service, "onStopUser");
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
} }
} }
@@ -254,14 +255,14 @@ public class SystemServiceManager {
final SystemService service = mServices.get(i); final SystemService service = mServices.get(i);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onCleanupUser " Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onCleanupUser "
+ service.getClass().getName()); + service.getClass().getName());
long time = System.currentTimeMillis(); long time = SystemClock.elapsedRealtime();
try { try {
service.onCleanupUser(userHandle); service.onCleanupUser(userHandle);
} catch (Exception ex) { } catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting cleanup of user " + userHandle Slog.wtf(TAG, "Failure reporting cleanup of user " + userHandle
+ " to service " + service.getClass().getName(), ex); + " to service " + service.getClass().getName(), ex);
} }
warnIfTooLong(System.currentTimeMillis() - time, service, "onCleanupUser"); warnIfTooLong(SystemClock.elapsedRealtime() - time, service, "onCleanupUser");
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
} }
} }