Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2364c3b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "log service stats similar to batterystats"

parents d3d59619 75b3c490

cmds/statsd/src/atoms.proto

+47 −7
Original line number Diff line number Diff line
@@ -148,6 +148,11 @@ message Atom { 
        UserRestrictionChanged user_restriction_changed = 96;

        SettingsUIChanged settings_ui_changed = 97;

        ConnectivityStateChanged connectivity_state_changed = 98;

        // TODO: service state change is very noisy shortly after boot, as well

        // as at other transitions - coming out of doze, device plugged in, etc.

        // Consider removing this if it becomes a problem

        ServiceStateChanged service_state_changed = 99;

        ServiceLaunchReported service_launch_reported = 100;

    }



    // Pulled events will start at field 10000.
@@ -2150,6 +2155,41 @@ message ConnectivityStateChanged { 
  optional State state = 2;

}



/**

 * Logs when a service starts and stops.

 * Logged from:

 *   services/core/java/com/android/server/am/ActiveServices.java

 */

message ServiceStateChanged {



    optional int32 uid = 1 [(is_uid) = true];



    optional string package_name = 2;



    optional string service_name = 3;



    enum State {

        START = 1;

        STOP = 2;

    }



    optional State state = 4;

}



/**

 * Logs when a service is launched.

 * Logged from:

 *   services/core/java/com/android/server/am/ActiveServices.java

 */

message ServiceLaunchReported {



    optional int32 uid = 1 [(is_uid) = true];



    optional string package_name = 2;



    optional string service_name = 3;

}



//////////////////////////////////////////////////////////////////////

// Pulled atoms below this line //

//////////////////////////////////////////////////////////////////////

services/core/java/com/android/server/am/ActiveServices.java

+9 −0
Original line number Diff line number Diff line
@@ -677,6 +677,8 @@ public final class ActiveServices { 
            stracker.setStarted(true, mAm.mProcessStats.getMemFactorLocked(), r.lastActivity);

        }

        r.callStart = false;

        StatsLog.write(StatsLog.SERVICE_STATE_CHANGED, r.appInfo.uid, r.name.getPackageName(),

                r.name.getClassName(), StatsLog.SERVICE_STATE_CHANGED__STATE__START);

        synchronized (r.stats.getBatteryStats()) {

            r.stats.startRunningLocked();

        }
@@ -715,6 +717,9 @@ public final class ActiveServices { 
            service.delayedStop = true;

            return;

        }

        StatsLog.write(StatsLog.SERVICE_STATE_CHANGED, service.appInfo.uid,

                service.name.getPackageName(), service.name.getClassName(),

                StatsLog.SERVICE_STATE_CHANGED__STATE__STOP);

        synchronized (service.stats.getBatteryStats()) {

            service.stats.stopRunningLocked();

        }
@@ -856,6 +861,8 @@ public final class ActiveServices { 
                }

            }



            StatsLog.write(StatsLog.SERVICE_STATE_CHANGED, r.appInfo.uid, r.name.getPackageName(),

                    r.name.getClassName(), StatsLog.SERVICE_STATE_CHANGED__STATE__STOP);

            synchronized (r.stats.getBatteryStats()) {

                r.stats.stopRunningLocked();

            }
@@ -2517,6 +2524,8 @@ public final class ActiveServices { 
                EventLogTags.writeAmCreateService(

                        r.userId, System.identityHashCode(r), nameTerm, r.app.uid, r.app.pid);

            }

            StatsLog.write(StatsLog.SERVICE_LAUNCH_REPORTED, r.appInfo.uid, r.name.getPackageName(),

                    r.name.getClassName());

            synchronized (r.stats.getBatteryStats()) {

                r.stats.startLaunchedLocked();

            }