From 514243d5bd3f51e5696243799a072db66a962e4f Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 28 Jul 2015 09:30:47 -0700 Subject: [PATCH] liblog: deprecate TARGET_USES_LOGD This is not the kernel logger you are loiking for Bug: 22787659 Change-Id: Id65ed2e8e7ffe4b2be1bdeed65fa8db23bd66b51 --- liblog/Android.mk | 8 - liblog/log_read_kern.c | 742 ------------------------------------- liblog/logd_write_kern.c | 295 --------------- liblog/tests/Android.mk | 4 - liblog/tests/libc_test.cpp | 2 - 5 files changed, 1051 deletions(-) delete mode 100644 liblog/log_read_kern.c delete mode 100644 liblog/logd_write_kern.c diff --git a/liblog/Android.mk b/liblog/Android.mk index ce282bd4a..930dcf729 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -24,11 +24,7 @@ include $(CLEAR_VARS) # so make sure we do not regret hard-coding it as follows: liblog_cflags := -DLIBLOG_LOG_TAG=1005 -ifneq ($(TARGET_USES_LOGD),false) liblog_sources := logd_write.c -else -liblog_sources := logd_write_kern.c -endif # some files must not be compiled when building against Mingw # they correspond to features not used by our host development tools @@ -47,11 +43,7 @@ liblog_target_sources := $(liblog_sources) log_time.cpp log_is_loggable.c ifeq ($(strip $(USE_MINGW)),) liblog_target_sources += logprint.c endif -ifneq ($(TARGET_USES_LOGD),false) liblog_target_sources += log_read.c -else -liblog_target_sources += log_read_kern.c -endif # Shared and static library for host # ======================================================== diff --git a/liblog/log_read_kern.c b/liblog/log_read_kern.c deleted file mode 100644 index 69b405ca1..000000000 --- a/liblog/log_read_kern.c +++ /dev/null @@ -1,742 +0,0 @@ -/* -** Copyright 2013-2014, 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. -*/ - -#define _GNU_SOURCE /* asprintf for x86 host */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#define __LOGGERIO 0xAE - -#define LOGGER_GET_LOG_BUF_SIZE _IO(__LOGGERIO, 1) /* size of log */ -#define LOGGER_GET_LOG_LEN _IO(__LOGGERIO, 2) /* used log len */ -#define LOGGER_GET_NEXT_ENTRY_LEN _IO(__LOGGERIO, 3) /* next entry len */ -#define LOGGER_FLUSH_LOG _IO(__LOGGERIO, 4) /* flush log */ -#define LOGGER_GET_VERSION _IO(__LOGGERIO, 5) /* abi version */ -#define LOGGER_SET_VERSION _IO(__LOGGERIO, 6) /* abi version */ - -typedef char bool; -#define false (const bool)0 -#define true (const bool)1 - -#define LOG_FILE_DIR "/dev/log/" - -/* timeout in milliseconds */ -#define LOG_TIMEOUT_FLUSH 5 -#define LOG_TIMEOUT_NEVER -1 - -#define logger_for_each(logger, logger_list) \ - for (logger = node_to_item((logger_list)->node.next, struct logger, node); \ - logger != node_to_item(&(logger_list)->node, struct logger, node); \ - logger = node_to_item((logger)->node.next, struct logger, node)) - -#ifndef __unused -#define __unused __attribute__((unused)) -#endif - -/* In the future, we would like to make this list extensible */ -static const char *LOG_NAME[LOG_ID_MAX] = { - [LOG_ID_MAIN] = "main", - [LOG_ID_RADIO] = "radio", - [LOG_ID_EVENTS] = "events", - [LOG_ID_SYSTEM] = "system", - [LOG_ID_CRASH] = "crash", - [LOG_ID_KERNEL] = "kernel", -}; - -const char *android_log_id_to_name(log_id_t log_id) -{ - if (log_id >= LOG_ID_MAX) { - log_id = LOG_ID_MAIN; - } - return LOG_NAME[log_id]; -} - -static int accessmode(int mode) -{ - if ((mode & ANDROID_LOG_ACCMODE) == ANDROID_LOG_WRONLY) { - return W_OK; - } - if ((mode & ANDROID_LOG_ACCMODE) == ANDROID_LOG_RDWR) { - return R_OK | W_OK; - } - return R_OK; -} - -/* repeated fragment */ -static int check_allocate_accessible(char **n, const char *b, int mode) -{ - *n = NULL; - - if (!b) { - return -EINVAL; - } - - asprintf(n, LOG_FILE_DIR "%s", b); - if (!*n) { - return -1; - } - - return access(*n, accessmode(mode)); -} - -log_id_t android_name_to_log_id(const char *logName) -{ - const char *b; - char *n; - int ret; - - if (!logName) { - return -1; /* NB: log_id_t is unsigned */ - } - b = strrchr(logName, '/'); - if (!b) { - b = logName; - } else { - ++b; - } - - ret = check_allocate_accessible(&n, b, ANDROID_LOG_RDONLY); - free(n); - if (ret) { - return ret; - } - - for(ret = LOG_ID_MIN; ret < LOG_ID_MAX; ++ret) { - const char *l = LOG_NAME[ret]; - if (l && !strcmp(b, l)) { - return ret; - } - } - return -1; /* should never happen */ -} - -struct logger_list { - struct listnode node; - int mode; - unsigned int tail; - pid_t pid; - unsigned int queued_lines; - int timeout_ms; - int error; - bool flush; - bool valid_entry; /* valiant(?) effort to deal with memory starvation */ - struct log_msg entry; -}; - -struct log_list { - struct listnode node; - struct log_msg entry; /* Truncated to event->len() + 1 to save space */ -}; - -struct logger { - struct listnode node; - struct logger_list *top; - int fd; - log_id_t id; - short *revents; - struct listnode log_list; -}; - -/* android_logger_alloc unimplemented, no use case */ -/* android_logger_free not exported */ -static void android_logger_free(struct logger *logger) -{ - if (!logger) { - return; - } - - while (!list_empty(&logger->log_list)) { - struct log_list *entry = node_to_item( - list_head(&logger->log_list), struct log_list, node); - list_remove(&entry->node); - free(entry); - if (logger->top->queued_lines) { - logger->top->queued_lines--; - } - } - - if (logger->fd >= 0) { - close(logger->fd); - } - - list_remove(&logger->node); - - free(logger); -} - -log_id_t android_logger_get_id(struct logger *logger) -{ - return logger->id; -} - -/* worker for sending the command to the logger */ -static int logger_ioctl(struct logger *logger, int cmd, int mode) -{ - char *n; - int f, ret; - - if (!logger || !logger->top) { - return -EFAULT; - } - - if (((mode & ANDROID_LOG_ACCMODE) == ANDROID_LOG_RDWR) - || (((mode ^ logger->top->mode) & ANDROID_LOG_ACCMODE) == 0)) { - return ioctl(logger->fd, cmd); - } - - /* We go here if android_logger_list_open got mode wrong for this ioctl */ - ret = check_allocate_accessible(&n, android_log_id_to_name(logger->id), mode); - if (ret) { - free(n); - return ret; - } - - f = open(n, mode); - free(n); - if (f < 0) { - return f; - } - - ret = ioctl(f, cmd); - close (f); - - return ret; -} - -int android_logger_clear(struct logger *logger) -{ - return logger_ioctl(logger, LOGGER_FLUSH_LOG, ANDROID_LOG_WRONLY); -} - -/* returns the total size of the log's ring buffer */ -long android_logger_get_log_size(struct logger *logger) -{ - return logger_ioctl(logger, LOGGER_GET_LOG_BUF_SIZE, ANDROID_LOG_RDWR); -} - -int android_logger_set_log_size(struct logger *logger __unused, - unsigned long size __unused) -{ - return -ENOTSUP; -} - -/* - * returns the readable size of the log's ring buffer (that is, amount of the - * log consumed) - */ -long android_logger_get_log_readable_size(struct logger *logger) -{ - return logger_ioctl(logger, LOGGER_GET_LOG_LEN, ANDROID_LOG_RDONLY); -} - -/* - * returns the logger version - */ -int android_logger_get_log_version(struct logger *logger) -{ - int ret = logger_ioctl(logger, LOGGER_GET_VERSION, ANDROID_LOG_RDWR); - return (ret < 0) ? 1 : ret; -} - -/* - * returns statistics - */ -static const char unsupported[] = "18\nNot Supported\n\f"; - -ssize_t android_logger_get_statistics(struct logger_list *logger_list __unused, - char *buf, size_t len) -{ - strncpy(buf, unsupported, len); - return -ENOTSUP; -} - -ssize_t android_logger_get_prune_list(struct logger_list *logger_list __unused, - char *buf, size_t len) -{ - strncpy(buf, unsupported, len); - return -ENOTSUP; -} - -int android_logger_set_prune_list(struct logger_list *logger_list __unused, - char *buf, size_t len) -{ - static const char unsupported_error[] = "Unsupported"; - strncpy(buf, unsupported, len); - return -ENOTSUP; -} - -struct logger_list *android_logger_list_alloc(int mode, - unsigned int tail, - pid_t pid) -{ - struct logger_list *logger_list; - - logger_list = calloc(1, sizeof(*logger_list)); - if (!logger_list) { - return NULL; - } - list_init(&logger_list->node); - logger_list->mode = mode; - logger_list->tail = tail; - logger_list->pid = pid; - return logger_list; -} - -struct logger_list *android_logger_list_alloc_time(int mode, - log_time start __unused, - pid_t pid) -{ - return android_logger_list_alloc(mode, 0, pid); -} - -/* android_logger_list_register unimplemented, no use case */ -/* android_logger_list_unregister unimplemented, no use case */ - -/* Open the named log and add it to the logger list */ -struct logger *android_logger_open(struct logger_list *logger_list, - log_id_t id) -{ - struct listnode *node; - struct logger *logger; - char *n; - - if (!logger_list || (id >= LOG_ID_MAX)) { - goto err; - } - - logger_for_each(logger, logger_list) { - if (logger->id == id) { - goto ok; - } - } - - logger = calloc(1, sizeof(*logger)); - if (!logger) { - goto err; - } - - if (check_allocate_accessible(&n, android_log_id_to_name(id), - logger_list->mode)) { - goto err_name; - } - - logger->fd = open(n, logger_list->mode & (ANDROID_LOG_ACCMODE | ANDROID_LOG_NONBLOCK)); - if (logger->fd < 0) { - goto err_name; - } - - free(n); - logger->id = id; - list_init(&logger->log_list); - list_add_tail(&logger_list->node, &logger->node); - logger->top = logger_list; - logger_list->timeout_ms = LOG_TIMEOUT_FLUSH; - goto ok; - -err_name: - free(n); -err_logger: - free(logger); -err: - logger = NULL; -ok: - return logger; -} - -/* Open the single named log and make it part of a new logger list */ -struct logger_list *android_logger_list_open(log_id_t id, - int mode, - unsigned int tail, - pid_t pid) -{ - struct logger_list *logger_list = android_logger_list_alloc(mode, tail, pid); - if (!logger_list) { - return NULL; - } - - if (!android_logger_open(logger_list, id)) { - android_logger_list_free(logger_list); - return NULL; - } - - return logger_list; -} - -/* prevent memory starvation when backfilling */ -static unsigned int queue_threshold(struct logger_list *logger_list) -{ - return (logger_list->tail < 64) ? 64 : logger_list->tail; -} - -static bool low_queue(struct listnode *node) -{ - /* low is considered less than 2 */ - return list_head(node) == list_tail(node); -} - -/* Flush queues in sequential order, one at a time */ -static int android_logger_list_flush(struct logger_list *logger_list, - struct log_msg *log_msg) -{ - int ret = 0; - struct log_list *firstentry = NULL; - - while ((ret == 0) - && (logger_list->flush - || (logger_list->queued_lines > logger_list->tail))) { - struct logger *logger; - - /* Merge sort */ - bool at_least_one_is_low = false; - struct logger *firstlogger = NULL; - firstentry = NULL; - - logger_for_each(logger, logger_list) { - struct listnode *node; - struct log_list *oldest = NULL; - - /* kernel logger channels not necessarily time-sort order */ - list_for_each(node, &logger->log_list) { - struct log_list *entry = node_to_item(node, - struct log_list, node); - if (!oldest - || (entry->entry.entry.sec < oldest->entry.entry.sec) - || ((entry->entry.entry.sec == oldest->entry.entry.sec) - && (entry->entry.entry.nsec < oldest->entry.entry.nsec))) { - oldest = entry; - } - } - - if (!oldest) { - at_least_one_is_low = true; - continue; - } else if (low_queue(&logger->log_list)) { - at_least_one_is_low = true; - } - - if (!firstentry - || (oldest->entry.entry.sec < firstentry->entry.entry.sec) - || ((oldest->entry.entry.sec == firstentry->entry.entry.sec) - && (oldest->entry.entry.nsec < firstentry->entry.entry.nsec))) { - firstentry = oldest; - firstlogger = logger; - } - } - - if (!firstentry) { - break; - } - - /* when trimming list, tries to keep one entry behind in each bucket */ - if (!logger_list->flush - && at_least_one_is_low - && (logger_list->queued_lines < queue_threshold(logger_list))) { - break; - } - - /* within tail?, send! */ - if ((logger_list->tail == 0) - || (logger_list->queued_lines <= logger_list->tail)) { - int diff; - ret = firstentry->entry.entry.hdr_size; - if (!ret) { - ret = sizeof(firstentry->entry.entry_v1); - } - - /* Promote entry to v3 format */ - memcpy(log_msg->buf, firstentry->entry.buf, ret); - diff = sizeof(firstentry->entry.entry_v3) - ret; - if (diff < 0) { - diff = 0; - } else if (diff > 0) { - memset(log_msg->buf + ret, 0, diff); - } - memcpy(log_msg->buf + ret + diff, firstentry->entry.buf + ret, - firstentry->entry.entry.len + 1); - ret += diff; - log_msg->entry.hdr_size = ret; - log_msg->entry.lid = firstlogger->id; - - ret += firstentry->entry.entry.len; - } - - /* next entry */ - list_remove(&firstentry->node); - free(firstentry); - if (logger_list->queued_lines) { - logger_list->queued_lines--; - } - } - - /* Flushed the list, no longer in tail mode for continuing content */ - if (logger_list->flush && !firstentry) { - logger_list->tail = 0; - } - return ret; -} - -/* Read from the selected logs */ -int android_logger_list_read(struct logger_list *logger_list, - struct log_msg *log_msg) -{ - struct logger *logger; - nfds_t nfds; - struct pollfd *p, *pollfds = NULL; - int error = 0, ret = 0; - - memset(log_msg, 0, sizeof(struct log_msg)); - - if (!logger_list) { - return -ENODEV; - } - - if (!(accessmode(logger_list->mode) & R_OK)) { - logger_list->error = EPERM; - goto done; - } - - nfds = 0; - logger_for_each(logger, logger_list) { - ++nfds; - } - if (nfds <= 0) { - error = ENODEV; - goto done; - } - - /* Do we have anything to offer from the buffer or state? */ - if (logger_list->valid_entry) { /* implies we are also in a flush state */ - goto flush; - } - - ret = android_logger_list_flush(logger_list, log_msg); - if (ret) { - goto done; - } - - if (logger_list->error) { /* implies we are also in a flush state */ - goto done; - } - - /* Lets start grinding on metal */ - pollfds = calloc(nfds, sizeof(struct pollfd)); - if (!pollfds) { - error = ENOMEM; - goto flush; - } - - p = pollfds; - logger_for_each(logger, logger_list) { - p->fd = logger->fd; - p->events = POLLIN; - logger->revents = &p->revents; - ++p; - } - - while (!ret && !error) { - int result; - - /* If we oversleep it's ok, i.e. ignore EINTR. */ - result = TEMP_FAILURE_RETRY( - poll(pollfds, nfds, logger_list->timeout_ms)); - - if (result <= 0) { - if (result) { - error = errno; - } else if (logger_list->mode & ANDROID_LOG_NONBLOCK) { - error = EAGAIN; - } else { - logger_list->timeout_ms = LOG_TIMEOUT_NEVER; - } - - logger_list->flush = true; - goto try_flush; - } - - logger_list->timeout_ms = LOG_TIMEOUT_FLUSH; - - /* Anti starvation */ - if (!logger_list->flush - && (logger_list->queued_lines > (queue_threshold(logger_list) / 2))) { - /* Any queues with input pending that is low? */ - bool starving = false; - logger_for_each(logger, logger_list) { - if ((*(logger->revents) & POLLIN) - && low_queue(&logger->log_list)) { - starving = true; - break; - } - } - - /* pushback on any queues that are not low */ - if (starving) { - logger_for_each(logger, logger_list) { - if ((*(logger->revents) & POLLIN) - && !low_queue(&logger->log_list)) { - *(logger->revents) &= ~POLLIN; - } - } - } - } - - logger_for_each(logger, logger_list) { - unsigned int hdr_size; - struct log_list *entry; - int diff; - - if (!(*(logger->revents) & POLLIN)) { - continue; - } - - memset(logger_list->entry.buf, 0, sizeof(struct log_msg)); - /* NOTE: driver guarantees we read exactly one full entry */ - result = read(logger->fd, logger_list->entry.buf, - LOGGER_ENTRY_MAX_LEN); - if (result <= 0) { - if (!result) { - error = EIO; - } else if (errno != EINTR) { - error = errno; - } - continue; - } - - if (logger_list->pid - && (logger_list->pid != logger_list->entry.entry.pid)) { - continue; - } - - hdr_size = logger_list->entry.entry.hdr_size; - if (!hdr_size) { - hdr_size = sizeof(logger_list->entry.entry_v1); - } - - if ((hdr_size > sizeof(struct log_msg)) - || (logger_list->entry.entry.len - > sizeof(logger_list->entry.buf) - hdr_size) - || (logger_list->entry.entry.len != result - hdr_size)) { - error = EINVAL; - continue; - } - - /* Promote entry to v3 format */ - diff = sizeof(logger_list->entry.entry_v3) - hdr_size; - if (diff > 0) { - if (logger_list->entry.entry.len - > sizeof(logger_list->entry.buf) - hdr_size - diff) { - error = EINVAL; - continue; - } - result += diff; - memmove(logger_list->entry.buf + hdr_size + diff, - logger_list->entry.buf + hdr_size, - logger_list->entry.entry.len + 1); - memset(logger_list->entry.buf + hdr_size, 0, diff); - logger_list->entry.entry.hdr_size = hdr_size + diff; - } - logger_list->entry.entry.lid = logger->id; - - /* speedup: If not tail, and only one list, send directly */ - if (!logger_list->tail - && (list_head(&logger_list->node) - == list_tail(&logger_list->node))) { - ret = result; - memcpy(log_msg->buf, logger_list->entry.buf, result + 1); - break; - } - - entry = malloc(sizeof(*entry) - sizeof(entry->entry) + result + 1); - - if (!entry) { - logger_list->valid_entry = true; - error = ENOMEM; - break; - } - - logger_list->queued_lines++; - - memcpy(entry->entry.buf, logger_list->entry.buf, result); - entry->entry.buf[result] = '\0'; - list_add_tail(&logger->log_list, &entry->node); - } - - if (ret <= 0) { -try_flush: - ret = android_logger_list_flush(logger_list, log_msg); - } - } - - free(pollfds); - -flush: - if (error) { - logger_list->flush = true; - } - - if (ret <= 0) { - ret = android_logger_list_flush(logger_list, log_msg); - - if (!ret && logger_list->valid_entry) { - ret = logger_list->entry.entry.hdr_size; - if (!ret) { - ret = sizeof(logger_list->entry.entry_v1); - } - ret += logger_list->entry.entry.len; - - memcpy(log_msg->buf, logger_list->entry.buf, - sizeof(struct log_msg)); - logger_list->valid_entry = false; - } - } - -done: - if (logger_list->error) { - error = logger_list->error; - } - if (error) { - logger_list->error = error; - if (!ret) { - ret = -error; - } - } - return ret; -} - -/* Close all the logs */ -void android_logger_list_free(struct logger_list *logger_list) -{ - if (logger_list == NULL) { - return; - } - - while (!list_empty(&logger_list->node)) { - struct listnode *node = list_head(&logger_list->node); - struct logger *logger = node_to_item(node, struct logger, node); - android_logger_free(logger); - } - - free(logger_list); -} diff --git a/liblog/logd_write_kern.c b/liblog/logd_write_kern.c deleted file mode 100644 index 8742b34ef..000000000 --- a/liblog/logd_write_kern.c +++ /dev/null @@ -1,295 +0,0 @@ -/* - * Copyright (C) 2007-2014 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#define LOGGER_LOG_MAIN "log/main" -#define LOGGER_LOG_RADIO "log/radio" -#define LOGGER_LOG_EVENTS "log/events" -#define LOGGER_LOG_SYSTEM "log/system" - -#define LOG_BUF_SIZE 1024 - -#define log_open(pathname, flags) open(pathname, (flags) | O_CLOEXEC) -#define log_writev(filedes, vector, count) writev(filedes, vector, count) -#define log_close(filedes) close(filedes) - -static int __write_to_log_init(log_id_t, struct iovec *vec, size_t nr); -static int (*write_to_log)(log_id_t, struct iovec *vec, size_t nr) = __write_to_log_init; - -static pthread_mutex_t log_init_lock = PTHREAD_MUTEX_INITIALIZER; - -#ifndef __unused -#define __unused __attribute__((__unused__)) -#endif - -static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1 }; - -/* - * This is used by the C++ code to decide if it should write logs through - * the C code. Basically, if /dev/log/... is available, we're running in - * the simulator rather than a desktop tool and want to use the device. - */ -static enum { - kLogUninitialized, kLogNotAvailable, kLogAvailable -} g_log_status = kLogUninitialized; -int __android_log_dev_available(void) -{ - if (g_log_status == kLogUninitialized) { - if (access("/dev/"LOGGER_LOG_MAIN, W_OK) == 0) - g_log_status = kLogAvailable; - else - g_log_status = kLogNotAvailable; - } - - return (g_log_status == kLogAvailable); -} - -static int __write_to_log_null(log_id_t log_fd __unused, struct iovec *vec __unused, - size_t nr __unused) -{ - return -1; -} - -static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr) -{ - ssize_t ret; - int log_fd; - - if (/*(int)log_id >= 0 &&*/ (int)log_id < (int)LOG_ID_MAX) { - if (log_id == LOG_ID_CRASH) { - log_id = LOG_ID_MAIN; - } - log_fd = log_fds[(int)log_id]; - } else { - return -EBADF; - } - - do { - ret = log_writev(log_fd, vec, nr); - if (ret < 0) { - ret = -errno; - } - } while (ret == -EINTR); - - return ret; -} - -static int __write_to_log_init(log_id_t log_id, struct iovec *vec, size_t nr) -{ - pthread_mutex_lock(&log_init_lock); - - if (write_to_log == __write_to_log_init) { - log_fds[LOG_ID_MAIN] = log_open("/dev/"LOGGER_LOG_MAIN, O_WRONLY); - log_fds[LOG_ID_RADIO] = log_open("/dev/"LOGGER_LOG_RADIO, O_WRONLY); - log_fds[LOG_ID_EVENTS] = log_open("/dev/"LOGGER_LOG_EVENTS, O_WRONLY); - log_fds[LOG_ID_SYSTEM] = log_open("/dev/"LOGGER_LOG_SYSTEM, O_WRONLY); - - write_to_log = __write_to_log_kernel; - - if (log_fds[LOG_ID_MAIN] < 0 || log_fds[LOG_ID_RADIO] < 0 || - log_fds[LOG_ID_EVENTS] < 0) { - log_close(log_fds[LOG_ID_MAIN]); - log_close(log_fds[LOG_ID_RADIO]); - log_close(log_fds[LOG_ID_EVENTS]); - log_fds[LOG_ID_MAIN] = -1; - log_fds[LOG_ID_RADIO] = -1; - log_fds[LOG_ID_EVENTS] = -1; - write_to_log = __write_to_log_null; - } - - if (log_fds[LOG_ID_SYSTEM] < 0) { - log_fds[LOG_ID_SYSTEM] = log_fds[LOG_ID_MAIN]; - } - } - - pthread_mutex_unlock(&log_init_lock); - - return write_to_log(log_id, vec, nr); -} - -int __android_log_write(int prio, const char *tag, const char *msg) -{ - return __android_log_buf_write(LOG_ID_MAIN, prio, tag, msg); -} - -int __android_log_buf_write(int bufID, int prio, const char *tag, const char *msg) -{ - struct iovec vec[3]; - char tmp_tag[32]; - - if (!tag) - tag = ""; - - /* XXX: This needs to go! */ - if ((bufID != LOG_ID_RADIO) && - (!strcmp(tag, "HTC_RIL") || - !strncmp(tag, "RIL", 3) || /* Any log tag with "RIL" as the prefix */ - !strncmp(tag, "IMS", 3) || /* Any log tag with "IMS" as the prefix */ - !strcmp(tag, "AT") || - !strcmp(tag, "GSM") || - !strcmp(tag, "STK") || - !strcmp(tag, "CDMA") || - !strcmp(tag, "PHONE") || - !strcmp(tag, "SMS"))) { - bufID = LOG_ID_RADIO; - /* Inform third party apps/ril/radio.. to use Rlog or RLOG */ - snprintf(tmp_tag, sizeof(tmp_tag), "use-Rlog/RLOG-%s", tag); - tag = tmp_tag; - } - - if (prio == ANDROID_LOG_FATAL) { - android_set_abort_message(msg); - } - - vec[0].iov_base = (unsigned char *) &prio; - vec[0].iov_len = 1; - vec[1].iov_base = (void *) tag; - vec[1].iov_len = strlen(tag) + 1; - vec[2].iov_base = (void *) msg; - vec[2].iov_len = strlen(msg) + 1; - - return write_to_log(bufID, vec, 3); -} - -int __android_log_vprint(int prio, const char *tag, const char *fmt, va_list ap) -{ - char buf[LOG_BUF_SIZE]; - - vsnprintf(buf, LOG_BUF_SIZE, fmt, ap); - - return __android_log_write(prio, tag, buf); -} - -int __android_log_print(int prio, const char *tag, const char *fmt, ...) -{ - va_list ap; - char buf[LOG_BUF_SIZE]; - - va_start(ap, fmt); - vsnprintf(buf, LOG_BUF_SIZE, fmt, ap); - va_end(ap); - - return __android_log_write(prio, tag, buf); -} - -int __android_log_buf_print(int bufID, int prio, const char *tag, const char *fmt, ...) -{ - va_list ap; - char buf[LOG_BUF_SIZE]; - - va_start(ap, fmt); - vsnprintf(buf, LOG_BUF_SIZE, fmt, ap); - va_end(ap); - - return __android_log_buf_write(bufID, prio, tag, buf); -} - -void __android_log_assert(const char *cond, const char *tag, - const char *fmt, ...) -{ - char buf[LOG_BUF_SIZE]; - - if (fmt) { - va_list ap; - va_start(ap, fmt); - vsnprintf(buf, LOG_BUF_SIZE, fmt, ap); - va_end(ap); - } else { - /* Msg not provided, log condition. N.B. Do not use cond directly as - * format string as it could contain spurious '%' syntax (e.g. - * "%d" in "blocks%devs == 0"). - */ - if (cond) - snprintf(buf, LOG_BUF_SIZE, "Assertion failed: %s", cond); - else - strcpy(buf, "Unspecified assertion failed"); - } - - __android_log_write(ANDROID_LOG_FATAL, tag, buf); - abort(); /* abort so we have a chance to debug the situation */ - /* NOTREACHED */ -} - -int __android_log_bwrite(int32_t tag, const void *payload, size_t len) -{ - struct iovec vec[2]; - - vec[0].iov_base = &tag; - vec[0].iov_len = sizeof(tag); - vec[1].iov_base = (void*)payload; - vec[1].iov_len = len; - - return write_to_log(LOG_ID_EVENTS, vec, 2); -} - -/* - * Like __android_log_bwrite, but takes the type as well. Doesn't work - * for the general case where we're generating lists of stuff, but very - * handy if we just want to dump an integer into the log. - */ -int __android_log_btwrite(int32_t tag, char type, const void *payload, - size_t len) -{ - struct iovec vec[3]; - - vec[0].iov_base = &tag; - vec[0].iov_len = sizeof(tag); - vec[1].iov_base = &type; - vec[1].iov_len = sizeof(type); - vec[2].iov_base = (void*)payload; - vec[2].iov_len = len; - - return write_to_log(LOG_ID_EVENTS, vec, 3); -} - -/* - * Like __android_log_bwrite, but used for writing strings to the - * event log. - */ -int __android_log_bswrite(int32_t tag, const char *payload) -{ - struct iovec vec[4]; - char type = EVENT_TYPE_STRING; - uint32_t len = strlen(payload); - - vec[0].iov_base = &tag; - vec[0].iov_len = sizeof(tag); - vec[1].iov_base = &type; - vec[1].iov_len = sizeof(type); - vec[2].iov_base = &len; - vec[2].iov_len = sizeof(len); - vec[3].iov_base = (void*)payload; - vec[3].iov_len = len; - - return write_to_log(LOG_ID_EVENTS, vec, 4); -} diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk index a407c50a5..8229859a2 100644 --- a/liblog/tests/Android.mk +++ b/liblog/tests/Android.mk @@ -65,10 +65,6 @@ ifneq ($(wildcard $(LOCAL_PATH)/../../../../bionic/libc/bionic/libc_logging.cpp) test_src_files += \ libc_test.cpp -ifneq ($(TARGET_USES_LOGD),false) -test_c_flags += -DTARGET_USES_LOGD -endif - endif # Build tests for the device (with .so). Run with: diff --git a/liblog/tests/libc_test.cpp b/liblog/tests/libc_test.cpp index 0e84f4eb1..9dd6f0340 100644 --- a/liblog/tests/libc_test.cpp +++ b/liblog/tests/libc_test.cpp @@ -25,9 +25,7 @@ #define _ANDROID_LOG_H // Priorities redefined #define _LIBS_LOG_LOG_H // log ids redefined typedef unsigned char log_id_t; // log_id_t missing as a result -#ifdef TARGET_USES_LOGD #define _LIBS_LOG_LOG_READ_H // log_time redefined -#endif #include #include