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

Commit d4f63241 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "liblog: reset pid and uid cache after a vfork()"

parents 4c06cd86 ec4f5c77

liblog/logger.h

+4 −2
Original line number Diff line number Diff line
@@ -146,11 +146,13 @@ struct android_log_transport_context { 
/* OS specific dribs and drabs */



#if defined(_WIN32)

#include <private/android_filesystem_config.h>

typedef uint32_t uid_t;

static inline uid_t __android_log_uid() { return AID_SYSTEM; }

#else

static inline uid_t __android_log_uid() { return getuid(); }

#endif



LIBLOG_HIDDEN uid_t __android_log_uid();

LIBLOG_HIDDEN pid_t __android_log_pid();

LIBLOG_HIDDEN void __android_log_lock();

LIBLOG_HIDDEN int __android_log_trylock();

LIBLOG_HIDDEN void __android_log_unlock();

liblog/logger_lock.c

+0 −26
Original line number Diff line number Diff line
@@ -22,34 +22,8 @@ 
#include <pthread.h>

#endif



#include <private/android_filesystem_config.h>



#include "logger.h"



LIBLOG_HIDDEN uid_t __android_log_uid()

{

#if defined(_WIN32)

    return AID_SYSTEM;

#else

    static uid_t last_uid = AID_ROOT; /* logd *always* starts up as AID_ROOT */



    if (last_uid == AID_ROOT) { /* have we called to get the UID yet? */

        last_uid = getuid();

    }

    return last_uid;

#endif

}



LIBLOG_HIDDEN pid_t __android_log_pid()

{

    static pid_t last_pid = (pid_t) -1;



    if (last_pid == (pid_t) -1) {

        last_pid = getpid();

    }

    return last_pid;

}



#if !defined(_WIN32)

static pthread_mutex_t log_init_lock = PTHREAD_MUTEX_INITIALIZER;

#endif

liblog/pmsg_writer.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int pmsgWrite(log_id_t logId, struct timespec *ts, 
    pmsgHeader.magic = LOGGER_MAGIC;

    pmsgHeader.len = sizeof(pmsgHeader) + sizeof(header);

    pmsgHeader.uid = __android_log_uid();

    pmsgHeader.pid = __android_log_pid();

    pmsgHeader.pid = getpid();



    header.id = logId;

    header.tid = gettid();