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

Commit 2e928fb6 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "protobuf-3.9.1" 

* changes:
  Convert statsd_test and statsd_benchmark to proto lite
  Adapt to google::protobuf::uint64 type change
parents 28b12c34 959cc442

cmds/statsd/Android.bp

+12 −4
Original line number Original line Diff line number Diff line
@@ -207,6 +207,10 @@ cc_test { 
    ],

    ],





    srcs: [

    srcs: [

        // atom_field_options.proto needs field_options.proto, but that is

        // not included in libprotobuf-cpp-lite, so compile it here.

        ":libprotobuf-internal-protos",



        "src/atom_field_options.proto",

        "src/atom_field_options.proto",

        "src/atoms.proto",

        "src/atoms.proto",

        "src/stats_log.proto",

        "src/stats_log.proto",
@@ -268,11 +272,11 @@ cc_test { 
    ],

    ],





    proto: {

    proto: {

        type: "full",

        type: "lite",

        include_dirs: ["external/protobuf/src"],

        include_dirs: ["external/protobuf/src"],

    },

    },





    shared_libs: ["libprotobuf-cpp-full"],

    shared_libs: ["libprotobuf-cpp-lite"],





}

}
@@ -285,6 +289,10 @@ cc_benchmark { 
    defaults: ["statsd_defaults"],

    defaults: ["statsd_defaults"],





    srcs: [

    srcs: [

        // atom_field_options.proto needs field_options.proto, but that is

        // not included in libprotobuf-cpp-lite, so compile it here.

        ":libprotobuf-internal-protos",



        "src/atom_field_options.proto",

        "src/atom_field_options.proto",

        "src/atoms.proto",

        "src/atoms.proto",

        "src/stats_log.proto",

        "src/stats_log.proto",
@@ -299,7 +307,7 @@ cc_benchmark { 
    ],

    ],





    proto: {

    proto: {

        type: "full",

        type: "lite",

        include_dirs: ["external/protobuf/src"],

        include_dirs: ["external/protobuf/src"],

    },

    },
@@ -321,7 +329,7 @@ cc_benchmark { 
    shared_libs: [

    shared_libs: [

        "libgtest_prod",

        "libgtest_prod",

        "libstatslog",

        "libstatslog",

        "libprotobuf-cpp-full",

        "libprotobuf-cpp-lite",

    ],

    ],

}

}

cmds/statsd/src/anomaly/AnomalyTracker.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "subscriber/IncidentdReporter.h"

#include "subscriber/IncidentdReporter.h"

#include "subscriber/SubscriberReporter.h"

#include "subscriber/SubscriberReporter.h"





#include <inttypes.h>

#include <statslog.h>

#include <statslog.h>

#include <time.h>

#include <time.h>
@@ -224,7 +225,7 @@ void AnomalyTracker::declareAnomaly(const int64_t& timestampNs, int64_t metricId 
    }

    }





    if (!mSubscriptions.empty()) {

    if (!mSubscriptions.empty()) {

        ALOGI("An anomaly (%lld) %s has occurred! Informing subscribers.",

        ALOGI("An anomaly (%" PRId64 ") %s has occurred! Informing subscribers.",

                mAlert.id(), key.toString().c_str());

                mAlert.id(), key.toString().c_str());

        informSubscribers(key, metricId, metricValue);

        informSubscribers(key, metricId, metricValue);

    } else {

    } else {

cmds/statsd/src/metrics/metrics_manager_util.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include "stats_util.h"

#include "stats_util.h"

#include "statslog.h"

#include "statslog.h"





#include <inttypes.h>



using std::set;

using std::set;

using std::string;

using std::string;

using std::unordered_map;

using std::unordered_map;
@@ -593,7 +595,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t 
    for (int i = 0; i < config.no_report_metric_size(); ++i) {

    for (int i = 0; i < config.no_report_metric_size(); ++i) {

        const auto no_report_metric = config.no_report_metric(i);

        const auto no_report_metric = config.no_report_metric(i);

        if (metricMap.find(no_report_metric) == metricMap.end()) {

        if (metricMap.find(no_report_metric) == metricMap.end()) {

            ALOGW("no_report_metric %lld not exist", no_report_metric);

            ALOGW("no_report_metric %" PRId64 " not exist", no_report_metric);

            return false;

            return false;

        }

        }

        noReportMetricIds.insert(no_report_metric);

        noReportMetricIds.insert(no_report_metric);

libs/hwui/service/GraphicsStatsService.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -234,9 +234,9 @@ void dumpAsTextToFd(protos::GraphicsStatsProto* proto, int fd) { 
        return;

        return;

    }

    }

    dprintf(fd, "\nPackage: %s", proto->package_name().c_str());

    dprintf(fd, "\nPackage: %s", proto->package_name().c_str());

    dprintf(fd, "\nVersion: %lld", proto->version_code());

    dprintf(fd, "\nVersion: %" PRId64, proto->version_code());

    dprintf(fd, "\nStats since: %lldns", proto->stats_start());

    dprintf(fd, "\nStats since: %" PRId64 "ns", proto->stats_start());

    dprintf(fd, "\nStats end: %lldns", proto->stats_end());

    dprintf(fd, "\nStats end: %" PRId64 "ns", proto->stats_end());

    auto summary = proto->summary();

    auto summary = proto->summary();

    dprintf(fd, "\nTotal frames rendered: %d", summary.total_frames());

    dprintf(fd, "\nTotal frames rendered: %d", summary.total_frames());

    dprintf(fd, "\nJanky frames: %d (%.2f%%)", summary.janky_frames(),

    dprintf(fd, "\nJanky frames: %d (%.2f%%)", summary.janky_frames(),

libs/protoutil/include/android/util/ProtoOutputStream.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,7 @@ public: 
    bool write(uint64_t fieldId, double val);

    bool write(uint64_t fieldId, double val);

    bool write(uint64_t fieldId, float val);

    bool write(uint64_t fieldId, float val);

    bool write(uint64_t fieldId, int val);

    bool write(uint64_t fieldId, int val);

    bool write(uint64_t fieldId, long val);

    bool write(uint64_t fieldId, long long val);

    bool write(uint64_t fieldId, long long val);

    bool write(uint64_t fieldId, bool val);

    bool write(uint64_t fieldId, bool val);

    bool write(uint64_t fieldId, std::string val);

    bool write(uint64_t fieldId, std::string val);