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

Commit f7e1b1eb authored by Tom Cherry's avatar Tom Cherry
Browse files

liblog: only allow one transport for reading 

liblog has left over code from local_logger that allows for reading
from multiple sources and merging the contents.  Since we've already
removed local_logger, this change removes the rest of this code.

Test: liblog-unit-tests
Change-Id: I5685ad6c1e7cbcaa0a660ed10f47714784a40791
parent a033693a

liblog/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
//



liblog_sources = [

    "config_read.cpp",

    "config_write.cpp",

    "log_event_list.cpp",

    "log_event_write.cpp",

liblog/config_read.cpp

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <log/log_transport.h>



#include "config_read.h"

#include "logger.h"



struct listnode __android_log_transport_read = {&__android_log_transport_read,

                                                &__android_log_transport_read};

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) {

  uint32_t i;



  /* Try to keep one functioning transport for each log buffer id */

  for (i = LOG_ID_MIN; i < LOG_ID_MAX; i++) {

    struct android_log_transport_read* transp;



    if (list_empty(list)) {

      if (!transport->available || ((*transport->available)(static_cast<log_id_t>(i)) >= 0)) {

        list_add_tail(list, &transport->node);

        return;

      }

    } else {

      read_transport_for_each(transp, list) {

        if (!transp->available) {

          return;

        }

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

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

          list_add_tail(list, &transport->node);

          return;

        }

      }

    }

  }

}



void __android_log_config_read() {

#if (FAKE_LOG_DEVICE == 0)

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

  }

#endif

}



void __android_log_config_read_close() {

  struct android_log_transport_read* transport;

  struct listnode* n;



  read_transport_for_each_safe(transport, n, &__android_log_transport_read) {

    list_remove(&transport->node);

  }

  read_transport_for_each_safe(transport, n, &__android_log_persist_read) {

    list_remove(&transport->node);

  }

}

liblog/config_read.h

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <cutils/list.h>



#include "log_portability.h"



__BEGIN_DECLS



extern struct listnode __android_log_transport_read;

extern struct listnode __android_log_persist_read;



#define read_transport_for_each(transp, transports)                           \

  for ((transp) = node_to_item((transports)->next,                            \

                               struct android_log_transport_read, node);      \

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

                                 struct android_log_transport_read, node)) && \

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

                                 struct android_log_transport_read, node));   \

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

                               struct android_log_transport_read, node))



#define read_transport_for_each_safe(transp, n, transports)                   \

  for ((transp) = node_to_item((transports)->next,                            \

                               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), \

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



void __android_log_config_read();

void __android_log_config_read_close();



__END_DECLS

liblog/logd_reader.cpp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <private/android_filesystem_config.h>

#include <private/android_logger.h>



#include "config_read.h"

#include "log_portability.h"

#include "logd_reader.h"

#include "logger.h"

liblog/logger.h

+11 −21
Original line number Diff line number Diff line
@@ -95,9 +95,19 @@ struct android_log_transport_read { 
                      size_t len);

};



struct android_log_transport_context {

  union android_log_context_union context; /* zero init per-transport context */



  struct android_log_transport_read* transport;

  unsigned logMask;      /* mask of requested log buffers */

  int ret;               /* return value associated with following data */

  struct log_msg logMsg; /* peek at upcoming data, valid if logMsg.len != 0 */

};



struct android_log_logger_list {

  struct listnode logger;

  struct listnode transport;

  android_log_transport_context transport_context;

  bool transport_initialized;

  int mode;

  unsigned int tail;

  log_time start;
@@ -111,27 +121,7 @@ struct android_log_logger { 
  log_id_t logId;

};



struct android_log_transport_context {

  struct listnode node;

  union android_log_context_union context; /* zero init per-transport context */

  struct android_log_logger_list* parent;



  struct android_log_transport_read* transport;

  unsigned logMask;      /* mask of requested log buffers */

  int ret;               /* return value associated with following data */

  struct log_msg logMsg; /* peek at upcoming data, valid if logMsg.len != 0 */

};



/* assumes caller has structures read-locked, single threaded, or fenced */

#define transport_context_for_each(transp, logger_list)                          \

  for ((transp) = node_to_item((logger_list)->transport.next,                    \

                               struct android_log_transport_context, node);      \

       ((transp) != node_to_item(&(logger_list)->transport,                      \

                                 struct android_log_transport_context, node)) && \

       ((transp)->parent == (logger_list));                                      \

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

                               struct android_log_transport_context, node))



#define logger_for_each(logp, logger_list)                          \

  for ((logp) = node_to_item((logger_list)->logger.next,            \

                             struct android_log_logger, node);      \