Implement wrapping to the unbuffered write

Author: bukka

sapi/fpm/fpm/zlog.c

@@ -293,18 +293,18 @@ inline static zlog_bool zlog_stream_buf_alloc(struct zlog_stream *stream)  /* {{
 /* TODO: consider better handling of errors and do not use zend_quiet_write */
 static inline ssize_t zlog_stream_direct_write_ex(
 		struct zlog_stream *stream, const char *buf, size_t len,
-		int finished, const char *append, size_t append_len) /* {{{ */
+		const char *append, size_t append_len) /* {{{ */
 {
 	if (stream->use_fd) {
 		zend_quiet_write(stream->fd, buf, len);
-		if (finished) {
+		if (append_len > 0) {
 			zend_quiet_write(stream->fd, append, append_len);
 		}
 	}
 
 	if (stream->use_stderr) {
 		zend_quiet_write(STDERR_FILENO, buf, len);
-		if (finished) {
+		if (append_len > 0) {
 			zend_quiet_write(STDERR_FILENO, append, append_len);
 		}
 	}
@@ -315,7 +315,7 @@ static inline ssize_t zlog_stream_direct_write_ex(
 
 static ssize_t zlog_stream_direct_write(struct zlog_stream *stream, const char *buf, size_t len) /* {{{ */
 {
-	return zlog_stream_direct_write_ex(stream, buf, len, 0, NULL, 0);
+	return zlog_stream_direct_write_ex(stream, buf, len, NULL, 0);
 }
 /* }}} */
 
@@ -326,14 +326,36 @@ static inline ssize_t zlog_stream_unbuffered_write(struct zlog_stream *stream, c
 	size_t append_len;
 
 	if (stream->len + len >= zlog_limit) {
-		/* TODO: handle wrapping */
+		if (stream->wrap) {
+			if (stream->wrap_prefix != NULL) {
+				zlog_stream_direct_write_ex(
+						stream, stream->wrap_prefix, stream->wrap_prefix_len, NULL, 0);
+			}
+			len = zlog_limit - stream->len;
+			if (stream->len + len == zlog_limit) {
+				append = NULL;
+				append_len = 0;
+			} else {
+				append = "\n";
+				append_len = 1;
+			}
+			if (stream->wrap_suffix) {
+				zlog_stream_direct_write(stream, buf, len);
+				zlog_stream_direct_write_ex(
+						stream, stream->wrap_suffix, stream->wrap_suffix_len, append, append_len);
+			} else {
+				zlog_stream_direct_write_ex(stream, buf, len, append, append_len);
+			}
+			/* TODO: use loop to speed it up */
+			return len + zlog_stream_unbuffered_write(stream, buf + len, len);
+		}
 		stream->finished = finished = 1;
 		append = (stream->len + len == zlog_limit) ? "\n" : "...\n";
 		append_len = sizeof(append) - 1;
 		len = zlog_limit - stream->len - append_len;
 	}
 
-	return zlog_stream_direct_write_ex(stream, buf, len, finished, append, append_len);
+	return zlog_stream_direct_write_ex(stream, buf, len, append, append_len);
 }
 /* }}} */
 
@@ -373,10 +395,13 @@ static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *st
 	if (stream->wrap) {
 		if (stream->wrap_suffix != NULL) {
 			zlog_stream_buf_copy(stream, stream->wrap_suffix, stream->wrap_suffix_len);
+			zlog_stream_buf_copy(stream, "\n", 1);
 		}
+		/* TODO: replace with proper write as it is in the finish (syslog and external logging) */
 		zlog_stream_direct_write(stream, stream->buf, stream->len);
 		stream->len = 0;
 		zlog_stream_prefix_ex(stream, stream->function, stream->line);
+		/* TODO: use loop to speed it up */
 		return available_len + zlog_stream_buf_append(stream, str + available_len, str_len - available_len);
 	}
 
@@ -578,7 +603,12 @@ zlog_bool zlog_stream_finish(struct zlog_stream *stream) /* {{{ */
 		stream->buf[stream->len++] = '\n';
 		zlog_stream_direct_write(stream, stream->buf, stream->len);
 	} else if (!stream->finished) {
-		zlog_stream_direct_write(stream, "\n", 1);
+		if (stream->wrap_final_suffix != NULL) {
+			zlog_stream_direct_write_ex(
+					stream, stream->wrap_final_suffix, stream->wrap_final_suffix_len, "\n", 1);
+		} else {
+			zlog_stream_direct_write(stream, "\n", 1);
+		}
 	}
 
 	stream->finished = 1;