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

Commit db8bc9ba authored by Yi Jin's avatar Yi Jin Committed by android-build-merger
Browse files

Merge "Use uint64_t instead of long long as API type for consistent reason." into pi-dev 

am: 88840820

Change-Id: I87fe28665b2fa05d54bd2cd5a55728bcad0659c2
parents c6667aad 88840820

cmds/incident_helper/src/ih_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ void 
Message::startSession(ProtoOutputStream* proto, const string& name)

{

    uint64_t fieldId = mTable->mFields[name];

    long long token = proto->start(fieldId);

    uint64_t token = proto->start(fieldId);

    mPreviousField = name;

    mTokens.push(token);

}

cmds/incident_helper/src/ih_util.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ public: 
private:

    Table* mTable;

    std::string mPreviousField;

    stack<long long> mTokens;

    stack<uint64_t> mTokens;

    map<std::string, Message*> mSubMessages;

};

cmds/incident_helper/src/parsers/CpuFreqParser.cpp

+2 −2
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ CpuFreqParser::Parse(const int in, const int out) const 
    proto.write(CpuFreqProto::JIFFY_HZ, (int)jiffyHz);



    for (int i=0; i<numCpus; i++) {

        long long token = proto.start(CpuFreqProto::CPU_FREQS);

        uint64_t token = proto.start(CpuFreqProto::CPU_FREQS);

        proto.write(CpuFreqProto::Stats::CPU_NAME, header[i+1]);

        for (vector<pair<int, long long>>::iterator it = cpucores[i].begin(); it != cpucores[i].end(); it++) {

            long long stateToken = proto.start(CpuFreqProto::Stats::TIMES);

            uint64_t stateToken = proto.start(CpuFreqProto::Stats::TIMES);

            proto.write(CpuFreqProto::Stats::TimeInState::STATE_KHZ, it->first);

            proto.write(CpuFreqProto::Stats::TimeInState::TIME_JIFFY, it->second);

            proto.end(stateToken);

cmds/incident_helper/src/parsers/CpuInfoParser.cpp

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static void writeSuffixLine(ProtoOutputStream* proto, uint64_t fieldId, 
        const int count, const char* names[], const uint64_t ids[])

{

    record_t record = parseRecord(line, delimiter);

    long long token = proto->start(fieldId);

    uint64_t token = proto->start(fieldId);

    for (int i=0; i<(int)record.size(); i++) {

        for (int j=0; j<count; j++) {

            if (stripSuffix(&record[i], names[j], true)) {
@@ -138,7 +138,7 @@ CpuInfoParser::Parse(const int in, const int out) const 
            continue;

        }



        long long token = proto.start(CpuInfoProto::TASKS);

        uint64_t token = proto.start(CpuInfoProto::TASKS);

        for (int i=0; i<(int)record.size(); i++) {

            if (!table.insertField(&proto, header[i], record[i])) {

                fprintf(stderr, "[%s]Line %d fails to insert field %s with value %s\n",

cmds/incident_helper/src/parsers/EventLogTagsParser.cpp

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ EventLogTagsParser::Parse(const int in, const int out) const 
            continue;

        }



        long long token = proto.start(EventLogTagMapProto::EVENT_LOG_TAGS);

        uint64_t token = proto.start(EventLogTagMapProto::EVENT_LOG_TAGS);

        proto.write(EventLogTag::TAG_NUMBER, toInt(tagNumber));

        proto.write(EventLogTag::TAG_NAME, tagName);
@@ -52,7 +52,7 @@ EventLogTagsParser::Parse(const int in, const int out) const 
                // If the parts doesn't contains pipe, then skips it.

                continue;

            }

            long long descriptorToken = proto.start(EventLogTag::VALUE_DESCRIPTORS);

            uint64_t descriptorToken = proto.start(EventLogTag::VALUE_DESCRIPTORS);

            proto.write(EventLogTag::ValueDescriptor::NAME, valueDescriptor[0]);

            proto.write(EventLogTag::ValueDescriptor::TYPE, toInt(valueDescriptor[1]));

            if (valueDescriptor.size() == 3) {