Merge "Revert "Pull process cpu stats into statsd"" (e08bef25) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+0 −17

Original line number	Diff line number	Diff line
		@@ -184,7 +184,6 @@ message Atom {
		DiskIo disk_io = 10032;
		PowerProfile power_profile = 10033;
		ProcStats proc_stats_pkg_proc = 10034;
		ProcessCpuTime process_cpu_time = 10035;
		NativeProcessMemoryState native_process_memory_state = 10036;
		}

		@@ -3035,22 +3034,6 @@ message PowerProfile {
		optional PowerProfileProto power_profile = 1;
		}

		/**
		* Pulls process user time and system time. Puller takes a snapshot of all pids
		* in the system and returns cpu stats for those that are working at the time.
		* Dead pids will be dropped. Kernel processes are excluded.
		* Min cool-down is 5 sec.
		*/
		message ProcessCpuTime {
		optional int32 uid = 1 [(is_uid) = true];

		optional string process_name = 2;
		// Process cpu time in user space, cumulative from boot/process start
		optional int64 user_time_millis = 3;
		// Process cpu time in system space, cumulative from boot/process start
		optional int64 system_time_millis = 4;
		}

		/**
		* Logs when a user restriction was added or removed.
		*

cmds/statsd/src/external/StatsPullerManager.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -229,9 +229,6 @@ const std::map<int, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = {
		// PowerProfile constants for power model calculations.
		{android::util::POWER_PROFILE,
		{{}, {}, 1 * NS_PER_SEC, new StatsCompanionServicePuller(android::util::POWER_PROFILE)}},
		// Process cpu stats. Min cool-down is 5 sec, inline with what AcitivityManagerService uses.
		{android::util::PROCESS_CPU_TIME,
		{{}, {}, 5 * NS_PER_SEC, new StatsCompanionServicePuller(android::util::PROCESS_CPU_TIME)}},
		};

		StatsPullerManager::StatsPullerManager() : mNextPullTimeNs(NO_ALARM_UPDATE) {

services/core/java/com/android/server/stats/StatsCompanionService.java

+37 −72

Original line number	Diff line number	Diff line
		@@ -88,7 +88,6 @@ import com.android.internal.os.KernelWakelockReader;
		import com.android.internal.os.KernelWakelockStats;
		import com.android.internal.os.LooperStats;
		import com.android.internal.os.PowerProfile;
		import com.android.internal.os.ProcessCpuTracker;
		import com.android.internal.os.StoragedUidIoStatsReader;
		import com.android.internal.util.DumpUtils;
		import com.android.server.BinderCallsStatsService;
		@@ -175,6 +174,11 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		private final KernelWakelockStats mTmpWakelockStats = new KernelWakelockStats();
		private IWifiManager mWifiManager = null;
		private TelephonyManager mTelephony = null;
		private final StatFs mStatFsData = new StatFs(Environment.getDataDirectory().getAbsolutePath());
		private final StatFs mStatFsSystem =
		new StatFs(Environment.getRootDirectory().getAbsolutePath());
		private final StatFs mStatFsTemp =
		new StatFs(Environment.getDownloadCacheDirectory().getAbsolutePath());
		@GuardedBy("sStatsdLock")
		private final HashSet<Long> mDeathTimeMillis = new HashSet<>();
		@GuardedBy("sStatsdLock")
		@@ -195,8 +199,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		private static IThermalService sThermalService;
		private File mBaseDir =
		new File(SystemServiceManager.ensureSystemDir(), "stats_companion");
		@GuardedBy("this")
		ProcessCpuTracker mProcessCpuTracker = null;

		public StatsCompanionService(Context context) {
		super();
		@@ -770,7 +772,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		private void pullBluetoothBytesTransfer(
		int tagId, long elapsedNanos, long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		BluetoothActivityEnergyInfo info = fetchBluetoothData();
		BluetoothActivityEnergyInfo info = pullBluetoothData();
		if (info.getUidTraffic() != null) {
		for (UidTraffic traffic : info.getUidTraffic()) {
		StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos,
		@@ -882,12 +884,9 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		int tagId, long elapsedNanos, long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		long token = Binder.clearCallingIdentity();
		synchronized (this) {
		if (mWifiManager == null) {
		mWifiManager =
		IWifiManager.Stub.asInterface(
		ServiceManager.getService(Context.WIFI_SERVICE));
		}
		IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));
		}
		if (mWifiManager != null) {
		try {
		@@ -917,11 +916,9 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		int tagId, long elapsedNanos, long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		long token = Binder.clearCallingIdentity();
		synchronized (this) {
		if (mTelephony == null) {
		mTelephony = TelephonyManager.from(mContext);
		}
		}
		if (mTelephony != null) {
		SynchronousResultReceiver modemReceiver = new SynchronousResultReceiver("telephony");
		mTelephony.requestModemActivityInfo(modemReceiver);
		@@ -944,7 +941,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		private void pullBluetoothActivityInfo(
		int tagId, long elapsedNanos, long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		BluetoothActivityEnergyInfo info = fetchBluetoothData();
		BluetoothActivityEnergyInfo info = pullBluetoothData();
		StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos);
		e.writeLong(info.getTimeStamp());
		e.writeInt(info.getBluetoothStackState());
		@@ -955,7 +952,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		pulledData.add(e);
		}

		private synchronized BluetoothActivityEnergyInfo fetchBluetoothData() {
		private synchronized BluetoothActivityEnergyInfo pullBluetoothData() {
		final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
		if (adapter != null) {
		SynchronousResultReceiver bluetoothReceiver = new SynchronousResultReceiver(
		@@ -1326,7 +1323,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {

		private void pullProcessStats(int section, int tagId, long elapsedNanos, long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		synchronized (this) {
		try {
		long lastHighWaterMark = readProcStatsHighWaterMark(section);
		List<ParcelFileDescriptor> statsFiles = new ArrayList<>();
		@@ -1335,16 +1331,13 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		if (statsFiles.size() != 1) {
		return;
		}
		InputStream stream = new ParcelFileDescriptor.AutoCloseInputStream(
		statsFiles.get(0));
		InputStream stream = new ParcelFileDescriptor.AutoCloseInputStream(statsFiles.get(0));
		int[] len = new int[1];
		byte[] stats = readFully(stream, len);
		StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos,
		wallClockNanos);
		StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos);
		e.writeStorage(Arrays.copyOf(stats, len[0]));
		pulledData.add(e);
		new File(mBaseDir.getAbsolutePath() + "/" + section + "_"
		+ lastHighWaterMark).delete();
		new File(mBaseDir.getAbsolutePath() + "/" + section + "_" + lastHighWaterMark).delete();
		new File(
		mBaseDir.getAbsolutePath() + "/" + section + "_"
		+ highWaterMark).createNewFile();
		@@ -1356,7 +1349,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		Log.e(TAG, "Getting procstats failed: ", e);
		}
		}
		}

		static byte[] readFully(InputStream stream, int[] outLen) throws IOException {
		int pos = 0;
		@@ -1423,34 +1415,12 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		});
		}

		private void pullProcessCpuTime(int tagId, long elapsedNanos, final long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		synchronized (this) {
		if (mProcessCpuTracker == null) {
		mProcessCpuTracker = new ProcessCpuTracker(false);
		mProcessCpuTracker.init();
		}
		mProcessCpuTracker.update();
		for (int i = 0; i < mProcessCpuTracker.countStats(); i++) {
		ProcessCpuTracker.Stats st = mProcessCpuTracker.getStats(i);
		StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos,
		wallClockNanos);
		e.writeInt(st.uid);
		e.writeString(st.name);
		e.writeLong(st.base_utime);
		e.writeLong(st.base_stime);
		pulledData.add(e);
		}
		}
		}

		/**
		* Pulls various data.
		*/
		@Override // Binder call
		public StatsLogEventWrapper[] pullData(int tagId) {
		enforceCallingPermission();

		if (DEBUG) {
		Slog.d(TAG, "Pulling " + tagId);
		}
		@@ -1563,8 +1533,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		break;
		}
		case StatsLog.PROC_STATS: {
		pullProcessStats(ProcessStats.REPORT_ALL, tagId, elapsedNanos, wallClockNanos,
		ret);
		pullProcessStats(ProcessStats.REPORT_ALL, tagId, elapsedNanos, wallClockNanos, ret);
		break;
		}
		case StatsLog.PROC_STATS_PKG_PROC: {
		@@ -1580,10 +1549,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		pullPowerProfile(tagId, elapsedNanos, wallClockNanos, ret);
		break;
		}
		case StatsLog.PROCESS_CPU_TIME: {
		pullProcessCpuTime(tagId, elapsedNanos, wallClockNanos, ret);
		break;
		}
		default:
		Slog.w(TAG, "No such tagId data as " + tagId);
		return null;