generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "bionic: Build Breakage"

Browse Source
This commit is contained in:
Todd Kjos 2015-12-08 21:46:17 +00:00 committed by Gerrit Code Review
commit 5736959094
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/bionic/libc_logging.cpp
View File

@ -514,7 +514,7 @@ static void refresh_cache(struct cache *cache, const char *key)
// rare, we can accept a trylock failure gracefully. // rare, we can accept a trylock failure gracefully.
static pthread_mutex_t lock_clockid = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t lock_clockid = PTHREAD_MUTEX_INITIALIZER;
static clockid_t android_log_clockid() static clockid_t __android_log_clockid()
{ {
static struct cache r_time_cache = { NULL, static_cast<uint32_t>(-1), 0 }; static struct cache r_time_cache = { NULL, static_cast<uint32_t>(-1), 0 };
static struct cache p_time_cache = { NULL, static_cast<uint32_t>(-1), 0 }; static struct cache p_time_cache = { NULL, static_cast<uint32_t>(-1), 0 };
@ -563,7 +563,7 @@ static int __libc_write_log(int priority, const char* tag, const char* msg) {
vec[1].iov_base = &tid; vec[1].iov_base = &tid;
vec[1].iov_len = sizeof(tid); vec[1].iov_len = sizeof(tid);
timespec ts; timespec ts;
clock_gettime(android_log_clockid(), &ts); clock_gettime(__android_log_clockid(), &ts);
log_time realtime_ts; log_time realtime_ts;
realtime_ts.tv_sec = ts.tv_sec; realtime_ts.tv_sec = ts.tv_sec;
realtime_ts.tv_nsec = ts.tv_nsec; realtime_ts.tv_nsec = ts.tv_nsec;
@ -606,7 +606,7 @@ static int __libc_android_log_event(int32_t tag, char type, const void* payload,
vec[1].iov_base = &tid; vec[1].iov_base = &tid;
vec[1].iov_len = sizeof(tid); vec[1].iov_len = sizeof(tid);
timespec ts; timespec ts;
clock_gettime(android_log_clockid(), &ts); clock_gettime(__android_log_clockid(), &ts);
log_time realtime_ts; log_time realtime_ts;
realtime_ts.tv_sec = ts.tv_sec; realtime_ts.tv_sec = ts.tv_sec;
realtime_ts.tv_nsec = ts.tv_nsec; realtime_ts.tv_nsec = ts.tv_nsec;