ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark"

Browse source
This commit is contained in:
Mark Salyzyn 2015-02-10 18:16:05 +00:00 • committed by Gerrit Code Review
commit 05a67c964b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
liblog/logd_write.c
View file

@ -73,6 +73,7 @@ static int pstore_fd = -1;
static enum { static enum {
kLogUninitialized, kLogNotAvailable, kLogAvailable kLogUninitialized, kLogNotAvailable, kLogAvailable
} g_log_status = kLogUninitialized; } g_log_status = kLogUninitialized;
int __android_log_dev_available(void) int __android_log_dev_available(void)
{ {
if (g_log_status == kLogUninitialized) { if (g_log_status == kLogUninitialized) {
@ -145,7 +146,7 @@ static int __write_to_log_initialize()
return ret; return ret;
} }
static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr) static int __write_to_log_daemon(log_id_t log_id, struct iovec *vec, size_t nr)
{ {
ssize_t ret; ssize_t ret;
#if FAKE_LOG_DEVICE #if FAKE_LOG_DEVICE
@ -180,7 +181,7 @@ static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr)
} }
/* /*
* struct { * struct {
* // whate we provire to pstore * // what we provide to pstore
* android_pmsg_log_header_t pmsg_header; * android_pmsg_log_header_t pmsg_header;
* // what we provide to socket * // what we provide to socket
* android_log_header_t header; * android_log_header_t header;
@ -321,7 +322,7 @@ static int __write_to_log_init(log_id_t log_id, struct iovec *vec, size_t nr)
return ret; return ret;
} }
write_to_log = __write_to_log_kernel; write_to_log = __write_to_log_daemon;
} }
#if !defined(_WIN32) #if !defined(_WIN32)

3
liblog/tests/Android.mk
View file

@ -43,8 +43,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(benchmark_c_flags) LOCAL_CFLAGS += $(benchmark_c_flags)
LOCAL_SHARED_LIBRARIES += liblog libm LOCAL_SHARED_LIBRARIES += liblog libm
LOCAL_SRC_FILES := $(benchmark_src_files) LOCAL_SRC_FILES := $(benchmark_src_files)
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) include $(BUILD_NATIVE_TEST)
include $(BUILD_EXECUTABLE)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Unit tests. # Unit tests.