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

Commit b2a5d839 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am a083c857: Merge changes I7d0b85b5,I74796043 

* commit 'a083c857':
  logd: LogStatistics leak
  logd: kill(0,0) issue
parents 332bdffa a083c857

logd/LogStatistics.cpp

+10 −1
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ bool PidStatistics::pidGone() { 
    if (mGone || (pid == gone)) {

        return true;

    }

    if (pid == 0) {

        return false;

    }

    if (kill(pid, 0) && (errno != EPERM)) {

        mGone = true;

        return true;
@@ -92,7 +95,9 @@ void PidStatistics::addTotal(size_t size, size_t element) { 
//  which debuggerd prints as a process is crashing.

char *PidStatistics::pidToName(pid_t pid) {

    char *retval = NULL;

    if (pid != gone) {

    if (pid == 0) { // special case from auditd for kernel

        retval = strdup("logd.auditd");

    } else if (pid != gone) {

        char buffer[512];

        snprintf(buffer, sizeof(buffer), "/proc/%u/cmdline", pid);

        int fd = open(buffer, O_RDONLY);
@@ -302,6 +307,10 @@ void LidStatistics::add(unsigned short size, uid_t uid, pid_t pid) { 
}



void LidStatistics::subtract(unsigned short size, uid_t uid, pid_t pid) {

    if (uid == (uid_t) -1) { // init

        uid = (uid_t) AID_ROOT;

    }



    UidStatisticsCollection::iterator it;

    for (it = begin(); it != end(); ++it) {

        UidStatistics *u = *it;