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

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

Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5 

* changes:
  liblog: replace "frontend" with "transport"
  liblog: stay away from C++ keyword private
  liblog: specify clang format
parents ac13718d 81321a79

liblog/.clang-format

0 → 100644
+9 −0
Original line number Diff line number Diff line 
BasedOnStyle: Google

AllowShortFunctionsOnASingleLine: false



CommentPragmas: NOLINT:.*

DerivePointerAlignment: false

PointerAlignment: Left

PenaltyExcessCharacter: 32



Cpp11BracedListStyle: false

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

+47 −49
Original line number Diff line number Diff line
@@ -14,15 +14,17 @@ 
 * limitations under the License.

 */



#include <log/log_frontend.h>

#include <log/log_transport.h>



#include "config_read.h"

#include "logger.h"



LIBLOG_HIDDEN struct listnode __android_log_transport_read =

    { &__android_log_transport_read, &__android_log_transport_read };

LIBLOG_HIDDEN struct listnode __android_log_persist_read =

    { &__android_log_persist_read, &__android_log_persist_read };

LIBLOG_HIDDEN struct listnode __android_log_transport_read = {

  &__android_log_transport_read, &__android_log_transport_read

};

LIBLOG_HIDDEN struct listnode __android_log_persist_read = {

  &__android_log_persist_read, &__android_log_persist_read

};



static void __android_log_add_transport(

    struct listnode* list, struct android_log_transport_read* transport) {
@@ -43,8 +45,7 @@ static void __android_log_add_transport( 
          return;

        }

        if (((*transp->available)(i) < 0) &&

                        (!transport->available ||

                            ((*transport->available)(i) >= 0))) {

            (!transport->available || ((*transport->available)(i) >= 0))) {

          list_add_tail(list, &transport->node);

          return;

        }
@@ -54,23 +55,20 @@ 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);

    __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;



        __android_log_add_transport(&__android_log_transport_read,

                                    &logdLoggerRead);

        __android_log_add_transport(&__android_log_persist_read,

                                    &pmsgLoggerRead);

    __android_log_add_transport(&__android_log_transport_read, &logdLoggerRead);

    __android_log_add_transport(&__android_log_persist_read, &pmsgLoggerRead);

  }

#endif

}

liblog/config_read.h

+20 −24
Original line number Diff line number Diff line
@@ -30,11 +30,9 @@ extern LIBLOG_HIDDEN struct listnode __android_log_persist_read; 
  for ((transp) = node_to_item((transports)->next,                            \

                               struct android_log_transport_read, node);      \

       ((transp) != node_to_item((transports),                                \

                                   struct android_log_transport_read,       \

                                   node)) &&                                \

                                 struct android_log_transport_read, node)) && \

       ((transp) != node_to_item((transp)->node.next,                         \

                                   struct android_log_transport_read,       \

                                   node));                                  \

                                 struct android_log_transport_read, node));   \

       (transp) = node_to_item((transp)->node.next,                           \

                               struct android_log_transport_read, node))
@@ -43,12 +41,10 @@ extern LIBLOG_HIDDEN struct listnode __android_log_persist_read; 
                               struct android_log_transport_read, node),      \

      (n) = (transp)->node.next;                                              \

       ((transp) != node_to_item((transports),                                \

                                   struct android_log_transport_read,       \

                                   node)) &&                                \

         ((transp) != node_to_item((n), struct android_log_transport_read,  \

                                   node));                                  \

         (transp) = node_to_item((n), struct android_log_transport_read,    \

                                 node),                                     \

                                 struct android_log_transport_read, node)) && \

       ((transp) !=                                                           \

        node_to_item((n), struct android_log_transport_read, node));          \

       (transp) = node_to_item((n), struct android_log_transport_read, node), \

      (n) = (transp)->node.next)



LIBLOG_HIDDEN void __android_log_config_read();

liblog/config_write.c

+73 −73
Original line number Diff line number Diff line
@@ -14,15 +14,17 @@ 
 * limitations under the License.

 */



#include <log/log_frontend.h>

#include <log/log_transport.h>



#include "config_write.h"

#include "logger.h"



LIBLOG_HIDDEN struct listnode __android_log_transport_write =

    { &__android_log_transport_write, &__android_log_transport_write };

LIBLOG_HIDDEN struct listnode __android_log_persist_write =

    { &__android_log_persist_write, &__android_log_persist_write};

LIBLOG_HIDDEN struct listnode __android_log_transport_write = {

  &__android_log_transport_write, &__android_log_transport_write

};

LIBLOG_HIDDEN struct listnode __android_log_persist_write = {

  &__android_log_persist_write, &__android_log_persist_write

};



static void __android_log_add_transport(

    struct listnode* list, struct android_log_transport_write* transport) {
@@ -43,8 +45,7 @@ static void __android_log_add_transport( 
          return;

        }

        if (((*transp->available)(i) < 0) &&

                        (!transport->available ||

                            ((*transport->available)(i) >= 0))) {

            (!transport->available || ((*transport->available)(i) >= 0))) {

          list_add_tail(list, &transport->node);

          return;

        }
@@ -54,23 +55,22 @@ 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;



    __android_log_add_transport(&__android_log_transport_write,

                                &logdLoggerWrite);

        __android_log_add_transport(&__android_log_persist_write,

                                    &pmsgLoggerWrite);

    __android_log_add_transport(&__android_log_persist_write, &pmsgLoggerWrite);

#else

    extern struct android_log_transport_write fakeLoggerWrite;
@@ -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;



    /*