Write log messages which cross the circular buffer boundary atomically,

using writev.

diff --git a/src/cpbuffer.h b/src/cpbuffer.h
index 1c05174a6ea8db0f1be1519a0a14cb8702fe9a40..eb77523dd78584d9f3058b5b1a3cdee0efeeaf7d 100644 (file)
--- a/src/cpbuffer.h
+++ b/src/cpbuffer.h
@@ -29,6 +29,11 @@ template <int SIZE> class CPBuffer
         return &buf[cur_idx];
     }
     
+    char * get_buf_base()
+    {
+        return buf;
+    }
+    
     int get_contiguous_length(char *ptr)
     {
         int eidx = cur_idx + length;

diff --git a/src/dinit-log.cc b/src/dinit-log.cc
index 431c2a5eed5d71d53adef599efba33667daa4d6c..826a1ac5a724dd0372da6371905d29bc8c0849b8 100644 (file)
--- a/src/dinit-log.cc
+++ b/src/dinit-log.cc
@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/syslog.h>
+#include <sys/uio.h>
 
 #include "dasync.h"
 
@@ -153,8 +154,14 @@ Rearm BufferedLogStream::gotEvent(EventLoop_t *loop, int fd, int flags) noexcept
             return Rearm::DISARM;
         }
         
-        char *ptr = log_stream.log_buffer.get_ptr(0);
-        int len = log_stream.log_buffer.get_contiguous_length(ptr);
+        // We try to find a complete line (terminated by '\n') in the buffer, and write it
+        // out. Since it may span the circular buffer end, it may consist of two distinct spans,
+        // and so we use writev to write them atomically.
+        
+        struct iovec logiov[2];
+        
+        char *ptr = log_buffer.get_ptr(0);
+        int len = log_buffer.get_contiguous_length(ptr);
         char *creptr = ptr + len;  // contiguous region end
         char *eptr = std::find(ptr, creptr, '\n');
         
@@ -166,7 +173,27 @@ Rearm BufferedLogStream::gotEvent(EventLoop_t *loop, int fd, int flags) noexcept
 
         len = eptr - ptr;
         
-        int r = write(fd, ptr, len);
+        logiov[0].iov_base = ptr;
+        logiov[0].iov_len = len;
+        int iovs_to_write = 1;
+        
+        // Do we need the second span?
+        if (! will_complete && len != log_buffer.get_length()) {
+            ptr = log_buffer.get_buf_base();
+            creptr = static_cast<char *>(logiov[1].iov_base) + log_buffer.get_length() - len;
+            eptr = std::find(ptr, creptr, '\n');
+            if (eptr != creptr) {
+                eptr++; // include '\n'
+                // It should not ever be the case that we do not now have a complete message
+                will_complete = true;
+            }
+            logiov[1].iov_base = ptr;
+            logiov[1].iov_len = eptr - ptr;
+            len += logiov[1].iov_len;
+            iovs_to_write = 2;
+        }
+        
+        ssize_t r = writev(fd, logiov, iovs_to_write);
 
         if (r >= 0) {
             bool complete = (r == len) && will_complete;