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

Commit 9d350344 authored by Tom Cherry's avatar Tom Cherry
Browse files

liblog: remove log/log_transport.h 

There are no users; future versions will need to be more generic to
support the libbase style Logger/Aborter options.

Test: build, liblog-unit-tests
Change-Id: Ia4571cd39d3e499f18306920ecbf40ea8878fb81
parent 7709bcf8

liblog/README.md

+0 −10
Original line number Diff line number Diff line
@@ -96,11 +96,6 @@ Public Functions and Macros 


    int android_log_destroy(android_log_context *ctx)



    #include <log/log_transport.h>



    int android_set_log_transport(int transport_flag)

    int android_get_log_transport()



Description

-----------
@@ -144,11 +139,6 @@ size and log buffer format protocol version respectively. `android_logger_get_i 
that was used when opening the sub-log.  It is recommended to open the log `ANDROID_LOG_RDONLY` in

these cases.



`android_set_log_transport()` selects transport filters.  Argument is either `LOGGER_DEFAULT`,

`LOGGER_LOGD`, or `LOGGER_NULL`. Log to logger daemon for default or logd, or drop contents on floor

respectively.  `Both android_set_log_transport()` and `android_get_log_transport()` return the

current transport mask, or a negative errno for any problems.



Errors

------

liblog/config_write.cpp

+6 −10
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
 * limitations under the License.

 */



#include <log/log_transport.h>



#include "config_write.h"

#include "logger.h"
@@ -53,7 +51,6 @@ static void __android_log_add_transport(struct listnode* list, 
}



void __android_log_config_write() {

  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;
@@ -66,7 +63,6 @@ void __android_log_config_write() { 
  __android_log_add_transport(&__android_log_transport_write, &fakeLoggerWrite);

#endif

}

}



void __android_log_config_write_close() {

  struct android_log_transport_write* transport;

liblog/include/log/log_transport.h

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

**

** Copyright 2017, The Android Open Source Project

**

** This file is dual licensed.  It may be redistributed and/or modified

** under the terms of the Apache 2.0 License OR version 2 of the GNU

** General Public License.

*/



#pragma once



#ifdef __cplusplus

extern "C" {

#endif



/*

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

 */

/* clang-format off */

#define LOGGER_DEFAULT 0x00

#define LOGGER_LOGD    0x01

#define LOGGER_KERNEL  0x02 /* Reserved/Deprecated */

#define LOGGER_NULL    0x04 /* Does not release resources of other selections */

#define LOGGER_RESERVED 0x08 /* Reserved, previously for logging to local memory */

#define LOGGER_RESERVED2  0x10 /* Reserved, previously for logs sent to stderr */

/* clang-format on */



/* 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

liblog/logger_write.cpp

+0 −79
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#endif



#include <log/event_tag_map.h>

#include <log/log_transport.h>

#include <private/android_filesystem_config.h>

#include <private/android_logger.h>
@@ -546,81 +545,3 @@ int __android_log_security_bswrite(int32_t tag, const char* payload) { 


  return write_to_log(LOG_ID_SECURITY, vec, 4);

}
 


static int __write_to_log_null(log_id_t log_id, struct iovec* vec, size_t nr) {

  size_t len, i;



  if ((log_id < LOG_ID_MIN) || (log_id >= LOG_ID_MAX)) {

    return -EINVAL;

  }



  for (len = i = 0; i < nr; ++i) {

    len += vec[i].iov_len;

  }

  if (!len) {

    return -EINVAL;

  }

  return len;

}



/* Following functions need access to our internal write_to_log status */



int __android_log_transport;



int android_set_log_transport(int transport_flag) {

  int retval;



  if (transport_flag < 0) {

    return -EINVAL;

  }



  retval = LOGGER_NULL;



  __android_log_lock();



  if (transport_flag & LOGGER_NULL) {

    write_to_log = __write_to_log_null;



    __android_log_unlock();



    return retval;

  }



  __android_log_transport &= LOGGER_LOGD;



  transport_flag &= LOGGER_LOGD;



  if (__android_log_transport != transport_flag) {

    __android_log_transport = transport_flag;

    __android_log_config_write_close();



    write_to_log = __write_to_log_init;

    /* generically we only expect these two values for write_to_log */

  } else if ((write_to_log != __write_to_log_init) && (write_to_log != __write_to_log_daemon)) {

    write_to_log = __write_to_log_init;

  }



  retval = __android_log_transport;



  __android_log_unlock();



  return retval;

}



int android_get_log_transport() {

  int ret = LOGGER_DEFAULT;



  __android_log_lock();

  if (write_to_log == __write_to_log_null) {

    ret = LOGGER_NULL;

  } else {

    __android_log_transport &= LOGGER_LOGD;

    ret = __android_log_transport;

    if ((write_to_log != __write_to_log_init) && (write_to_log != __write_to_log_daemon)) {

      ret = -EINVAL;

    }

  }

  __android_log_unlock();



  return ret;

}

liblog/tests/liblog_benchmark.cpp

+0 −32
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <benchmark/benchmark.h>

#include <cutils/sockets.h>

#include <log/event_tag_map.h>

#include <log/log_transport.h>

#include <private/android_logger.h>



BENCHMARK_MAIN();
@@ -73,21 +72,6 @@ static void BM_log_maximum(benchmark::State& state) { 
}

BENCHMARK(BM_log_maximum);



static void set_log_null() {

  android_set_log_transport(LOGGER_NULL);

}



static void set_log_default() {

  android_set_log_transport(LOGGER_DEFAULT);

}



static void BM_log_maximum_null(benchmark::State& state) {

  set_log_null();

  BM_log_maximum(state);

  set_log_default();

}

BENCHMARK(BM_log_maximum_null);



/*

 *	Measure the time it takes to collect the time using

 * discrete acquisition (state.PauseTiming() to state.ResumeTiming())
@@ -618,13 +602,6 @@ static void BM_log_event_overhead_42(benchmark::State& state) { 
}

BENCHMARK(BM_log_event_overhead_42);



static void BM_log_event_overhead_null(benchmark::State& state) {

  set_log_null();

  BM_log_event_overhead(state);

  set_log_default();

}

BENCHMARK(BM_log_event_overhead_null);



/*

 *	Measure the time it takes to submit the android event logging call

 * using discrete acquisition under very-light load (<1% CPU utilization).
@@ -639,15 +616,6 @@ static void BM_log_light_overhead(benchmark::State& state) { 
}

BENCHMARK(BM_log_light_overhead);



static void BM_log_light_overhead_null(benchmark::State& state) {

  set_log_null();

  BM_log_light_overhead(state);

  set_log_default();

}

// Default gets out of hand for this test, so we set a reasonable number of

// iterations for a timely result.

BENCHMARK(BM_log_light_overhead_null)->Iterations(500);



static void caught_latency(int /*signum*/) {

  unsigned long long v = 0xDEADBEEFA55A5AA5ULL;