Merge "Enable attribution for sound_trigger wakeups" into udc-dev (02c129da) · Commits · e / os / android_frameworks_base

core/res/res/xml/irq_device_map.xml

+9 −7

Original line number	Diff line number	Diff line
		@@ -18,14 +18,16 @@
		-->
		<irq-device-map>
		<!-- This file maps devices (chips) that can send interrupts to the main processor (and bring it
		out of sleep) to logical subsystems in userspace code. Since each Android device has its own
		uniquely designed chipset, this mapping is expected to be empty by default and should be
		overridden by device-specific configs.
		out of sleep) to logical subsystems in userspace code. Since each Android device can have
		a differently designed chipset, this mapping is expected to be empty by default and should
		be overridden by device-specific configs.
		This mapping helps the system to meaningfully attribute CPU wakeups to logical work that
		happened on the device. The devices are referred to by their names as defined in the kernel.
		Currently, defined subsystems are:
		happened on the device and the app activity that caused it. The devices are referred to by
		their names as defined in the kernel. Currently, defined subsystems are:
		- Alarm: Use this to denote wakeup alarms requested by apps via the AlarmManager API.
		- Wifi: Use this to denote network traffic that uses the wifi transport.
		- Sound_trigger: Use this to denote sound phrase detection, like the ones supported by
		SoundTriggerManager.

		The overlay should use tags <device> and <subsystem> to describe this mapping in the
		following way:

