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

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

Merge "1. Add FIELD_COUNT_REPEATED bit masks to repeated fields that were... 

Merge "1. Add FIELD_COUNT_REPEATED bit masks to repeated fields that were previously missing 2. Resolve segfault when serializing proto into vector of uint8_t 3. Add a local byte size variable for EventMetric data as we cannot call size() of ProtoOutputStream before we finish writing. 4. Replace hardcoded conversion of second to nano second with NS_PER_SEC"
parents 88a1719f b0378b09

cmds/statsd/src/StatsLogProcessor.cpp

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <utils/Errors.h>



using namespace android;

using android::util::FIELD_COUNT_REPEATED;

using android::util::FIELD_TYPE_BOOL;

using android::util::FIELD_TYPE_FLOAT;

using android::util::FIELD_TYPE_INT32;
@@ -46,7 +47,7 @@ const int FIELD_ID_METRICS = 2; 
const int FIELD_ID_UID_MAP = 3;

// for ConfigKey

const int FIELD_ID_UID = 1;

const int FIELD_ID_NAME = 1;

const int FIELD_ID_NAME = 2;



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

                                     const std::function<void(const vector<uint8_t>&)>& pushLog)
@@ -119,8 +120,8 @@ vector<uint8_t> StatsLogProcessor::onDumpReport(const ConfigKey& key) { 
    // Fill in StatsLogReport's.

    for (auto& m : it->second->onDumpReport()) {

        // Add each vector of StatsLogReport into a repeated field.

        proto.write(FIELD_TYPE_MESSAGE | FIELD_ID_METRICS, reinterpret_cast<char*>(m.get()->data()),

                    m.get()->size());

        proto.write(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_METRICS,

                    reinterpret_cast<char*>(m.get()->data()), m.get()->size());

    }



    // Fill in UidMap.

cmds/statsd/src/metrics/CountMetricProducer.cpp

+7 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <limits.h>

#include <stdlib.h>



using android::util::FIELD_COUNT_REPEATED;

using android::util::FIELD_TYPE_BOOL;

using android::util::FIELD_TYPE_FLOAT;

using android::util::FIELD_TYPE_INT32;
@@ -134,11 +135,13 @@ std::unique_ptr<std::vector<uint8_t>> CountMetricProducer::onDumpReport() { 
            ALOGE("Dimension key %s not found?!?! skip...", hashableKey.c_str());

            continue;

        }

        long long wrapperToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_DATA);

        long long wrapperToken =

                mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA);



        // First fill dimension (KeyValuePairs).

        for (const auto& kv : it->second) {

            long long dimensionToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION);

            long long dimensionToken =

                    mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION);

            mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key());

            if (kv.has_value_str()) {

                mProto->write(FIELD_TYPE_INT32 | FIELD_ID_VALUE_STR, kv.value_str());
@@ -154,7 +157,8 @@ std::unique_ptr<std::vector<uint8_t>> CountMetricProducer::onDumpReport() { 


        // Then fill bucket_info (CountBucketInfo).

        for (const auto& bucket : counter.second) {

            long long bucketInfoToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_BUCKET_INFO);

            long long bucketInfoToken =

                    mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO);

            mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS,

                          (long long)bucket.mBucketStartNs);

            mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS,

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+7 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <limits.h>

#include <stdlib.h>



using android::util::FIELD_COUNT_REPEATED;

using android::util::FIELD_TYPE_BOOL;

using android::util::FIELD_TYPE_FLOAT;

using android::util::FIELD_TYPE_INT32;
@@ -176,11 +177,13 @@ std::unique_ptr<std::vector<uint8_t>> DurationMetricProducer::onDumpReport() { 
            ALOGW("Dimension key %s not found?!?! skip...", hashableKey.c_str());

            continue;

        }

        long long wrapperToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_DATA);

        long long wrapperToken =

                mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA);



        // First fill dimension (KeyValuePairs).

        for (const auto& kv : it->second) {

            long long dimensionToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION);

            long long dimensionToken =

                    mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION);

            mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key());

            if (kv.has_value_str()) {

                mProto->write(FIELD_TYPE_INT32 | FIELD_ID_VALUE_STR, kv.value_str());
@@ -196,7 +199,8 @@ std::unique_ptr<std::vector<uint8_t>> DurationMetricProducer::onDumpReport() { 


        // Then fill bucket_info (DurationBucketInfo).

        for (const auto& bucket : pair.second) {

            long long bucketInfoToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_BUCKET_INFO);

            long long bucketInfoToken =

                    mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO);

            mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS,

                          (long long)bucket.mBucketStartNs);

            mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS,

cmds/statsd/src/metrics/EventMetricProducer.cpp

+6 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <limits.h>

#include <stdlib.h>



using android::util::FIELD_COUNT_REPEATED;

using android::util::FIELD_TYPE_BOOL;

using android::util::FIELD_TYPE_FLOAT;

using android::util::FIELD_TYPE_INT32;
@@ -94,6 +95,7 @@ std::unique_ptr<std::vector<uint8_t>> EventMetricProducer::onDumpReport() { 
    std::unique_ptr<std::vector<uint8_t>> buffer = serializeProto();



    startNewProtoOutputStream(endTime);

    mByteSize = 0;



    return buffer;

}
@@ -111,16 +113,18 @@ void EventMetricProducer::onMatchedLogEventInternal( 
        return;

    }



    long long wrapperToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_DATA);

    long long wrapperToken =

            mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA);

    mProto->write(FIELD_TYPE_INT64 | FIELD_ID_TIMESTAMP_NANOS, (long long)event.GetTimestampNs());

    long long eventToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_STATS_EVENTS);

    event.ToProto(*mProto);

    mProto->end(eventToken);

    mProto->end(wrapperToken);

    // TODO: Find a proper way to derive the size of incoming LogEvent.

}



size_t EventMetricProducer::byteSize() {

    return mProto->size();

    return mByteSize;

}



}  // namespace statsd

cmds/statsd/src/metrics/EventMetricProducer.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ protected: 


private:

    const EventMetric mMetric;



    size_t mByteSize;

};



}  // namespace statsd