commit 9e3756f53294acde07881e4aa65b6cf42157aa75
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 14 01:23:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 14 01:23:02 2017 +0000
tree 63cb88fc7a4ad7555747915a6238b4963d11161d
parent d9b45c5811d668378d2bc144998023fdfc6557c1
parent 7ecfd6ac10957ff392dda713e983cb6b09b2b203

Merge "liblog: android_log_event_list class permit -EBUSY retry"

liblog/include/log/log_event_list.h

diff --git a/liblog/include/log/log_event_list.h b/liblog/include/log/log_event_list.h
index 55953fc..057be5d 100644
--- a/liblog/include/log/log_event_list.h
+++ b/liblog/include/log/log_event_list.h
@@ -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 @@
     return ctx;
   }
 
+  /* return errors or transmit status */
   int status() const {
     return ret;
   }
@@ -209,14 +211,16 @@
   }
 
   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;
   }