diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index a39acb218193b..c37f05e165083 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -85,19 +85,19 @@ message Atom { // Pulled events will start at field 1000. oneof pulled { - WifiBytesTransferred wifi_bytes_transferred = 1000; - WifiBytesTransferredByFgBg wifi_bytes_transferred_by_fg_bg = 1001; - MobileBytesTransferred mobile_bytes_transferred = 1002; - MobileBytesTransferredByFgBg mobile_bytes_transferred_by_fg_bg = 1003; - KernelWakelockPulled kernel_wakelock_pulled = 1004; - PowerStatePlatformSleepStatePulled power_state_platform_sleep_state_pulled = 1005; - PowerStateVoterPulled power_state_voter_pulled = 1006; - PowerStateSubsystemSleepStatePulled power_state_subsystem_sleep_state_pulled = 1007; - CpuTimePerFreqPulled cpu_time_per_freq_pulled = 1008; - CpuTimePerUidPulled cpu_time_per_uid_pulled = 1009; - CpuTimePerUidFreqPulled cpu_time_per_uid_freq_pulled = 1010; - WifiActivityEnergyInfoPulled wifi_activity_energy_info_pulled = 1011; - ModemActivityInfoPulled modem_activity_info_pulled = 1012; + WifiBytesTransfer wifi_bytes_transfer = 1000; + WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 1001; + MobileBytesTransfer mobile_bytes_transfer = 1002; + MobileBytesTransferByFgBg mobile_bytes_transfer_by_fg_bg = 1003; + KernelWakelock kernel_wakelock = 1004; + PlatformSleepState platform_sleep_state = 1005; + SleepStateVoter sleep_state_voter = 1006; + SubsystemSleepState subsystem_sleep_state = 1007; + CpuTimePerFreq cpu_time_per_freq = 1008; + CpuTimePerUid cpu_time_per_uid = 1009; + CpuTimePerUidFreq cpu_time_per_uid_freq = 1010; + WifiActivityEnergyInfo wifi_activity_energy_info = 1011; + ModemActivityInfo modem_activity_info = 1012; AttributionChainDummyAtom attribution_chain_dummy_atom = 10000; } } @@ -846,7 +846,7 @@ message AppHook { * Pulled from: * StatsCompanionService (using BatteryStats to get which interfaces are wifi) */ -message WifiBytesTransferred { +message WifiBytesTransfer { optional int32 uid = 1; optional int64 rx_bytes = 2; @@ -864,7 +864,7 @@ message WifiBytesTransferred { * Pulled from: * StatsCompanionService (using BatteryStats to get which interfaces are wifi) */ -message WifiBytesTransferredByFgBg { +message WifiBytesTransferByFgBg { optional int32 uid = 1; // 1 denotes foreground and 0 denotes background. This is called Set in NetworkStats. @@ -885,7 +885,7 @@ message WifiBytesTransferredByFgBg { * Pulled from: * StatsCompanionService (using BatteryStats to get which interfaces are mobile data) */ -message MobileBytesTransferred { +message MobileBytesTransfer { optional int32 uid = 1; optional int64 rx_bytes = 2; @@ -903,7 +903,7 @@ message MobileBytesTransferred { * Pulled from: * StatsCompanionService (using BatteryStats to get which interfaces are mobile data) */ -message MobileBytesTransferredByFgBg { +message MobileBytesTransferByFgBg { optional int32 uid = 1; // 1 denotes foreground and 0 denotes background. This is called Set in NetworkStats. @@ -925,7 +925,7 @@ message MobileBytesTransferredByFgBg { * Pulled from: * StatsCompanionService using KernelWakelockReader. */ -message KernelWakelockPulled { +message KernelWakelock { optional string name = 1; optional int32 count = 2; @@ -941,7 +941,7 @@ message KernelWakelockPulled { * Definition here: * hardware/interfaces/power/1.0/types.hal */ -message PowerStatePlatformSleepStatePulled { +message PlatformSleepState { optional string name = 1; optional uint64 residency_in_msec_since_boot = 2; optional uint64 total_transitions = 3; @@ -954,9 +954,9 @@ message PowerStatePlatformSleepStatePulled { * Definition here: * hardware/interfaces/power/1.0/types.hal */ -message PowerStateVoterPulled { - optional string power_state_platform_sleep_state_name = 1; - optional string power_state_voter_name = 2; +message SleepStateVoter { + optional string platform_sleep_state_name = 1; + optional string voter_name = 2; optional uint64 total_time_in_msec_voted_for_since_boot = 3; optional uint64 total_number_of_times_voted_since_boot = 4; } @@ -967,9 +967,9 @@ message PowerStateVoterPulled { * Definition here: * hardware/interfaces/power/1.1/types.hal */ -message PowerStateSubsystemSleepStatePulled { - optional string power_state_subsystem_name = 1; - optional string power_state_subsystem_sleep_state_name = 2; +message SubsystemSleepState { + optional string subsystem_name = 1; + optional string subsystem_sleep_state_name = 2; optional uint64 residency_in_msec_since_boot = 3; optional uint64 total_transitions = 4; optional uint64 last_entry_timestamp_ms = 5; @@ -1006,17 +1006,17 @@ message IsolatedUidChanged { * if current time is smaller than last value, there must be a cpu * hotplug event, and the current time is taken as delta. */ -message CpuTimePerFreqPulled { +message CpuTimePerFreq { optional uint32 cluster = 1; optional uint32 freq_index = 2; - optional uint64 time = 3; + optional uint64 time_ms = 3; } /** * Pulls Cpu Time Per Uid. * Note that isolated process uid time should be attributed to host uids. */ -message CpuTimePerUidPulled { +message CpuTimePerUid { optional uint64 uid = 1; optional uint64 user_time_ms = 2; optional uint64 sys_time_ms = 3; @@ -1027,7 +1027,7 @@ message CpuTimePerUidPulled { * Note that isolated process uid time should be attributed to host uids. * For each uid, we order the time by descending frequencies. */ -message CpuTimePerUidFreqPulled { +message CpuTimePerUidFreq { optional uint64 uid = 1; optional uint64 freq_idx = 2; optional uint64 time_ms = 3; @@ -1065,7 +1065,7 @@ message PacketWakeupOccurred { /** * Pulls Wifi Controller Activity Energy Info */ -message WifiActivityEnergyInfoPulled { +message WifiActivityEnergyInfo { // timestamp(wall clock) of record creation optional uint64 timestamp_ms = 1; // stack reported state @@ -1084,7 +1084,7 @@ message WifiActivityEnergyInfoPulled { /** * Pulls Modem Activity Energy Info */ -message ModemActivityInfoPulled { +message ModemActivityInfo { // timestamp(wall clock) of record creation optional uint64 timestamp_ms = 1; // sleep time in ms. diff --git a/cmds/statsd/src/external/CpuTimePerUidFreqPuller.cpp b/cmds/statsd/src/external/CpuTimePerUidFreqPuller.cpp index e2745d21af3dd..97387602627bb 100644 --- a/cmds/statsd/src/external/CpuTimePerUidFreqPuller.cpp +++ b/cmds/statsd/src/external/CpuTimePerUidFreqPuller.cpp @@ -70,7 +70,7 @@ bool CpuTimePerUidFreqPuller::Pull(const int tagId, vector> int idx = 0; do { timeMs = std::stoull(pch); - auto ptr = make_shared(android::util::CPU_TIME_PER_UID_FREQ_PULLED, timestamp); + auto ptr = make_shared(android::util::CPU_TIME_PER_UID_FREQ, timestamp); ptr->write(uid); ptr->write(idx); ptr->write(timeMs); diff --git a/cmds/statsd/src/external/CpuTimePerUidPuller.cpp b/cmds/statsd/src/external/CpuTimePerUidPuller.cpp index e0572dca679d4..f69b9b5379439 100644 --- a/cmds/statsd/src/external/CpuTimePerUidPuller.cpp +++ b/cmds/statsd/src/external/CpuTimePerUidPuller.cpp @@ -65,7 +65,7 @@ bool CpuTimePerUidPuller::Pull(const int tagId, vector>* da pch = strtok(buf, " "); uint64_t sysTimeMs = std::stoull(pch); - auto ptr = make_shared(android::util::CPU_TIME_PER_UID_PULLED, timestamp); + auto ptr = make_shared(android::util::CPU_TIME_PER_UID, timestamp); ptr->write(uid); ptr->write(userTimeMs); ptr->write(sysTimeMs); diff --git a/cmds/statsd/src/external/ResourcePowerManagerPuller.cpp b/cmds/statsd/src/external/ResourcePowerManagerPuller.cpp index 3ee636dfcde5f..cb9f1cc15ce96 100644 --- a/cmds/statsd/src/external/ResourcePowerManagerPuller.cpp +++ b/cmds/statsd/src/external/ResourcePowerManagerPuller.cpp @@ -92,7 +92,7 @@ bool ResourcePowerManagerPuller::Pull(const int tagId, vector( - android::util::POWER_STATE_PLATFORM_SLEEP_STATE_PULLED, timestamp); + android::util::PLATFORM_SLEEP_STATE, timestamp); statePtr->write(state.name); statePtr->write(state.residencyInMsecSinceBoot); statePtr->write(state.totalTransitions); @@ -104,7 +104,7 @@ bool ResourcePowerManagerPuller::Pull(const int tagId, vector(android::util::POWER_STATE_VOTER_PULLED, timestamp); + make_shared(android::util::SLEEP_STATE_VOTER, timestamp); voterPtr->write(state.name); voterPtr->write(voter.name); voterPtr->write(voter.totalTimeInMsecVotedForSinceBoot); @@ -138,7 +138,7 @@ bool ResourcePowerManagerPuller::Pull(const int tagId, vector( - android::util::POWER_STATE_SUBSYSTEM_SLEEP_STATE_PULLED, timestamp); + android::util::SUBSYSTEM_SLEEP_STATE, timestamp); subsystemStatePtr->write(subsystem.name); subsystemStatePtr->write(state.name); subsystemStatePtr->write(state.residencyInMsecSinceBoot); diff --git a/cmds/statsd/src/external/StatsPullerManagerImpl.cpp b/cmds/statsd/src/external/StatsPullerManagerImpl.cpp index c4688a2b1c3de..79925ff138cfd 100644 --- a/cmds/statsd/src/external/StatsPullerManagerImpl.cpp +++ b/cmds/statsd/src/external/StatsPullerManagerImpl.cpp @@ -50,24 +50,24 @@ StatsPullerManagerImpl::StatsPullerManagerImpl() shared_ptr cpuTimePerUidPuller = make_shared(); shared_ptr cpuTimePerUidFreqPuller = make_shared(); - mPullers.insert({android::util::KERNEL_WAKELOCK_PULLED, + mPullers.insert({android::util::KERNEL_WAKELOCK, statsCompanionServicePuller}); - mPullers.insert({android::util::WIFI_BYTES_TRANSFERRED, + mPullers.insert({android::util::WIFI_BYTES_TRANSFER, statsCompanionServicePuller}); - mPullers.insert({android::util::MOBILE_BYTES_TRANSFERRED, + mPullers.insert({android::util::MOBILE_BYTES_TRANSFER, statsCompanionServicePuller}); - mPullers.insert({android::util::WIFI_BYTES_TRANSFERRED_BY_FG_BG, + mPullers.insert({android::util::WIFI_BYTES_TRANSFER_BY_FG_BG, statsCompanionServicePuller}); - mPullers.insert({android::util::MOBILE_BYTES_TRANSFERRED_BY_FG_BG, + mPullers.insert({android::util::MOBILE_BYTES_TRANSFER_BY_FG_BG, statsCompanionServicePuller}); - mPullers.insert({android::util::POWER_STATE_PLATFORM_SLEEP_STATE_PULLED, + mPullers.insert({android::util::PLATFORM_SLEEP_STATE, resourcePowerManagerPuller}); - mPullers.insert({android::util::POWER_STATE_VOTER_PULLED, + mPullers.insert({android::util::SLEEP_STATE_VOTER, resourcePowerManagerPuller}); - mPullers.insert({android::util::POWER_STATE_SUBSYSTEM_SLEEP_STATE_PULLED, + mPullers.insert({android::util::SUBSYSTEM_SLEEP_STATE, resourcePowerManagerPuller}); - mPullers.insert({android::util::CPU_TIME_PER_UID_PULLED, cpuTimePerUidPuller}); - mPullers.insert({android::util::CPU_TIME_PER_UID_FREQ_PULLED, cpuTimePerUidFreqPuller}); + mPullers.insert({android::util::CPU_TIME_PER_UID, cpuTimePerUidPuller}); + mPullers.insert({android::util::CPU_TIME_PER_UID_FREQ, cpuTimePerUidFreqPuller}); mStatsCompanionService = StatsService::getStatsCompanionService(); } diff --git a/cmds/statsd/tests/guardrail/StatsdStats_test.cpp b/cmds/statsd/tests/guardrail/StatsdStats_test.cpp index 312de1b166648..765804475eef8 100644 --- a/cmds/statsd/tests/guardrail/StatsdStats_test.cpp +++ b/cmds/statsd/tests/guardrail/StatsdStats_test.cpp @@ -214,7 +214,7 @@ TEST(StatsdStatsTest, TestAtomLog) { stats.noteAtomLogged(android::util::SENSOR_STATE_CHANGED, now + 2); stats.noteAtomLogged(android::util::DROPBOX_ERROR_CHANGED, now + 3); // pulled event, should ignore - stats.noteAtomLogged(android::util::WIFI_BYTES_TRANSFERRED, now + 4); + stats.noteAtomLogged(android::util::WIFI_BYTES_TRANSFER, now + 4); vector output; stats.dumpStats(&output, false); diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java index 1ce140004bcd9..b31f4b3fca632 100644 --- a/services/core/java/com/android/server/stats/StatsCompanionService.java +++ b/services/core/java/com/android/server/stats/StatsCompanionService.java @@ -455,7 +455,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { Slog.d(TAG, "Pulling " + tagId); switch (tagId) { - case StatsLog.WIFI_BYTES_TRANSFERRED: { + case StatsLog.WIFI_BYTES_TRANSFER: { long token = Binder.clearCallingIdentity(); try { // TODO: Consider caching the following call to get BatteryStatsInternal. @@ -476,7 +476,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } break; } - case StatsLog.MOBILE_BYTES_TRANSFERRED: { + case StatsLog.MOBILE_BYTES_TRANSFER: { long token = Binder.clearCallingIdentity(); try { BatteryStatsInternal bs = LocalServices.getService(BatteryStatsInternal.class); @@ -496,7 +496,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } break; } - case StatsLog.WIFI_BYTES_TRANSFERRED_BY_FG_BG: { + case StatsLog.WIFI_BYTES_TRANSFER_BY_FG_BG: { long token = Binder.clearCallingIdentity(); try { BatteryStatsInternal bs = LocalServices.getService(BatteryStatsInternal.class); @@ -516,7 +516,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } break; } - case StatsLog.MOBILE_BYTES_TRANSFERRED_BY_FG_BG: { + case StatsLog.MOBILE_BYTES_TRANSFER_BY_FG_BG: { long token = Binder.clearCallingIdentity(); try { BatteryStatsInternal bs = LocalServices.getService(BatteryStatsInternal.class); @@ -536,7 +536,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } break; } - case StatsLog.KERNEL_WAKELOCK_PULLED: { + case StatsLog.KERNEL_WAKELOCK: { final KernelWakelockStats wakelockStats = mKernelWakelockReader.readKernelWakelockStats(mTmpWakelockStats); List ret = new ArrayList(); @@ -552,7 +552,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } return ret.toArray(new StatsLogEventWrapper[ret.size()]); } - case StatsLog.CPU_TIME_PER_FREQ_PULLED: { + case StatsLog.CPU_TIME_PER_FREQ: { List ret = new ArrayList(); for (int cluster = 0; cluster < mKernelCpuSpeedReaders.length; cluster++) { long[] clusterTimeMs = mKernelCpuSpeedReaders[cluster].readDelta(); @@ -568,7 +568,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } return ret.toArray(new StatsLogEventWrapper[ret.size()]); } - case StatsLog.WIFI_ACTIVITY_ENERGY_INFO_PULLED: { + case StatsLog.WIFI_ACTIVITY_ENERGY_INFO: { List ret = new ArrayList(); long token = Binder.clearCallingIdentity(); if (mWifiManager == null) { @@ -596,7 +596,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } break; } - case StatsLog.MODEM_ACTIVITY_INFO_PULLED: { + case StatsLog.MODEM_ACTIVITY_INFO: { List ret = new ArrayList(); long token = Binder.clearCallingIdentity(); if (mTelephony == null) {