tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

system/core: replace EVENT_TAG_MAP_FILE with NULL

Browse source 
NULL represents system default.  In the future, NULL could represent
static and dynamic tags, which can come from multiple files based on
implementation details in the liblog library.

Test: gTest logd-unit-tests & liblog-unit-tests
Bug: 31456426
Change-Id: I0e3d296de81ca299ae63d7b83781639ee67ec298
This commit is contained in:
Mark Salyzyn 2016-11-11 09:48:56 -08:00
parent b6552f376c
commit 1179eb8048
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debuggerd/tombstone.cpp
View file

@ -571,7 +571,7 @@ static void dump_log_file(
if (log_entry.id() == LOG_ID_EVENTS) {
if (!g_eventTagMap) {
g_eventTagMap = android_openEventTagMap(EVENT_TAG_MAP_FILE);
g_eventTagMap = android_openEventTagMap(NULL);
}
AndroidLogEntry e;
char buf[512];

9
liblog/event_tag_map.c
View file

@ -73,12 +73,13 @@ LIBLOG_ABI_PUBLIC EventTagMap* android_openEventTagMap(const char* fileName)
EventTagMap* newTagMap;
off_t end;
int save_errno;
const char* tagfile = fileName ? fileName : EVENT_TAG_MAP_FILE;
int fd = open(fileName, O_RDONLY | O_CLOEXEC);
int fd = open(tagfile, O_RDONLY | O_CLOEXEC);
if (fd < 0) {
save_errno = errno;
fprintf(stderr, "%s: unable to open map '%s': %s\n",
OUT_TAG, fileName, strerror(save_errno));
OUT_TAG, tagfile, strerror(save_errno));
goto fail_errno;
}
@ -87,7 +88,7 @@ LIBLOG_ABI_PUBLIC EventTagMap* android_openEventTagMap(const char* fileName)
(void) lseek(fd, 0L, SEEK_SET);
if (end < 0) {
fprintf(stderr, "%s: unable to seek map '%s' %s\n",
OUT_TAG, fileName, strerror(save_errno));
OUT_TAG, tagfile, strerror(save_errno));
goto fail_close;
}
@ -103,7 +104,7 @@ LIBLOG_ABI_PUBLIC EventTagMap* android_openEventTagMap(const char* fileName)
fd = -1;
if ((newTagMap->mapAddr == MAP_FAILED) || (newTagMap->mapAddr == NULL)) {
fprintf(stderr, "%s: mmap(%s) failed: %s\n",
OUT_TAG, fileName, strerror(save_errno));
OUT_TAG, tagfile, strerror(save_errno));
goto fail_free;
}

2
liblog/logger_write.c
View file

@ -293,7 +293,7 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec *vec, size_t nr)
ret = __android_log_trylock();
m = (EventTagMap *)atomic_load(&tagMap); /* trylock flush cache */
if (!m) {
m = android_openEventTagMap(EVENT_TAG_MAP_FILE);
m = android_openEventTagMap(NULL);
if (ret) { /* trylock failed, use local copy, mark for close */
f = m;
} else {

2
logcat/logcat.cpp
View file

@ -177,7 +177,7 @@ static void processBuffer(log_device_t* dev, struct log_msg *buf)
static EventTagMap *eventTagMap = NULL;
if (!eventTagMap && !hasOpenedEventTagMap) {
eventTagMap = android_openEventTagMap(EVENT_TAG_MAP_FILE);
eventTagMap = android_openEventTagMap(NULL);
hasOpenedEventTagMap = true;
}
err = android_log_processBinaryLogBuffer(&buf->entry_v1, &entry,

2
logd/main.cpp
View file

@ -311,7 +311,7 @@ const char *android::tagToName(size_t *len, uint32_t tag) {
if (!map) {
sem_wait(&sem_name);
if (!map) {
map = android_openEventTagMap(EVENT_TAG_MAP_FILE);
map = android_openEventTagMap(NULL);
}
sem_post(&sem_name);
if (!map) {