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

Commit e2219207 authored by Chenjie Yu's avatar Chenjie Yu
Browse files

StatsPullerManager not use singleton 

This is to be consistent with other patterns such as UidMap.
This also makes unit test simpler.

Change-Id: I1558cd609e470481f269ecf2ae616277a95cfbf0
Bug: 72722120
Test: unit test
parent b5e98161

cmds/statsd/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ statsd_common_src := \ 
    src/external/SubsystemSleepStatePuller.cpp \

    src/external/ResourceHealthManagerPuller.cpp \

    src/external/ResourceThermalManagerPuller.cpp \

    src/external/StatsPullerManagerImpl.cpp \

    src/external/StatsPullerManager.cpp \

    src/external/puller_util.cpp \

    src/logd/LogEvent.cpp \

    src/logd/LogListener.cpp \

cmds/statsd/benchmark/metric_util.cpp

+4 −3
Original line number Diff line number Diff line
@@ -362,11 +362,12 @@ std::unique_ptr<LogEvent> CreateSyncEndEvent( 
sp<StatsLogProcessor> CreateStatsLogProcessor(const long timeBaseSec, const StatsdConfig& config,

                                              const ConfigKey& key) {

    sp<UidMap> uidMap = new UidMap();

    sp<StatsPullerManager> pullerManager = new StatsPullerManager();

    sp<AlarmMonitor> anomalyAlarmMonitor;

    sp<AlarmMonitor> periodicAlarmMonitor;

    sp<StatsLogProcessor> processor = new StatsLogProcessor(

        uidMap, anomalyAlarmMonitor, periodicAlarmMonitor, timeBaseSec * NS_PER_SEC,

        [](const ConfigKey&){return true;});

    sp<StatsLogProcessor> processor =

            new StatsLogProcessor(uidMap, pullerManager, anomalyAlarmMonitor, periodicAlarmMonitor,

                                  timeBaseSec * NS_PER_SEC, [](const ConfigKey&) { return true; });

    processor->OnConfigUpdated(timeBaseSec * NS_PER_SEC, key, config);

    return processor;

}

cmds/statsd/src/StatsLogProcessor.cpp

+8 −6
Original line number Diff line number Diff line
@@ -72,18 +72,20 @@ const int FIELD_ID_STRINGS = 9; 
#define STATS_DATA_DIR "/data/misc/stats-data"



StatsLogProcessor::StatsLogProcessor(const sp<UidMap>& uidMap,

                                     const sp<StatsPullerManager>& pullerManager,

                                     const sp<AlarmMonitor>& anomalyAlarmMonitor,

                                     const sp<AlarmMonitor>& periodicAlarmMonitor,

                                     const int64_t timeBaseNs,

                                     const std::function<bool(const ConfigKey&)>& sendBroadcast)

    : mUidMap(uidMap),

      mPullerManager(pullerManager),

      mAnomalyAlarmMonitor(anomalyAlarmMonitor),

      mPeriodicAlarmMonitor(periodicAlarmMonitor),

      mSendBroadcast(sendBroadcast),

      mTimeBaseNs(timeBaseNs),

      mLargestTimestampSeen(0),

      mLastTimestampSeen(0) {

    mStatsPullerManager.ForceClearPullerCache();

    mPullerManager->ForceClearPullerCache();

}



StatsLogProcessor::~StatsLogProcessor() {
@@ -238,7 +240,7 @@ void StatsLogProcessor::OnLogEvent(LogEvent* event, bool reconnected) { 


    int64_t curTimeSec = getElapsedRealtimeSec();

    if (curTimeSec - mLastPullerCacheClearTimeSec > StatsdStats::kPullerCacheClearIntervalSec) {

        mStatsPullerManager.ClearPullerCacheIfNecessary(curTimeSec * NS_PER_SEC);

        mPullerManager->ClearPullerCacheIfNecessary(curTimeSec * NS_PER_SEC);

        mLastPullerCacheClearTimeSec = curTimeSec;

    }
@@ -266,7 +268,7 @@ void StatsLogProcessor::OnConfigUpdatedLocked( 
        const int64_t timestampNs, const ConfigKey& key, const StatsdConfig& config) {

    VLOG("Updated configuration for key %s", key.ToString().c_str());

    sp<MetricsManager> newMetricsManager =

        new MetricsManager(key, config, mTimeBaseNs, timestampNs, mUidMap,

            new MetricsManager(key, config, mTimeBaseNs, timestampNs, mUidMap, mPullerManager,

                               mAnomalyAlarmMonitor, mPeriodicAlarmMonitor);

    if (newMetricsManager->isConfigValid()) {

        mUidMap->OnConfigUpdated(key);
@@ -453,7 +455,7 @@ void StatsLogProcessor::OnConfigRemoved(const ConfigKey& key) { 
    mLastBroadcastTimes.erase(key);



    if (mMetricsManagers.empty()) {

        mStatsPullerManager.ForceClearPullerCache();

        mPullerManager->ForceClearPullerCache();

    }

}
@@ -538,7 +540,7 @@ void StatsLogProcessor::WriteDataToDisk(const DumpReportReason dumpReportReason) 


void StatsLogProcessor::informPullAlarmFired(const int64_t timestampNs) {

    std::lock_guard<std::mutex> lock(mMetricsMutex);

    mStatsPullerManager.OnAlarmFired(timestampNs);

    mPullerManager->OnAlarmFired(timestampNs);

}



int64_t StatsLogProcessor::getLastReportTimeNs(const ConfigKey& key) {

cmds/statsd/src/StatsLogProcessor.h

+3 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ enum DumpReportReason { 


class StatsLogProcessor : public ConfigListener {

public:

    StatsLogProcessor(const sp<UidMap>& uidMap, const sp<AlarmMonitor>& anomalyAlarmMonitor,

    StatsLogProcessor(const sp<UidMap>& uidMap, const sp<StatsPullerManager>& pullerManager,

                      const sp<AlarmMonitor>& anomalyAlarmMonitor,

                      const sp<AlarmMonitor>& subscriberTriggerAlarmMonitor,

                      const int64_t timeBaseNs,

                      const std::function<bool(const ConfigKey&)>& sendBroadcast);
@@ -126,7 +127,7 @@ private: 


    sp<UidMap> mUidMap;  // Reference to the UidMap to lookup app name and version for each uid.



    StatsPullerManager mStatsPullerManager;

    sp<StatsPullerManager> mPullerManager;  // Reference to StatsPullerManager



    sp<AlarmMonitor> mAnomalyAlarmMonitor;

cmds/statsd/src/StatsService.cpp

+22 −21
Original line number Diff line number Diff line
@@ -150,9 +150,11 @@ StatsService::StatsService(const sp<Looper>& handlerLooper) 


      }))  {

    mUidMap = new UidMap();

    mPullerManager = new StatsPullerManager();

    StatsPuller::SetUidMap(mUidMap);

    mConfigManager = new ConfigManager();

    mProcessor = new StatsLogProcessor(mUidMap, mAnomalyAlarmMonitor, mPeriodicAlarmMonitor,

    mProcessor = new StatsLogProcessor(

            mUidMap, mPullerManager, mAnomalyAlarmMonitor, mPeriodicAlarmMonitor,

            getElapsedRealtimeNs(), [this](const ConfigKey& key) {

                sp<IStatsCompanionService> sc = getStatsCompanionService();

                auto receiver = mConfigManager->GetConfigReceiver(key);
@@ -167,8 +169,7 @@ StatsService::StatsService(const sp<Looper>& handlerLooper) 
                    sc->sendDataBroadcast(receiver, mProcessor->getLastReportTimeNs(key));

                    return true;

                }

    }

    );

            });



    mConfigManager->AddListener(mProcessor);
@@ -711,7 +712,7 @@ status_t StatsService::cmd_log_app_breadcrumb(FILE* out, const Vector<String8>& 
status_t StatsService::cmd_print_pulled_metrics(FILE* out, const Vector<String8>& args) {

    int s = atoi(args[1].c_str());

    vector<shared_ptr<LogEvent> > stats;

    if (mStatsPullerManager.Pull(s, getElapsedRealtimeNs(), &stats)) {

    if (mPullerManager->Pull(s, getElapsedRealtimeNs(), &stats)) {

        for (const auto& it : stats) {

            fprintf(out, "Pull from %d: %s\n", s, it->ToString().c_str());

        }
@@ -739,7 +740,7 @@ status_t StatsService::cmd_clear_puller_cache(FILE* out) { 
    VLOG("StatsService::cmd_clear_puller_cache with Pid %i, Uid %i",

            ipc->getCallingPid(), ipc->getCallingUid());

    if (checkCallingPermission(String16(kPermissionDump))) {

        int cleared = mStatsPullerManager.ForceClearPullerCache();

        int cleared = mPullerManager->ForceClearPullerCache();

        fprintf(out, "Puller removed %d cached data!\n", cleared);

        return NO_ERROR;

    } else {
@@ -870,7 +871,7 @@ Status StatsService::statsCompanionReady() { 
    }

    VLOG("StatsService::statsCompanionReady linking to statsCompanion.");

    IInterface::asBinder(statsCompanion)->linkToDeath(this);

    mStatsPullerManager.SetStatsCompanionService(statsCompanion);

    mPullerManager->SetStatsCompanionService(statsCompanion);

    mAnomalyAlarmMonitor->setStatsCompanionService(statsCompanion);

    mPeriodicAlarmMonitor->setStatsCompanionService(statsCompanion);

    SubscriberReporter::getInstance().setStatsCompanionService(statsCompanion);
@@ -1014,7 +1015,7 @@ void StatsService::binderDied(const wp <IBinder>& who) { 
    mAnomalyAlarmMonitor->setStatsCompanionService(nullptr);

    mPeriodicAlarmMonitor->setStatsCompanionService(nullptr);

    SubscriberReporter::getInstance().setStatsCompanionService(nullptr);

    mStatsPullerManager.SetStatsCompanionService(nullptr);

    mPullerManager->SetStatsCompanionService(nullptr);

}



}  // namespace statsd