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

Commit 6daa8462 authored by Salud Lemus's avatar Salud Lemus
Browse files

Replace manual creation of AStatsEvent objects with generated method 

Now native clients can use the auto generated methods for creating
AStatsEvent objects that are generated by stats-log-api-gen.

Bug: 160367907
Test: Ran `m` and completed successfully
Test: Ran `atest statsd_test` and all CTS tests passed
Test: Ran `atest HostAtomTests` and all CTS tests passed
Test: Ran `atest stats-log-api-gen-test` and all CTS tests passed

Change-Id: I0f7b6dfeffd0e135bc98a943bc06521e2eb65193
parent d732652c

services/core/jni/stats/PowerStatsPuller.cpp

+5 −10
Original line number Diff line number Diff line
@@ -135,16 +135,11 @@ AStatsManager_PullAtomCallbackReturn PowerStatsPuller::Pull(int32_t atomTag, 
                                            }

                                            const RailInfo& rail = gRailInfo[energyData.index];



                                            AStatsEvent* event =

                                                    AStatsEventList_addStatsEvent(data);

                                            AStatsEvent_setAtomId(

                                                    event,

                                                    android::util::ON_DEVICE_POWER_MEASUREMENT);

                                            AStatsEvent_writeString(event, rail.subsysName.c_str());

                                            AStatsEvent_writeString(event, rail.railName.c_str());

                                            AStatsEvent_writeInt64(event, energyData.timestamp);

                                            AStatsEvent_writeInt64(event, energyData.energy);

                                            AStatsEvent_build(event);

                                            android::util::addAStatsEvent(

                                                    data,

                                                    android::util::ON_DEVICE_POWER_MEASUREMENT,

                                                    rail.subsysName.c_str(), rail.railName.c_str(),

                                                    energyData.timestamp, energyData.energy);



                                            ALOGV("power.stat: %s.%s: %llu, %llu",

                                                  rail.subsysName.c_str(), rail.railName.c_str(),

services/core/jni/stats/SubsystemSleepStatePuller.cpp

+23 −33
Original line number Diff line number Diff line
@@ -194,17 +194,13 @@ static AStatsManager_PullAtomCallbackReturn getIPowerStatsDataLocked(int32_t ato 
                }

                for (auto result : results) {

                    for (auto stateResidency : result.stateResidencyData) {

                        AStatsEvent* event = AStatsEventList_addStatsEvent(data);

                        AStatsEvent_setAtomId(event, android::util::SUBSYSTEM_SLEEP_STATE);

                        AStatsEvent_writeString(event,

                                                gEntityNames.at(result.powerEntityId).c_str());

                        AStatsEvent_writeString(event,

                        android::util::addAStatsEvent(data, android::util::SUBSYSTEM_SLEEP_STATE,

                                                      gEntityNames.at(result.powerEntityId).c_str(),

                                                      gStateNames.at(result.powerEntityId)

                                                              .at(stateResidency.powerEntityStateId)

                                                        .c_str());

                        AStatsEvent_writeInt64(event, stateResidency.totalStateEntryCount);

                        AStatsEvent_writeInt64(event, stateResidency.totalTimeInStateMs);

                        AStatsEvent_build(event);

                                                              .c_str(),

                                                      stateResidency.totalStateEntryCount,

                                                      stateResidency.totalTimeInStateMs);

                    }

                }

                success = true;
@@ -259,26 +255,21 @@ static AStatsManager_PullAtomCallbackReturn getIPowerDataLocked(int32_t atomTag, 


                    for (size_t i = 0; i < states.size(); i++) {

                        const PowerStatePlatformSleepState& state = states[i];

                        AStatsEvent* event = AStatsEventList_addStatsEvent(data);

                        AStatsEvent_setAtomId(event, android::util::SUBSYSTEM_SLEEP_STATE);

                        AStatsEvent_writeString(event, state.name.c_str());

                        AStatsEvent_writeString(event, "");

                        AStatsEvent_writeInt64(event, state.totalTransitions);

                        AStatsEvent_writeInt64(event, state.residencyInMsecSinceBoot);

                        AStatsEvent_build(event);

                        android::util::addAStatsEvent(data, android::util::SUBSYSTEM_SLEEP_STATE,

                                                      state.name.c_str(), "",

                                                      state.totalTransitions,

                                                      state.residencyInMsecSinceBoot);



                        ALOGV("powerstate: %s, %lld, %lld, %d", state.name.c_str(),

                              (long long)state.residencyInMsecSinceBoot,

                              (long long)state.totalTransitions,

                              state.supportedOnlyInSuspend ? 1 : 0);

                        for (const auto& voter : state.voters) {

                            AStatsEvent* event = AStatsEventList_addStatsEvent(data);

                            AStatsEvent_setAtomId(event, android::util::SUBSYSTEM_SLEEP_STATE);

                            AStatsEvent_writeString(event, state.name.c_str());

                            AStatsEvent_writeString(event, voter.name.c_str());

                            AStatsEvent_writeInt64(event, voter.totalNumberOfTimesVotedSinceBoot);

                            AStatsEvent_writeInt64(event, voter.totalTimeInMsecVotedForSinceBoot);

                            AStatsEvent_build(event);

                            android::util::addAStatsEvent(data,

                                                          android::util::SUBSYSTEM_SLEEP_STATE,

                                                          state.name.c_str(), voter.name.c_str(),

                                                          voter.totalNumberOfTimesVotedSinceBoot,

                                                          voter.totalTimeInMsecVotedForSinceBoot);



                            ALOGV("powerstatevoter: %s, %s, %lld, %lld", state.name.c_str(),

                                  voter.name.c_str(),
@@ -305,14 +296,13 @@ static AStatsManager_PullAtomCallbackReturn getIPowerDataLocked(int32_t atomTag, 
                                for (size_t j = 0; j < subsystem.states.size(); j++) {

                                    const PowerStateSubsystemSleepState& state =

                                            subsystem.states[j];

                                    AStatsEvent* event = AStatsEventList_addStatsEvent(data);

                                    AStatsEvent_setAtomId(event,

                                                          android::util::SUBSYSTEM_SLEEP_STATE);

                                    AStatsEvent_writeString(event, subsystem.name.c_str());

                                    AStatsEvent_writeString(event, state.name.c_str());

                                    AStatsEvent_writeInt64(event, state.totalTransitions);

                                    AStatsEvent_writeInt64(event, state.residencyInMsecSinceBoot);

                                    AStatsEvent_build(event);

                                    android::util::

                                            addAStatsEvent(data,

                                                           android::util::SUBSYSTEM_SLEEP_STATE,

                                                           subsystem.name.c_str(),

                                                           state.name.c_str(),

                                                           state.totalTransitions,

                                                           state.residencyInMsecSinceBoot);



                                    ALOGV("subsystemstate: %s, %s, %lld, %lld, %lld",

                                          subsystem.name.c_str(), state.name.c_str(),