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

Commit 81321a79 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

liblog: replace "frontend" with "transport" 

We still do not have any users of the 'frontend' interface, let's
right a wrong and rename it to 'transport' as it makes more sense.
Renames android_log_set_frontend, android_log_get_frontend and
include/log/log_frontend.h.

SideEffects: None
Test: gTest liblog-unit-tests
Bug: 27405083
Change-Id: I7c1c0f3dfdc7cf047285403e306edbd16ad1324d
parent 04bbc8ea

liblog/README

+9 −9
Original line number Diff line number Diff line
@@ -108,10 +108,10 @@ SYNOPSIS 


       int android_log_destroy(android_log_context *ctx)



       #include <log/log_frontend.h>

       #include <log/log_transport.h>



       int android_set_log_frontend(int frontend_flag)

       int android_get_log_frontend()

       int android_set_log_transport(int transport_flag)

       int android_get_log_transport()



       Link with -llog
@@ -167,12 +167,12 @@ DESCRIPTION 
       when  opening  the  sub-log.    It  is  recommended  to  open  the  log

       ANDROID_LOG_RDONLY in these cases.



       android_set_log_frontend() selects frontend filters. Argument is either

       LOGGER_DEFAULT, LOGGER_LOGD, LOGGER_NULL or LOGGER_LOCAL. Log to logger

       daemon for default or logd,  drop contents on floor,  or log into local

       memory   respectively.          Both   android_set_log_frontend()   and

       android_get_log_frontend()  return  the  current  frontend mask,   or a

       negative errno for any problems.

       android_set_log_transport()  selects  transport  filters.  Argument  is

       either LOGGER_DEFAULT, LOGGER_LOGD, LOGGER_NULL or LOGGER_LOCAL. Log to

       logger daemon for default or logd, drop contents on floor,  or log into

       local   memory   respectively.       Both   android_set_log_transport()

       and android_get_log_transport() return the current  transport mask,  or

       a negative errno for any problems.



ERRORS

       If messages fail, a negative error code will be returned to the caller.

liblog/config_read.c

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <log/log_frontend.h>

#include <log/log_transport.h>



#include "config_read.h"

#include "logger.h"
@@ -55,15 +55,15 @@ static void __android_log_add_transport( 
}



LIBLOG_HIDDEN void __android_log_config_read() {

  if (__android_log_frontend & LOGGER_LOCAL) {

  if (__android_log_transport & LOGGER_LOCAL) {

    extern struct android_log_transport_read localLoggerRead;



    __android_log_add_transport(&__android_log_transport_read, &localLoggerRead);

  }



#if (FAKE_LOG_DEVICE == 0)

  if ((__android_log_frontend == LOGGER_DEFAULT) ||

      (__android_log_frontend & LOGGER_LOGD)) {

  if ((__android_log_transport == LOGGER_DEFAULT) ||

      (__android_log_transport & LOGGER_LOGD)) {

    extern struct android_log_transport_read logdLoggerRead;

    extern struct android_log_transport_read pmsgLoggerRead;

liblog/config_write.c

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <log/log_frontend.h>

#include <log/log_transport.h>



#include "config_write.h"

#include "logger.h"
@@ -55,15 +55,15 @@ static void __android_log_add_transport( 
}



LIBLOG_HIDDEN void __android_log_config_write() {

  if (__android_log_frontend & LOGGER_LOCAL) {

  if (__android_log_transport & LOGGER_LOCAL) {

    extern struct android_log_transport_write localLoggerWrite;



    __android_log_add_transport(&__android_log_transport_write,

                                &localLoggerWrite);

  }



  if ((__android_log_frontend == LOGGER_DEFAULT) ||

      (__android_log_frontend & LOGGER_LOGD)) {

  if ((__android_log_transport == LOGGER_DEFAULT) ||

      (__android_log_transport & LOGGER_LOGD)) {

#if (FAKE_LOG_DEVICE == 0)

    extern struct android_log_transport_write logdLoggerWrite;

    extern struct android_log_transport_write pmsgLoggerWrite;
@@ -79,7 +79,7 @@ LIBLOG_HIDDEN void __android_log_config_write() { 
#endif

  }



  if (__android_log_frontend & LOGGER_STDERR) {

  if (__android_log_transport & LOGGER_STDERR) {

    extern struct android_log_transport_write stderrLoggerWrite;



    /*

liblog/include/log/log_frontend.h→liblog/include/log/log_transport.h

+7 −7
Original line number Diff line number Diff line
@@ -7,15 +7,15 @@ 
** General Public License.

*/



#ifndef _LIBS_LOG_FRONTEND_H

#define _LIBS_LOG_FRONTEND_H

#ifndef _LIBS_LOG_TRANSPORT_H

#define _LIBS_LOG_TRANSPORT_H



#ifdef __cplusplus

extern "C" {

#endif



/*

 * Logging frontends, bit mask to select features. Function returns selection.

 * Logging transports, bit mask to select features. Function returns selection.

 */

/* clang-format off */

#define LOGGER_DEFAULT 0x00
@@ -26,12 +26,12 @@ extern "C" { 
#define LOGGER_STDERR  0x10 /* logs sent to stderr */

/* clang-format on */



/* Both return the selected frontend flag mask, or negative errno */

int android_set_log_frontend(int frontend_flag);

int android_get_log_frontend();

/* Both return the selected transport flag mask, or negative errno */

int android_set_log_transport(int transport_flag);

int android_get_log_transport();



#ifdef __cplusplus

}

#endif



#endif /* _LIBS_LOG_FRONTEND_H */
 
#endif /* _LIBS_LOG_TRANSPORT_H */

liblog/local_logger.c

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <sys/types.h>



#include <cutils/list.h> /* template, no library dependency */

#include <log/log_frontend.h>

#include <log/log_transport.h>

#include <private/android_filesystem_config.h>

#include <private/android_logger.h>

#include <system/thread_defs.h>
@@ -273,7 +273,7 @@ static int writeToLocalAvailable(log_id_t logId) { 


/* Android hard coded permitted, system goes to logd */

#if !defined(__MINGW32__)

  if (__android_log_frontend == LOGGER_DEFAULT) {

  if (__android_log_transport == LOGGER_DEFAULT) {

    uid = __android_log_uid();

    if ((uid < AID_APP) && (getpwuid(uid) != NULL)) {

      return -EPERM;