Merge "rename pulled atoms to shorter names" (b5c1fe39) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+31 −31

Original line number	Original line	Diff line number	Diff line
	@@ -85,19 +85,19 @@ message Atom {

	// Pulled events will start at field 1000.		// Pulled events will start at field 1000.
	oneof pulled {		oneof pulled {
	WifiBytesTransferred wifi_bytes_transferred = 1000;		WifiBytesTransfer wifi_bytes_transfer = 1000;
	WifiBytesTransferredByFgBg wifi_bytes_transferred_by_fg_bg = 1001;		WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 1001;
	MobileBytesTransferred mobile_bytes_transferred = 1002;		MobileBytesTransfer mobile_bytes_transfer = 1002;
	MobileBytesTransferredByFgBg mobile_bytes_transferred_by_fg_bg = 1003;		MobileBytesTransferByFgBg mobile_bytes_transfer_by_fg_bg = 1003;
	KernelWakelockPulled kernel_wakelock_pulled = 1004;		KernelWakelock kernel_wakelock = 1004;
	PowerStatePlatformSleepStatePulled power_state_platform_sleep_state_pulled = 1005;		PlatformSleepState platform_sleep_state = 1005;
	PowerStateVoterPulled power_state_voter_pulled = 1006;		SleepStateVoter sleep_state_voter = 1006;
	PowerStateSubsystemSleepStatePulled power_state_subsystem_sleep_state_pulled = 1007;		SubsystemSleepState subsystem_sleep_state = 1007;
	CpuTimePerFreqPulled cpu_time_per_freq_pulled = 1008;		CpuTimePerFreq cpu_time_per_freq = 1008;
	CpuTimePerUidPulled cpu_time_per_uid_pulled = 1009;		CpuTimePerUid cpu_time_per_uid = 1009;
	CpuTimePerUidFreqPulled cpu_time_per_uid_freq_pulled = 1010;		CpuTimePerUidFreq cpu_time_per_uid_freq = 1010;
	WifiActivityEnergyInfoPulled wifi_activity_energy_info_pulled = 1011;		WifiActivityEnergyInfo wifi_activity_energy_info = 1011;
	ModemActivityInfoPulled modem_activity_info_pulled = 1012;		ModemActivityInfo modem_activity_info = 1012;
	AttributionChainDummyAtom attribution_chain_dummy_atom = 10000;		AttributionChainDummyAtom attribution_chain_dummy_atom = 10000;
	}		}
	}		}
	@@ -846,7 +846,7 @@ message AppHook {
	* Pulled from:		* Pulled from:
	* StatsCompanionService (using BatteryStats to get which interfaces are wifi)		* StatsCompanionService (using BatteryStats to get which interfaces are wifi)
	*/		*/
	message WifiBytesTransferred {		message WifiBytesTransfer {
	optional int32 uid = 1;		optional int32 uid = 1;

	optional int64 rx_bytes = 2;		optional int64 rx_bytes = 2;
	@@ -864,7 +864,7 @@ message WifiBytesTransferred {
	* Pulled from:		* Pulled from:
	* StatsCompanionService (using BatteryStats to get which interfaces are wifi)		* StatsCompanionService (using BatteryStats to get which interfaces are wifi)
	*/		*/
	message WifiBytesTransferredByFgBg {		message WifiBytesTransferByFgBg {
	optional int32 uid = 1;		optional int32 uid = 1;

	// 1 denotes foreground and 0 denotes background. This is called Set in NetworkStats.		// 1 denotes foreground and 0 denotes background. This is called Set in NetworkStats.
	@@ -885,7 +885,7 @@ message WifiBytesTransferredByFgBg {
	* Pulled from:		* Pulled from:
	* StatsCompanionService (using BatteryStats to get which interfaces are mobile data)		* StatsCompanionService (using BatteryStats to get which interfaces are mobile data)
	*/		*/
	message MobileBytesTransferred {		message MobileBytesTransfer {
	optional int32 uid = 1;		optional int32 uid = 1;

	optional int64 rx_bytes = 2;		optional int64 rx_bytes = 2;
	@@ -903,7 +903,7 @@ message MobileBytesTransferred {
	* Pulled from:		* Pulled from:
	* StatsCompanionService (using BatteryStats to get which interfaces are mobile data)		* StatsCompanionService (using BatteryStats to get which interfaces are mobile data)
	*/		*/
	message MobileBytesTransferredByFgBg {		message MobileBytesTransferByFgBg {
	optional int32 uid = 1;		optional int32 uid = 1;

	// 1 denotes foreground and 0 denotes background. This is called Set in NetworkStats.		// 1 denotes foreground and 0 denotes background. This is called Set in NetworkStats.
	@@ -925,7 +925,7 @@ message MobileBytesTransferredByFgBg {
	* Pulled from:		* Pulled from:
	* StatsCompanionService using KernelWakelockReader.		* StatsCompanionService using KernelWakelockReader.
	*/		*/
	message KernelWakelockPulled {		message KernelWakelock {
	optional string name = 1;		optional string name = 1;

	optional int32 count = 2;		optional int32 count = 2;
	@@ -941,7 +941,7 @@ message KernelWakelockPulled {
	* Definition here:		* Definition here:
	* hardware/interfaces/power/1.0/types.hal		* hardware/interfaces/power/1.0/types.hal
	*/		*/
	message PowerStatePlatformSleepStatePulled {		message PlatformSleepState {
	optional string name = 1;		optional string name = 1;
	optional uint64 residency_in_msec_since_boot = 2;		optional uint64 residency_in_msec_since_boot = 2;
	optional uint64 total_transitions = 3;		optional uint64 total_transitions = 3;
	@@ -954,9 +954,9 @@ message PowerStatePlatformSleepStatePulled {
	* Definition here:		* Definition here:
	* hardware/interfaces/power/1.0/types.hal		* hardware/interfaces/power/1.0/types.hal
	*/		*/
	message PowerStateVoterPulled {		message SleepStateVoter {
	optional string power_state_platform_sleep_state_name = 1;		optional string platform_sleep_state_name = 1;
	optional string power_state_voter_name = 2;		optional string voter_name = 2;
	optional uint64 total_time_in_msec_voted_for_since_boot = 3;		optional uint64 total_time_in_msec_voted_for_since_boot = 3;
	optional uint64 total_number_of_times_voted_since_boot = 4;		optional uint64 total_number_of_times_voted_since_boot = 4;
	}		}
	@@ -967,9 +967,9 @@ message PowerStateVoterPulled {
	* Definition here:		* Definition here:
	* hardware/interfaces/power/1.1/types.hal		* hardware/interfaces/power/1.1/types.hal
	*/		*/
	message PowerStateSubsystemSleepStatePulled {		message SubsystemSleepState {
	optional string power_state_subsystem_name = 1;		optional string subsystem_name = 1;
	optional string power_state_subsystem_sleep_state_name = 2;		optional string subsystem_sleep_state_name = 2;
	optional uint64 residency_in_msec_since_boot = 3;		optional uint64 residency_in_msec_since_boot = 3;
	optional uint64 total_transitions = 4;		optional uint64 total_transitions = 4;
	optional uint64 last_entry_timestamp_ms = 5;		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		* if current time is smaller than last value, there must be a cpu
	* hotplug event, and the current time is taken as delta.		* hotplug event, and the current time is taken as delta.
	*/		*/
	message CpuTimePerFreqPulled {		message CpuTimePerFreq {
	optional uint32 cluster = 1;		optional uint32 cluster = 1;
	optional uint32 freq_index = 2;		optional uint32 freq_index = 2;
	optional uint64 time = 3;		optional uint64 time_ms = 3;
	}		}

	/**		/**
	* Pulls Cpu Time Per Uid.		* Pulls Cpu Time Per Uid.
	* Note that isolated process uid time should be attributed to host uids.		* Note that isolated process uid time should be attributed to host uids.
	*/		*/
	message CpuTimePerUidPulled {		message CpuTimePerUid {
	optional uint64 uid = 1;		optional uint64 uid = 1;
	optional uint64 user_time_ms = 2;		optional uint64 user_time_ms = 2;
	optional uint64 sys_time_ms = 3;		optional uint64 sys_time_ms = 3;
	@@ -1027,7 +1027,7 @@ message CpuTimePerUidPulled {
	* Note that isolated process uid time should be attributed to host uids.		* Note that isolated process uid time should be attributed to host uids.
	* For each uid, we order the time by descending frequencies.		* For each uid, we order the time by descending frequencies.
	*/		*/
	message CpuTimePerUidFreqPulled {		message CpuTimePerUidFreq {
	optional uint64 uid = 1;		optional uint64 uid = 1;
	optional uint64 freq_idx = 2;		optional uint64 freq_idx = 2;
	optional uint64 time_ms = 3;		optional uint64 time_ms = 3;
	@@ -1065,7 +1065,7 @@ message PacketWakeupOccurred {
	/**		/**
	* Pulls Wifi Controller Activity Energy Info		* Pulls Wifi Controller Activity Energy Info
	*/		*/
	message WifiActivityEnergyInfoPulled {		message WifiActivityEnergyInfo {
	// timestamp(wall clock) of record creation		// timestamp(wall clock) of record creation
	optional uint64 timestamp_ms = 1;		optional uint64 timestamp_ms = 1;
	// stack reported state		// stack reported state
	@@ -1084,7 +1084,7 @@ message WifiActivityEnergyInfoPulled {
	/**		/**
	* Pulls Modem Activity Energy Info		* Pulls Modem Activity Energy Info
	*/		*/
	message ModemActivityInfoPulled {		message ModemActivityInfo {
	// timestamp(wall clock) of record creation		// timestamp(wall clock) of record creation
	optional uint64 timestamp_ms = 1;		optional uint64 timestamp_ms = 1;
	// sleep time in ms.		// sleep time in ms.

cmds/statsd/src/external/CpuTimePerUidFreqPuller.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,7 @@ bool CpuTimePerUidFreqPuller::Pull(const int tagId, vector<shared_ptr<LogEvent>>
	int idx = 0;		int idx = 0;
	do {		do {
	timeMs = std::stoull(pch);		timeMs = std::stoull(pch);
	auto ptr = make_shared<LogEvent>(android::util::CPU_TIME_PER_UID_FREQ_PULLED, timestamp);		auto ptr = make_shared<LogEvent>(android::util::CPU_TIME_PER_UID_FREQ, timestamp);
	ptr->write(uid);		ptr->write(uid);
	ptr->write(idx);		ptr->write(idx);
	ptr->write(timeMs);		ptr->write(timeMs);

cmds/statsd/src/external/CpuTimePerUidPuller.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ bool CpuTimePerUidPuller::Pull(const int tagId, vector<shared_ptr<LogEvent>>* da
	pch = strtok(buf, " ");		pch = strtok(buf, " ");
	uint64_t sysTimeMs = std::stoull(pch);		uint64_t sysTimeMs = std::stoull(pch);

	auto ptr = make_shared<LogEvent>(android::util::CPU_TIME_PER_UID_PULLED, timestamp);		auto ptr = make_shared<LogEvent>(android::util::CPU_TIME_PER_UID, timestamp);
	ptr->write(uid);		ptr->write(uid);
	ptr->write(userTimeMs);		ptr->write(userTimeMs);
	ptr->write(sysTimeMs);		ptr->write(sysTimeMs);

cmds/statsd/src/external/ResourcePowerManagerPuller.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -92,7 +92,7 @@ bool ResourcePowerManagerPuller::Pull(const int tagId, vector<shared_ptr<LogEven
	const PowerStatePlatformSleepState& state = states[i];		const PowerStatePlatformSleepState& state = states[i];

	auto statePtr = make_shared<LogEvent>(		auto statePtr = make_shared<LogEvent>(
	android::util::POWER_STATE_PLATFORM_SLEEP_STATE_PULLED, timestamp);		android::util::PLATFORM_SLEEP_STATE, timestamp);
	statePtr->write(state.name);		statePtr->write(state.name);
	statePtr->write(state.residencyInMsecSinceBoot);		statePtr->write(state.residencyInMsecSinceBoot);
	statePtr->write(state.totalTransitions);		statePtr->write(state.totalTransitions);
	@@ -104,7 +104,7 @@ bool ResourcePowerManagerPuller::Pull(const int tagId, vector<shared_ptr<LogEven
	(long long)state.totalTransitions, state.supportedOnlyInSuspend ? 1 : 0);		(long long)state.totalTransitions, state.supportedOnlyInSuspend ? 1 : 0);
	for (auto voter : state.voters) {		for (auto voter : state.voters) {
	auto voterPtr =		auto voterPtr =
	make_shared<LogEvent>(android::util::POWER_STATE_VOTER_PULLED, timestamp);		make_shared<LogEvent>(android::util::SLEEP_STATE_VOTER, timestamp);
	voterPtr->write(state.name);		voterPtr->write(state.name);
	voterPtr->write(voter.name);		voterPtr->write(voter.name);
	voterPtr->write(voter.totalTimeInMsecVotedForSinceBoot);		voterPtr->write(voter.totalTimeInMsecVotedForSinceBoot);
	@@ -138,7 +138,7 @@ bool ResourcePowerManagerPuller::Pull(const int tagId, vector<shared_ptr<LogEven
	for (size_t j = 0; j < subsystem.states.size(); j++) {		for (size_t j = 0; j < subsystem.states.size(); j++) {
	const PowerStateSubsystemSleepState& state = subsystem.states[j];		const PowerStateSubsystemSleepState& state = subsystem.states[j];
	auto subsystemStatePtr = make_shared<LogEvent>(		auto subsystemStatePtr = make_shared<LogEvent>(
	android::util::POWER_STATE_SUBSYSTEM_SLEEP_STATE_PULLED, timestamp);		android::util::SUBSYSTEM_SLEEP_STATE, timestamp);
	subsystemStatePtr->write(subsystem.name);		subsystemStatePtr->write(subsystem.name);
	subsystemStatePtr->write(state.name);		subsystemStatePtr->write(state.name);
	subsystemStatePtr->write(state.residencyInMsecSinceBoot);		subsystemStatePtr->write(state.residencyInMsecSinceBoot);

cmds/statsd/src/external/StatsPullerManagerImpl.cpp

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -50,24 +50,24 @@ StatsPullerManagerImpl::StatsPullerManagerImpl()
	shared_ptr<StatsPuller> cpuTimePerUidPuller = make_shared<CpuTimePerUidPuller>();		shared_ptr<StatsPuller> cpuTimePerUidPuller = make_shared<CpuTimePerUidPuller>();
	shared_ptr<StatsPuller> cpuTimePerUidFreqPuller = make_shared<CpuTimePerUidFreqPuller>();		shared_ptr<StatsPuller> cpuTimePerUidFreqPuller = make_shared<CpuTimePerUidFreqPuller>();

	mPullers.insert({android::util::KERNEL_WAKELOCK_PULLED,		mPullers.insert({android::util::KERNEL_WAKELOCK,
	statsCompanionServicePuller});		statsCompanionServicePuller});
	mPullers.insert({android::util::WIFI_BYTES_TRANSFERRED,		mPullers.insert({android::util::WIFI_BYTES_TRANSFER,
	statsCompanionServicePuller});		statsCompanionServicePuller});
	mPullers.insert({android::util::MOBILE_BYTES_TRANSFERRED,		mPullers.insert({android::util::MOBILE_BYTES_TRANSFER,
	statsCompanionServicePuller});		statsCompanionServicePuller});
	mPullers.insert({android::util::WIFI_BYTES_TRANSFERRED_BY_FG_BG,		mPullers.insert({android::util::WIFI_BYTES_TRANSFER_BY_FG_BG,
	statsCompanionServicePuller});		statsCompanionServicePuller});
	mPullers.insert({android::util::MOBILE_BYTES_TRANSFERRED_BY_FG_BG,		mPullers.insert({android::util::MOBILE_BYTES_TRANSFER_BY_FG_BG,
	statsCompanionServicePuller});		statsCompanionServicePuller});
	mPullers.insert({android::util::POWER_STATE_PLATFORM_SLEEP_STATE_PULLED,		mPullers.insert({android::util::PLATFORM_SLEEP_STATE,
	resourcePowerManagerPuller});		resourcePowerManagerPuller});
	mPullers.insert({android::util::POWER_STATE_VOTER_PULLED,		mPullers.insert({android::util::SLEEP_STATE_VOTER,
	resourcePowerManagerPuller});		resourcePowerManagerPuller});
	mPullers.insert({android::util::POWER_STATE_SUBSYSTEM_SLEEP_STATE_PULLED,		mPullers.insert({android::util::SUBSYSTEM_SLEEP_STATE,
	resourcePowerManagerPuller});		resourcePowerManagerPuller});
	mPullers.insert({android::util::CPU_TIME_PER_UID_PULLED, cpuTimePerUidPuller});		mPullers.insert({android::util::CPU_TIME_PER_UID, cpuTimePerUidPuller});
	mPullers.insert({android::util::CPU_TIME_PER_UID_FREQ_PULLED, cpuTimePerUidFreqPuller});		mPullers.insert({android::util::CPU_TIME_PER_UID_FREQ, cpuTimePerUidFreqPuller});

	mStatsCompanionService = StatsService::getStatsCompanionService();		mStatsCompanionService = StatsService::getStatsCompanionService();
	}		}