services/core/java/android/os/BatteryStatsInternal.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -39,12 +39,14 @@ public abstract class BatteryStatsInternal {
		public static final int CPU_WAKEUP_SUBSYSTEM_UNKNOWN = -1;
		public static final int CPU_WAKEUP_SUBSYSTEM_ALARM = 1;
		public static final int CPU_WAKEUP_SUBSYSTEM_WIFI = 2;
		public static final int CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER = 3;

		/** @hide */
		@IntDef(prefix = {"CPU_WAKEUP_SUBSYSTEM_"}, value = {
		CPU_WAKEUP_SUBSYSTEM_UNKNOWN,
		CPU_WAKEUP_SUBSYSTEM_ALARM,
		CPU_WAKEUP_SUBSYSTEM_WIFI,
		CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER,
		})
		@Retention(RetentionPolicy.SOURCE)
		@interface CpuWakeupSubsystem {

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -108,8 +108,8 @@ import com.android.server.power.stats.BatteryExternalStatsWorker;
		import com.android.server.power.stats.BatteryStatsImpl;
		import com.android.server.power.stats.BatteryUsageStatsProvider;
		import com.android.server.power.stats.BatteryUsageStatsStore;
		import com.android.server.power.stats.CpuWakeupStats;
		import com.android.server.power.stats.SystemServerCpuThreadReader.SystemServiceCpuThreadTimes;
		import com.android.server.power.stats.wakeups.CpuWakeupStats;

		import java.io.File;
		import java.io.FileDescriptor;
		@@ -515,13 +515,11 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		@Override
		public void noteCpuWakingActivity(int subsystem, long elapsedMillis, int... uids) {
		Objects.requireNonNull(uids);
		mCpuWakeupStats.noteWakingActivity(subsystem, elapsedMillis, uids);
		mHandler.post(() -> mCpuWakeupStats.noteWakingActivity(subsystem, elapsedMillis, uids));
		}

		@Override
		public void noteWakingSoundTrigger(long elapsedMillis, int uid) {
		// TODO(b/267717665): Pipe to noteCpuWakingActivity once SoundTrigger starts using this.
		Slog.w(TAG, "Sound trigger event dispatched to uid " + uid);
		noteCpuWakingActivity(CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER, elapsedMillis, uid);
		}
		}

services/core/java/com/android/server/power/stats/CpuWakeupStats.java→services/core/java/com/android/server/power/stats/wakeups/CpuWakeupStats.java

+52 −12

Original line number	Diff line number	Diff line
		@@ -14,9 +14,10 @@
		* limitations under the License.
		*/

		package com.android.server.power.stats;
		package com.android.server.power.stats.wakeups;

		import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_ALARM;
		import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER;
		import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_UNKNOWN;
		import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_WIFI;

		@@ -55,7 +56,8 @@ public class CpuWakeupStats {
		private static final String TAG = "CpuWakeupStats";

		private static final String SUBSYSTEM_ALARM_STRING = "Alarm";
		private static final String SUBSYSTEM_ALARM_WIFI = "Wifi";
		private static final String SUBSYSTEM_WIFI_STRING = "Wifi";
		private static final String SUBSYSTEM_SOUND_TRIGGER_STRING = "Sound_trigger";
		private static final String TRACE_TRACK_WAKEUP_ATTRIBUTION = "wakeup_attribution";
		@VisibleForTesting
		static final long WAKEUP_REASON_HALF_WINDOW_MS = 500;
		@@ -91,12 +93,24 @@ public class CpuWakeupStats {
		mConfig.register(new HandlerExecutor(mHandler));
		}

		private static int typeToStatsType(int wakeupType) {
		switch (wakeupType) {
		case Wakeup.TYPE_ABNORMAL:
		return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__TYPE__TYPE_ABNORMAL;
		case Wakeup.TYPE_IRQ:
		return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__TYPE__TYPE_IRQ;
		}
		return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__TYPE__TYPE_UNKNOWN;
		}

		private static int subsystemToStatsReason(int subsystem) {
		switch (subsystem) {
		case CPU_WAKEUP_SUBSYSTEM_ALARM:
		return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__REASON__ALARM;
		case CPU_WAKEUP_SUBSYSTEM_WIFI:
		return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__REASON__WIFI;
		case CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER:
		return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__REASON__SOUND_TRIGGER;
		}
		return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__REASON__UNKNOWN;
		}
		@@ -144,7 +158,7 @@ public class CpuWakeupStats {
		}
		}
		FrameworkStatsLog.write(FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED,
		FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__TYPE__TYPE_IRQ,
		typeToStatsType(wakeupToLog.mType),
		subsystemToStatsReason(subsystem),
		uids,
		wakeupToLog.mElapsedMillis,
		@@ -524,8 +538,10 @@ public class CpuWakeupStats {
		switch (rawSubsystem) {
		case SUBSYSTEM_ALARM_STRING:
		return CPU_WAKEUP_SUBSYSTEM_ALARM;
		case SUBSYSTEM_ALARM_WIFI:
		case SUBSYSTEM_WIFI_STRING:
		return CPU_WAKEUP_SUBSYSTEM_WIFI;
		case SUBSYSTEM_SOUND_TRIGGER_STRING:
		return CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER;
		}
		return CPU_WAKEUP_SUBSYSTEM_UNKNOWN;
		}
		@@ -535,25 +551,43 @@ public class CpuWakeupStats {
		case CPU_WAKEUP_SUBSYSTEM_ALARM:
		return SUBSYSTEM_ALARM_STRING;
		case CPU_WAKEUP_SUBSYSTEM_WIFI:
		return SUBSYSTEM_ALARM_WIFI;
		return SUBSYSTEM_WIFI_STRING;
		case CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER:
		return SUBSYSTEM_SOUND_TRIGGER_STRING;
		case CPU_WAKEUP_SUBSYSTEM_UNKNOWN:
		return "Unknown";
		}
		return "N/A";
		}

		private static final class Wakeup {
		@VisibleForTesting
		static final class Wakeup {
		private static final String PARSER_TAG = "CpuWakeupStats.Wakeup";
		private static final String ABORT_REASON_PREFIX = "Abort";
		private static final Pattern sIrqPattern = Pattern.compile("^(\\d+)\\s+(\\S+)");
		private static final Pattern sIrqPattern = Pattern.compile("^(\\-?\\d+)\\s+(\\S+)");

		/**
		* Classical interrupts, which arrive on a dedicated GPIO pin into the main CPU.
		* Sometimes, when multiple IRQs happen close to each other, they may get batched together.
		*/
		static final int TYPE_IRQ = 1;

		/**
		* Non-IRQ wakeups. The exact mechanism for these is unknown, except that these explicitly
		* do not use an interrupt line or a GPIO pin.
		*/
		static final int TYPE_ABNORMAL = 2;

		int mType;
		long mElapsedMillis;
		long mUptimeMillis;
		IrqDevice[] mDevices;

		private Wakeup(IrqDevice[] devices, long elapsedMillis, long uptimeMillis) {
		private Wakeup(int type, IrqDevice[] devices, long elapsedMillis, long uptimeMillis) {
		mType = type;
		mDevices = devices;
		mElapsedMillis = elapsedMillis;
		mUptimeMillis = uptimeMillis;
		mDevices = devices;
		}

		static Wakeup parseWakeup(String rawReason, long elapsedMillis, long uptimeMillis) {
		@@ -563,6 +597,7 @@ public class CpuWakeupStats {
		return null;
		}

		int type = TYPE_IRQ;
		int parsedDeviceCount = 0;
		final IrqDevice[] parsedDevices = new IrqDevice[components.length];

		@@ -574,6 +609,10 @@ public class CpuWakeupStats {
		try {
		line = Integer.parseInt(matcher.group(1));
		device = matcher.group(2);
		if (line < 0) {
		// Assuming that IRQ wakeups cannot come batched with non-IRQ wakeups.
		type = TYPE_ABNORMAL;
		}
		} catch (NumberFormatException e) {
		Slog.e(PARSER_TAG,
		"Exception while parsing device names from part: " + component, e);
		@@ -585,15 +624,16 @@ public class CpuWakeupStats {
		if (parsedDeviceCount == 0) {
		return null;
		}
		return new Wakeup(Arrays.copyOf(parsedDevices, parsedDeviceCount), elapsedMillis,
		return new Wakeup(type, Arrays.copyOf(parsedDevices, parsedDeviceCount), elapsedMillis,
		uptimeMillis);
		}

		@Override
		public String toString() {
		return "Wakeup{"
		+ "mElapsedMillis=" + mElapsedMillis
		+ ", mUptimeMillis=" + TimeUtils.formatDuration(mUptimeMillis)
		+ "mType=" + mType
		+ ", mElapsedMillis=" + mElapsedMillis
		+ ", mUptimeMillis=" + mUptimeMillis
		+ ", mDevices=" + Arrays.toString(mDevices)
		+ '}';
		}

services/core/java/com/android/server/power/stats/IrqDeviceMap.java→services/core/java/com/android/server/power/stats/wakeups/IrqDeviceMap.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.server.power.stats;
		package com.android.server.power.stats.wakeups;

		import android.annotation.XmlRes;
		import android.content.Context;