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

Commit d04fa942 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "logd: add android::sizesTotal() function"

parents 152b003b 3296291c

logd/LogStatistics.cpp

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 


#include "LogStatistics.h"



size_t LogStatistics::SizesTotal;



LogStatistics::LogStatistics() : enable(false) {

    log_id_for_each(id) {

        mSizes[id] = 0;
@@ -39,6 +41,8 @@ LogStatistics::LogStatistics() : enable(false) { 


namespace android {



size_t sizesTotal() { return LogStatistics::sizesTotal(); }



// caller must own and free character string

char *pidToName(pid_t pid) {

    char *retval = NULL;
@@ -80,6 +84,7 @@ void LogStatistics::add(LogBufferElement *element) { 
        // elements, but we must recognize the manufactured dropped

        // entry as not contributing to the lifetime totals.

        mSizesTotal[log_id] += size;

        SizesTotal += size;

        ++mElementsTotal[log_id];

    }

logd/LogStatistics.h

+2 −0
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ class LogStatistics { 
    size_t mDroppedElements[LOG_ID_MAX];

    size_t mSizesTotal[LOG_ID_MAX];

    size_t mElementsTotal[LOG_ID_MAX];

    static size_t SizesTotal;

    bool enable;



    // uid to size list
@@ -554,6 +555,7 @@ public: 
    }

    size_t sizesTotal(log_id_t id) const { return mSizesTotal[id]; }

    size_t elementsTotal(log_id_t id) const { return mElementsTotal[id]; }

    static size_t sizesTotal() { return SizesTotal; }



    std::string format(uid_t uid, pid_t pid, unsigned int logMask) const;

logd/LogUtils.h

+3 −1
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ namespace android { 
char *uidToName(uid_t uid);

void prdebug(const char *fmt, ...) __printflike(1, 2);



// Furnished in LogStatistics.cpp. Caller must own and free returned value

// Furnished in LogStatistics.cpp.

size_t sizesTotal();

// Caller must own and free returned value

char *pidToName(pid_t pid);

char *tidToName(pid_t tid);