Add initial changes and notes for wrapping

Author: bukka

sapi/fpm/fpm/zlog.c

@@ -290,59 +290,89 @@ inline static zlog_bool zlog_stream_buf_alloc(struct zlog_stream *stream)  /* {{
 }
 /* }}} */
 
-static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *str, size_t len)  /* {{{ */
+/* 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) /* {{{ */
 {
-	int finished = 0;
-
-	if (stream->len + len > zlog_limit) {
-		stream->finished = finished = 1;
-		len = zlog_limit - stream->len;
-	}
-
-	if (stream->buf_size - stream->len <= len && !zlog_stream_buf_alloc_ex(stream, len)) {
-		return -1;
+	if (stream->use_fd) {
+		zend_quiet_write(stream->fd, buf, len);
+		if (finished) {
+			zend_quiet_write(stream->fd, append, append_len);
+		}
 	}
 
-	memcpy(stream->buf + stream->len, str, len);
-	stream->len += len;
-
-	if (finished) {
-		stream->len = zlog_truncate_buf(stream->buf, stream->len);
+	if (stream->use_stderr) {
+		zend_quiet_write(STDERR_FILENO, buf, len);
+		if (finished) {
+			zend_quiet_write(STDERR_FILENO, append, append_len);
+		}
 	}
 
 	return len;
 }
+/* }}} */
 
-static inline ssize_t zlog_stream_write(struct zlog_stream *stream, const char *buf, size_t len) /* {{{ */
+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);
+}
+/* }}} */
+
+static inline ssize_t zlog_stream_unbuffered_write(struct zlog_stream *stream, const char *buf, size_t len) /* {{{ */
 {
 	int finished = 0;
 	const char *append;
 	size_t append_len;
 
 	if (stream->len + len >= zlog_limit) {
+		/* TODO: handle wrapping */
 		stream->finished = finished = 1;
 		append = (stream->len + len == zlog_limit) ? "\n" : "...\n";
 		append_len = sizeof(append) - 1;
 		len = zlog_limit - stream->len - append_len;
 	}
 
-	if (stream->use_fd) {
-		zend_quiet_write(stream->fd, buf, len);
-		if (finished) {
-			zend_quiet_write(stream->fd, append, append_len);
-		}
+	return zlog_stream_direct_write_ex(stream, buf, len, finished, append, append_len);
+}
+/* }}} */
+
+/* TODO: handle errors from this function in all calls (check for -1) */
+static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *str, size_t str_len)  /* {{{ */
+{
+	int finished = 0;
+	size_t available_len;
+
+	if (stream->len + str_len > zlog_limit) {
+		stream->finished = finished = 1;
+		available_len = zlog_limit - stream->len;
+	} else {
+		available_len = str_len;
 	}
 
-	if (stream->use_stderr) {
-		zend_quiet_write(STDERR_FILENO, buf, len);
-		if (finished) {
-			zend_quiet_write(STDERR_FILENO, append, append_len);
-		}
+	if (stream->buf_size - stream->len <= available_len && !zlog_stream_buf_alloc_ex(stream, available_len)) {
+		return -1;
 	}
 
-	return len;
+	memcpy(stream->buf + stream->len, str, available_len);
+	stream->len += available_len;
+
+	if (!finished) {
+		return available_len;
+	}
+
+	if (stream->wrap) {
+		/* TODO: append wrap_suffix before the write */
+		zlog_stream_direct_write(stream, stream->buf, stream->len);
+		stream->len = 0;
+		/* TODO: use function and line from the initial call (remember them and call zlog_stream_prefix_ex) */
+		zlog_stream_prefix(stream);
+		return available_len + zlog_stream_buf_append(stream, str + available_len, str_len - available_len);
+	}
+
+	stream->len = zlog_truncate_buf(stream->buf, stream->len);
+	return available_len;
 }
-/* }}} */
 
 static inline void zlog_stream_init_ex(struct zlog_stream *stream, int flags, size_t capacity, int fd) /* {{{ */
 {
@@ -355,6 +385,7 @@ static inline void zlog_stream_init_ex(struct zlog_stream *stream, int flags, si
 	stream->use_syslog = fd == ZLOG_SYSLOG;
 	stream->use_fd = !stream->use_syslog;
 	stream->use_buffer = external_logger != NULL || stream->use_syslog;
+	/* TODO: require a minimal capacity when using buffer to make sure the prefix is not trimmed */
 	stream->buf_size = capacity;
 	stream->use_stderr = fd != STDERR_FILENO && fd != STDOUT_FILENO && fd != -1 &&
 			!launched && (flags & ZLOG_LEVEL_MASK) >= ZLOG_NOTICE;
@@ -458,11 +489,19 @@ ssize_t zlog_stream_prefix_ex(struct zlog_stream *stream, const char *function,
 		}
 		len = zlog_buf_prefix(function, line, stream->flags, stream->buf, stream->buf_size, stream->use_syslog);
 		stream->len = stream->prefix_len = len;
-		return len;
+		if (stream->wrap_prefix != NULL) {
+			zlog_stream_buf_append(stream, stream->wrap_prefix, stream->wrap_prefix_len);
+		}
+		return stream->len;
 	} else {
 		char sbuf[1024];
+		ssize_t written;
 		len = zlog_buf_prefix(function, line, stream->flags, sbuf, 1024, stream->use_syslog);
-		return zlog_stream_write(stream, sbuf, len);
+		written = zlog_stream_direct_write(stream, sbuf, len);
+		if (stream->wrap_prefix != NULL) {
+			written += zlog_stream_direct_write(stream, stream->wrap_prefix, stream->wrap_prefix_len);
+		}
+		return written;
 	}
 }
 /* }}} */
@@ -501,13 +540,14 @@ ssize_t zlog_stream_str(struct zlog_stream *stream, const char *str, size_t str_
 		return zlog_stream_buf_append(stream, str, str_len);
 	}
 
-	return zlog_stream_write(stream, str, str_len);
+	return zlog_stream_unbuffered_write(stream, str, str_len);
 }
 /* }}} */
 
 zlog_bool zlog_stream_finish(struct zlog_stream *stream) /* {{{ */
 {
 	if (stream->use_buffer) {
+		/* TODO: append stream->wrap_final_suffix */
 		if (external_logger != NULL) {
 			external_logger(stream->flags & ZLOG_LEVEL_MASK,
 					stream->buf + stream->prefix_len, stream->len - stream->prefix_len);
@@ -520,9 +560,9 @@ zlog_bool zlog_stream_finish(struct zlog_stream *stream) /* {{{ */
 		}
 #endif
 		stream->buf[stream->len++] = '\n';
-		zlog_stream_write(stream, stream->buf, stream->len);
+		zlog_stream_direct_write(stream, stream->buf, stream->len);
 	} else if (!stream->finished) {
-		zlog_stream_write(stream, "\n", 1);
+		zlog_stream_direct_write(stream, "\n", 1);
 	}
 
 	stream->finished = 1;