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

Commit 632b3928 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove the obsolete code for logd and add statsd socket log loss detection."

parents ff39377b 3ff3a490

cmds/statsd/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ statsd_common_src := \ 
    src/external/puller_util.cpp \

    src/logd/LogEvent.cpp \

    src/logd/LogListener.cpp \

    src/logd/LogReader.cpp \

    src/matchers/CombinationLogMatchingTracker.cpp \

    src/matchers/matcher_util.cpp \

    src/matchers/SimpleLogMatchingTracker.cpp \
@@ -194,7 +193,6 @@ LOCAL_SRC_FILES := \ 
    tests/external/puller_util_test.cpp \

    tests/indexed_priority_queue_test.cpp \

    tests/LogEntryMatcher_test.cpp \

    tests/LogReader_test.cpp \

    tests/LogEvent_test.cpp \

    tests/MetricsManager_test.cpp \

    tests/StatsLogProcessor_test.cpp \

cmds/statsd/src/StatsLogProcessor.cpp

+1 −40
Original line number Diff line number Diff line
@@ -161,10 +161,6 @@ void StatsLogProcessor::onIsolatedUidChangedEventLocked(const LogEvent& event) { 
    }

}



void StatsLogProcessor::OnLogEvent(LogEvent* event) {

    OnLogEvent(event, false);

}



void StatsLogProcessor::resetConfigs() {

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

    resetConfigsLocked(getElapsedRealtimeNs());
@@ -178,7 +174,7 @@ void StatsLogProcessor::resetConfigsLocked(const int64_t timestampNs) { 
    resetConfigsLocked(timestampNs, configKeys);

}



void StatsLogProcessor::OnLogEvent(LogEvent* event, bool reconnected) {

void StatsLogProcessor::OnLogEvent(LogEvent* event) {

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



#ifdef VERY_VERBOSE_PRINTING
@@ -188,41 +184,6 @@ void StatsLogProcessor::OnLogEvent(LogEvent* event, bool reconnected) { 
#endif

    const int64_t currentTimestampNs = event->GetElapsedTimestampNs();



    if (reconnected && mLastTimestampSeen != 0) {

        // LogReader tells us the connection has just been reset. Now we need

        // to enter reconnection state to find the last CP.

        mInReconnection = true;

    }



    if (mInReconnection) {

        // We see the checkpoint

        if (currentTimestampNs == mLastTimestampSeen) {

            mInReconnection = false;

            // Found the CP. ignore this event, and we will start to read from next event.

            return;

        }

        if (currentTimestampNs > mLargestTimestampSeen) {

            // We see a new log but CP has not been found yet. Give up now.

            mLogLossCount++;

            mInReconnection = false;

            StatsdStats::getInstance().noteLogLost(currentTimestampNs);

            // Persist the data before we reset. Do we want this?

            WriteDataToDiskLocked(CONFIG_RESET);

            // We see fresher event before we see the checkpoint. We might have lost data.

            // The best we can do is to reset.

            resetConfigsLocked(currentTimestampNs);

        } else {

            // Still in search of the CP. Keep going.

            return;

        }

    }



    mLogCount++;

    mLastTimestampSeen = currentTimestampNs;

    if (mLargestTimestampSeen < currentTimestampNs) {

        mLargestTimestampSeen = currentTimestampNs;

    }



    resetIfConfigTtlExpiredLocked(currentTimestampNs);



    StatsdStats::getInstance().noteAtomLogged(

cmds/statsd/src/StatsLogProcessor.h

+0 −12
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <gtest/gtest_prod.h>

#include "config/ConfigListener.h"

#include "logd/LogReader.h"

#include "metrics/MetricsManager.h"

#include "packages/UidMap.h"

#include "external/StatsPullerManager.h"
@@ -52,9 +51,6 @@ public: 
                      const std::function<bool(const ConfigKey&)>& sendBroadcast);

    virtual ~StatsLogProcessor();



    void OnLogEvent(LogEvent* event, bool reconnectionStarts);



    // for testing only.

    void OnLogEvent(LogEvent* event);



    void OnConfigUpdated(const int64_t timestampNs, const ConfigKey& key,
@@ -174,14 +170,6 @@ private: 


    int64_t mLastTimestampSeen = 0;



    bool mInReconnection = false;



    // Processed log count

    uint64_t mLogCount = 0;



    // Log loss detected count

    int mLogLossCount = 0;



    long mLastPullerCacheClearTimeSec = 0;



#ifdef VERY_VERBOSE_PRINTING

cmds/statsd/src/StatsService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -883,8 +883,8 @@ void StatsService::Startup() { 
    mConfigManager->Startup();

}



void StatsService::OnLogEvent(LogEvent* event, bool reconnectionStarts) {

    mProcessor->OnLogEvent(event, reconnectionStarts);

void StatsService::OnLogEvent(LogEvent* event) {

    mProcessor->OnLogEvent(event);

}



Status StatsService::getData(int64_t key, const String16& packageName, vector<uint8_t>* output) {

cmds/statsd/src/StatsService.h

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "anomaly/AlarmMonitor.h"

#include "config/ConfigManager.h"

#include "external/StatsPullerManager.h"

#include "logd/LogListener.h"

#include "packages/UidMap.h"

#include "statscompanion_util.h"
@@ -75,7 +76,7 @@ public: 
    /**

     * Called by LogReader when there's a log event to process.

     */

    virtual void OnLogEvent(LogEvent* event, bool reconnectionStarts);

    virtual void OnLogEvent(LogEvent* event);



    /**

     * Binder call for clients to request data for this configuration key.