diff --git a/liblog/Android.bp b/liblog/Android.bp index 588089b7b..8a63007dc 100644 --- a/liblog/Android.bp +++ b/liblog/Android.bp @@ -23,7 +23,6 @@ liblog_sources = [ "logger_read.cpp", "logger_write.cpp", "logprint.cpp", - "stderr_write.cpp", ] liblog_host_sources = [ "fake_log_device.cpp", diff --git a/liblog/config_write.cpp b/liblog/config_write.cpp index d4543795c..6ed893dbd 100644 --- a/liblog/config_write.cpp +++ b/liblog/config_write.cpp @@ -66,27 +66,6 @@ void __android_log_config_write() { __android_log_add_transport(&__android_log_transport_write, &fakeLoggerWrite); #endif } - - if (__android_log_transport & LOGGER_STDERR) { - extern struct android_log_transport_write stderrLoggerWrite; - - /* - * stderr logger should be primary if we can be the only one, or if - * already in the primary list. Otherwise land in the persist list. - * Remember we can be called here if we are already initialized. - */ - if (list_empty(&__android_log_transport_write)) { - __android_log_add_transport(&__android_log_transport_write, &stderrLoggerWrite); - } else { - struct android_log_transport_write* transp; - write_transport_for_each(transp, &__android_log_transport_write) { - if (transp == &stderrLoggerWrite) { - return; - } - } - __android_log_add_transport(&__android_log_persist_write, &stderrLoggerWrite); - } - } } void __android_log_config_write_close() { diff --git a/liblog/include/log/log_transport.h b/liblog/include/log/log_transport.h index b48761af8..bda7c2579 100644 --- a/liblog/include/log/log_transport.h +++ b/liblog/include/log/log_transport.h @@ -22,7 +22,7 @@ extern "C" { #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_STDERR 0x10 /* logs sent to stderr */ +#define LOGGER_RESERVED2 0x10 /* Reserved, previously for logs sent to stderr */ /* clang-format on */ /* Both return the selected transport flag mask, or negative errno */ diff --git a/liblog/logger_write.cpp b/liblog/logger_write.cpp index aef9e04c3..7fc87477e 100644 --- a/liblog/logger_write.cpp +++ b/liblog/logger_write.cpp @@ -586,9 +586,9 @@ int android_set_log_transport(int transport_flag) { return retval; } - __android_log_transport &= LOGGER_LOGD | LOGGER_STDERR; + __android_log_transport &= LOGGER_LOGD; - transport_flag &= LOGGER_LOGD | LOGGER_STDERR; + transport_flag &= LOGGER_LOGD; if (__android_log_transport != transport_flag) { __android_log_transport = transport_flag; @@ -614,7 +614,7 @@ int android_get_log_transport() { if (write_to_log == __write_to_log_null) { ret = LOGGER_NULL; } else { - __android_log_transport &= LOGGER_LOGD | LOGGER_STDERR; + __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; diff --git a/liblog/stderr_write.cpp b/liblog/stderr_write.cpp deleted file mode 100644 index e76673f74..000000000 --- a/liblog/stderr_write.cpp +++ /dev/null @@ -1,209 +0,0 @@ -/* - * Copyright (C) 2017 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. - */ - -/* - * stderr write handler. Output is logcat-like, and responds to - * logcat's environment variables ANDROID_PRINTF_LOG and - * ANDROID_LOG_TAGS to filter output. - * - * This transport only provides a writer, that means that it does not - * provide an End-To-End capability as the logs are effectively _lost_ - * to the stderr file stream. The purpose of this transport is to - * supply a means for command line tools to report their logging - * to the stderr stream, in line with all other activities. - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "log_portability.h" -#include "logger.h" -#include "uio.h" - -static int stderrOpen(); -static void stderrClose(); -static int stderrAvailable(log_id_t logId); -static int stderrWrite(log_id_t logId, struct timespec* ts, struct iovec* vec, size_t nr); - -struct stderrContext { - AndroidLogFormat* logformat; -#if defined(__ANDROID__) - EventTagMap* eventTagMap; -#endif -}; - -struct android_log_transport_write stderrLoggerWrite = { - .node = {&stderrLoggerWrite.node, &stderrLoggerWrite.node}, - .context.priv = NULL, - .name = "stderr", - .available = stderrAvailable, - .open = stderrOpen, - .close = stderrClose, - .write = stderrWrite, -}; - -static int stderrOpen() { - struct stderrContext* ctx; - const char* envStr; - bool setFormat; - - if (!stderr || (fileno(stderr) < 0)) { - return -EBADF; - } - - if (stderrLoggerWrite.context.priv) { - return fileno(stderr); - } - - ctx = static_cast(calloc(1, sizeof(stderrContext))); - if (!ctx) { - return -ENOMEM; - } - - ctx->logformat = android_log_format_new(); - if (!ctx->logformat) { - free(ctx); - return -ENOMEM; - } - - envStr = getenv("ANDROID_PRINTF_LOG"); - setFormat = false; - - if (envStr) { - char* formats = strdup(envStr); - char* sv = NULL; - char* arg = formats; - while (!!(arg = strtok_r(arg, ",:; \t\n\r\f", &sv))) { - AndroidLogPrintFormat format = android_log_formatFromString(arg); - arg = NULL; - if (format == FORMAT_OFF) { - continue; - } - if (android_log_setPrintFormat(ctx->logformat, format) <= 0) { - continue; - } - setFormat = true; - } - free(formats); - } - if (!setFormat) { - AndroidLogPrintFormat format = android_log_formatFromString("threadtime"); - android_log_setPrintFormat(ctx->logformat, format); - } - envStr = getenv("ANDROID_LOG_TAGS"); - if (envStr) { - android_log_addFilterString(ctx->logformat, envStr); - } - stderrLoggerWrite.context.priv = ctx; - - return fileno(stderr); -} - -static void stderrClose() { - stderrContext* ctx = static_cast(stderrLoggerWrite.context.priv); - - if (ctx) { - stderrLoggerWrite.context.priv = NULL; - if (ctx->logformat) { - android_log_format_free(ctx->logformat); - ctx->logformat = NULL; - } -#if defined(__ANDROID__) - if (ctx->eventTagMap) { - android_closeEventTagMap(ctx->eventTagMap); - ctx->eventTagMap = NULL; - } -#endif - } -} - -static int stderrAvailable(log_id_t logId) { - if ((logId >= LOG_ID_MAX) || (logId == LOG_ID_KERNEL)) { - return -EINVAL; - } - return 1; -} - -static int stderrWrite(log_id_t logId, struct timespec* ts, struct iovec* vec, size_t nr) { - struct log_msg log_msg; - AndroidLogEntry entry; - char binaryMsgBuf[1024]; - int err; - size_t i; - stderrContext* ctx = static_cast(stderrLoggerWrite.context.priv); - - if (!ctx) return -EBADF; - if (!vec || !nr) return -EINVAL; - - log_msg.entry.len = 0; - log_msg.entry.hdr_size = sizeof(log_msg.entry); - log_msg.entry.pid = getpid(); -#ifdef __BIONIC__ - log_msg.entry.tid = gettid(); -#else - log_msg.entry.tid = getpid(); -#endif - log_msg.entry.sec = ts->tv_sec; - log_msg.entry.nsec = ts->tv_nsec; - log_msg.entry.lid = logId; - log_msg.entry.uid = __android_log_uid(); - - for (i = 0; i < nr; ++i) { - size_t len = vec[i].iov_len; - if ((log_msg.entry.len + len) > LOGGER_ENTRY_MAX_PAYLOAD) { - len = LOGGER_ENTRY_MAX_PAYLOAD - log_msg.entry.len; - } - if (!len) continue; - memcpy(log_msg.entry.msg + log_msg.entry.len, vec[i].iov_base, len); - log_msg.entry.len += len; - } - - if ((logId == LOG_ID_EVENTS) || (logId == LOG_ID_SECURITY)) { -#if defined(__ANDROID__) - if (!ctx->eventTagMap) { - ctx->eventTagMap = android_openEventTagMap(NULL); - } -#endif - err = android_log_processBinaryLogBuffer(&log_msg.entry_v1, &entry, -#if defined(__ANDROID__) - ctx->eventTagMap, -#else - NULL, -#endif - binaryMsgBuf, sizeof(binaryMsgBuf)); - } else { - err = android_log_processLogBuffer(&log_msg.entry_v1, &entry); - } - - /* print known truncated data, in essence logcat --debug */ - if ((err < 0) && !entry.message) return -EINVAL; - - if (!android_log_shouldPrintLine(ctx->logformat, entry.tag, entry.priority)) { - return log_msg.entry.len; - } - - err = android_log_printLogLine(ctx->logformat, fileno(stderr), &entry); - if (err < 0) return errno ? -errno : -EINVAL; - return log_msg.entry.len; -} diff --git a/liblog/tests/Android.bp b/liblog/tests/Android.bp index d9d1a215e..45f09f2bb 100644 --- a/liblog/tests/Android.bp +++ b/liblog/tests/Android.bp @@ -54,8 +54,7 @@ cc_defaults { ], srcs: [ "libc_test.cpp", - "liblog_test_default.cpp", - "liblog_test_stderr.cpp", + "liblog_test.cpp", "log_id_test.cpp", "log_radio_test.cpp", "log_read_test.cpp", diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp index 5a73dc06e..57b6c4e61 100644 --- a/liblog/tests/liblog_test.cpp +++ b/liblog/tests/liblog_test.cpp @@ -43,6 +43,11 @@ #include #include +#ifdef __ANDROID__ +#define TEST_LOGGER LOGGER_DEFAULT +#endif +#define USING_LOGGER_DEFAULT + #ifndef TEST_PREFIX #ifdef TEST_LOGGER #define TEST_PREFIX android_set_log_transport(TEST_LOGGER); @@ -281,11 +286,7 @@ static void print_transport(const char* prefix, int logger) { fprintf(stderr, "%sLOGGER_NULL", prefix); prefix = orstr; } - if (logger & LOGGER_STDERR) { - fprintf(stderr, "%sLOGGER_STDERR", prefix); - prefix = orstr; - } - logger &= ~(LOGGER_LOGD | LOGGER_KERNEL | LOGGER_NULL | LOGGER_STDERR); + logger &= ~(LOGGER_LOGD | LOGGER_KERNEL | LOGGER_NULL); if (logger) { fprintf(stderr, "%s0x%x", prefix, logger); prefix = orstr; diff --git a/liblog/tests/liblog_test_default.cpp b/liblog/tests/liblog_test_default.cpp deleted file mode 100644 index 2edea2727..000000000 --- a/liblog/tests/liblog_test_default.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifdef __ANDROID__ -#include -#define TEST_LOGGER LOGGER_DEFAULT -#endif -#define USING_LOGGER_DEFAULT -#include "liblog_test.cpp" diff --git a/liblog/tests/liblog_test_stderr.cpp b/liblog/tests/liblog_test_stderr.cpp deleted file mode 100644 index abc1b9c3e..000000000 --- a/liblog/tests/liblog_test_stderr.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define liblog liblog_stderr -#define TEST_LOGGER LOGGER_STDERR -#define USING_LOGGER_STDERR -#include "liblog_test.cpp"