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

Commit e3aeeeec authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

logd: syscall optimization 

- prset(PR_SET_NAME) call once
- No need to call getuid(), should be AID_LOGD

Change-Id: I4dde0b178bc84e711b355cd7677b0dbf905a0634
parent 22155474

logd/CommandListener.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,11 @@ CommandListener::ClearCmd::ClearCmd(LogBuffer *buf) 
{ }

{ }





static void setname() {

static void setname() {

    static bool name_set;

    if (!name_set) {

        prctl(PR_SET_NAME, "logd.control");

        prctl(PR_SET_NAME, "logd.control");

        name_set = true;

    }

}

}





int CommandListener::ClearCmd::runCommand(SocketClient *cli,

int CommandListener::ClearCmd::runCommand(SocketClient *cli,

logd/LogAudit.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <sys/uio.h>

#include <sys/uio.h>

#include <syslog.h>

#include <syslog.h>





#include <private/android_filesystem_config.h>

#include <private/android_logger.h>

#include <private/android_logger.h>





#include "libaudit.h"

#include "libaudit.h"
@@ -110,7 +111,7 @@ int LogAudit::logPrint(const char *fmt, ...) { 




    pid_t pid = getpid();

    pid_t pid = getpid();

    pid_t tid = gettid();

    pid_t tid = gettid();

    uid_t uid = getuid();

    uid_t uid = AID_LOGD;

    log_time now;

    log_time now;





    static const char audit_str[] = " audit(";

    static const char audit_str[] = " audit(";

logd/LogListener.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 




#include <cutils/sockets.h>

#include <cutils/sockets.h>

#include <log/logger.h>

#include <log/logger.h>

#include <private/android_filesystem_config.h>

#include <private/android_logger.h>

#include <private/android_logger.h>





#include "LogListener.h"

#include "LogListener.h"
@@ -34,7 +35,11 @@ LogListener::LogListener(LogBuffer *buf, LogReader *reader) 
{  }

{  }





bool LogListener::onDataAvailable(SocketClient *cli) {

bool LogListener::onDataAvailable(SocketClient *cli) {

    static bool name_set;

    if (!name_set) {

        prctl(PR_SET_NAME, "logd.writer");

        prctl(PR_SET_NAME, "logd.writer");

        name_set = true;

    }





    char buffer[sizeof_log_id_t + sizeof(uint16_t) + sizeof(log_time)

    char buffer[sizeof_log_id_t + sizeof(uint16_t) + sizeof(log_time)

        + LOGGER_ENTRY_MAX_PAYLOAD];

        + LOGGER_ENTRY_MAX_PAYLOAD];
@@ -75,7 +80,7 @@ bool LogListener::onDataAvailable(SocketClient *cli) { 
        return false;

        return false;

    }

    }





    if (cred->uid == getuid()) {

    if (cred->uid == AID_LOGD) {

        // ignore log messages we send to ourself.

        // ignore log messages we send to ourself.

        // Such log messages are often generated by libraries we depend on

        // Such log messages are often generated by libraries we depend on

        // which use standard Android logging.

        // which use standard Android logging.

logd/LogReader.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,11 @@ void LogReader::notifyNewLog() { 
}

}





bool LogReader::onDataAvailable(SocketClient *cli) {

bool LogReader::onDataAvailable(SocketClient *cli) {

    static bool name_set;

    if (!name_set) {

        prctl(PR_SET_NAME, "logd.reader");

        prctl(PR_SET_NAME, "logd.reader");

        name_set = true;

    }





    char buffer[255];

    char buffer[255];

logd/LogStatistics.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -303,5 +303,5 @@ uid_t LogStatistics::pidToUid(pid_t pid) { 
        }

        }

        fclose(fp);

        fclose(fp);

    }

    }

    return getuid(); // associate this with the logger

    return AID_LOGD; // associate this with the logger

}
 
}