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

Commit 7d25dc57 authored by Bookatz's avatar Bookatz Committed by android-build-merger
Browse files

Merge "Statsd: Remove storage of bucketNum" into pi-dev 

am: aaadf666

Change-Id: Ia3fe0f339f2a79ac02260c58de2e342ac55b82df
parents 39350bc0 aaadf666

cmds/statsd/src/metrics/CountMetricProducer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ void CountMetricProducer::flushCurrentBucketLocked(const uint64_t& eventTimeNs) 
    } else {

        info.mBucketEndNs = fullBucketEndTimeNs;

    }

    info.mBucketNum = mCurrentBucketNum;

    for (const auto& counter : *mCurrentSlicedCounter) {

        info.mCount = counter.second;

        auto& bucketList = mPastBuckets[counter.first];

cmds/statsd/src/metrics/CountMetricProducer.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct CountBucket { 
    int64_t mBucketStartNs;

    int64_t mBucketEndNs;

    int64_t mCount;

    uint64_t mBucketNum;

};



class CountMetricProducer : public MetricProducer {

cmds/statsd/src/metrics/GaugeMetricProducer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -411,7 +411,6 @@ void GaugeMetricProducer::flushCurrentBucketLocked(const uint64_t& eventTimeNs) 
    } else {

        info.mBucketEndNs = fullBucketEndTimeNs;

    }

    info.mBucketNum = mCurrentBucketNum;



    for (const auto& slice : *mCurrentSlicedBucket) {

        info.mGaugeAtoms = slice.second;

cmds/statsd/src/metrics/GaugeMetricProducer.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct GaugeBucket { 
    int64_t mBucketStartNs;

    int64_t mBucketEndNs;

    std::vector<GaugeAtom> mGaugeAtoms;

    uint64_t mBucketNum;

};



typedef std::unordered_map<MetricDimensionKey, std::vector<GaugeAtom>>

cmds/statsd/src/metrics/ValueMetricProducer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ void ValueMetricProducer::flushCurrentBucketLocked(const uint64_t& eventTimeNs) 
    } else {

        info.mBucketEndNs = fullBucketEndTimeNs;

    }

    info.mBucketNum = mCurrentBucketNum;



    int tainted = 0;

    for (const auto& slice : mCurrentSlicedBucket) {