06e0fced63
Remove the transport available and open functions since the writers are able to manage their own state. Remove the initialization dance with write_to_log, since it is unneeded once this is removed as well. Remove the global lock around the close() functions as correct locking has been added to the writers in a previous change. Test: logging works, liblog-unit-tests Change-Id: If7fa11e773763d0b5fcb2e696ad1c88ff4a4cfdf
73 lines
1.9 KiB
C
73 lines
1.9 KiB
C
/*
|
|
* 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 <stdatomic.h>
|
|
|
|
#include <cutils/list.h>
|
|
#include <log/log.h>
|
|
|
|
#include "log_portability.h"
|
|
#include "uio.h"
|
|
|
|
__BEGIN_DECLS
|
|
|
|
struct android_log_transport_write {
|
|
void (*close)(); /* free up resources */
|
|
/* write log to transport, returns number of bytes propagated, or -errno */
|
|
int (*write)(log_id_t logId, struct timespec* ts, struct iovec* vec,
|
|
size_t nr);
|
|
};
|
|
|
|
struct logger_list {
|
|
atomic_int fd;
|
|
int mode;
|
|
unsigned int tail;
|
|
log_time start;
|
|
pid_t pid;
|
|
uint32_t log_mask;
|
|
};
|
|
|
|
// Format for a 'logger' entry: uintptr_t where only the bottom 32 bits are used.
|
|
// bit 31: Set if this 'logger' is for logd.
|
|
// bit 30: Set if this 'logger' is for pmsg
|
|
// bits 0-2: the decimal value of the log buffer.
|
|
// Other bits are unused.
|
|
|
|
#define LOGGER_LOGD (1U << 31)
|
|
#define LOGGER_PMSG (1U << 30)
|
|
#define LOGGER_LOG_ID_MASK ((1U << 3) - 1)
|
|
|
|
inline bool android_logger_is_logd(struct logger* logger) {
|
|
return reinterpret_cast<uintptr_t>(logger) & LOGGER_LOGD;
|
|
}
|
|
|
|
/* OS specific dribs and drabs */
|
|
|
|
#if defined(_WIN32)
|
|
#include <private/android_filesystem_config.h>
|
|
typedef uint32_t uid_t;
|
|
static inline uid_t __android_log_uid() {
|
|
return AID_SYSTEM;
|
|
}
|
|
#else
|
|
static inline uid_t __android_log_uid() {
|
|
return getuid();
|
|
}
|
|
#endif
|
|
|
|
__END_DECLS
|