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

Merge "liblog: android_log_event_list class permit -EBUSY retry" am: 9e3756f532

Browse source 
am: b5e436bf3d

Change-Id: I169339c921f3e992aa5dc4543cadcf8ec4418be3
This commit is contained in:
Mark Salyzyn 2017-04-14 01:38:07 +00:00 committed by android-build-merger
commit 6dfe87ed87
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
liblog/include/log/log_event_list.h
View file

@ -17,6 +17,7 @@
#ifndef _LIBS_LOG_EVENT_LIST_H
#define _LIBS_LOG_EVENT_LIST_H
#include <errno.h>
#include <stdint.h>
#if (defined(__cplusplus) && defined(_USING_LIBCXX))
@ -148,6 +149,7 @@ class android_log_event_list {
return ctx;
}
/* return errors or transmit status */
int status() const {
return ret;
}
@ -209,14 +211,16 @@ class android_log_event_list {
}
int write(log_id_t id = LOG_ID_EVENTS) {
/* facilitate -EBUSY retry */
if ((ret == -EBUSY) || (ret > 0)) ret = 0;
int retval = android_log_write_list(ctx, id);
if (retval < 0) ret = retval;
/* existing errors trump transmission errors */
if (!ret) ret = retval;
return ret;
}
int operator<<(log_id_t id) {
int retval = android_log_write_list(ctx, id);
if (retval < 0) ret = retval;
write(id);
android_log_destroy(&ctx);
return ret;
}