X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=6c36813d4a9912b5e8742d2da55304f56b00f941;hp=d508267676b7f9d71f609d6ee5bf058c69897ef5;hb=de5ed0e4d398bc9d4576f9b2b82d7686989c27e1;hpb=4b157ac6446364e5eecdcdbf75fc1a814489a343

diff --git a/log.c b/log.c
index d5082676..6c36813d 100644
--- a/log.c
+++ b/log.c
@@ -1,66 +1,97 @@
 #include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
 #include <stdarg.h>
 #include <syslog.h>
 
 #include "fio.h"
+#include "oslib/asprintf.h"
 
 size_t log_info_buf(const char *buf, size_t len)
 {
-	if (is_backend)
-		return fio_server_text_output(FIO_LOG_INFO, buf, len);
-	else if (log_syslog) {
+	/*
+	 * buf could be NULL (not just "").
+	 */
+	if (!buf)
+		return 0;
+
+	if (is_backend) {
+		ssize_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+		if (ret != -1)
+			return ret;
+	}
+
+	if (log_syslog) {
 		syslog(LOG_INFO, "%s", buf);
 		return len;
 	} else
 		return fwrite(buf, len, 1, f_out);
 }
 
-size_t log_valist(const char *str, va_list args)
+size_t log_valist(const char *fmt, va_list args)
 {
-	char buffer[1024];
-	size_t len;
+	char *buffer;
+	int len;
 
-	len = vsnprintf(buffer, sizeof(buffer), str, args);
+	len = vasprintf(&buffer, fmt, args);
+	if (len < 0)
+		return 0;
+	len = log_info_buf(buffer, len);
+	free(buffer);
 
-	return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
+	return len;
 }
 
-size_t log_local_buf(const char *buf, size_t len)
+/* add prefix for the specified type in front of the valist */
+void log_prevalist(int type, const char *fmt, va_list args)
 {
-	if (log_syslog)
-		syslog(LOG_INFO, "%s", buf);
-	else
-		len = fwrite(buf, len, 1, f_out);
-
-	return len;
+	char *buf1, *buf2;
+	int len;
+	pid_t pid;
+
+	pid = gettid();
+	if (fio_debug_jobp && *fio_debug_jobp != -1U
+	    && pid != *fio_debug_jobp)
+		return;
+
+	len = vasprintf(&buf1, fmt, args);
+	if (len < 0)
+		return;
+	len = asprintf(&buf2, "%-8s %-5u %s", debug_levels[type].name,
+		       (int) pid, buf1);
+	free(buf1);
+	if (len < 0)
+		return;
+	len = log_info_buf(buf2, len);
+	free(buf2);
 }
 
-size_t log_info(const char *format, ...)
+ssize_t log_info(const char *format, ...)
 {
-	char buffer[1024];
 	va_list args;
-	size_t len;
+	ssize_t ret;
 
 	va_start(args, format);
-	len = vsnprintf(buffer, sizeof(buffer), format, args);
+	ret = log_valist(format, args);
 	va_end(args);
 
-	return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
+	return ret;
 }
 
 size_t __log_buf(struct buf_output *buf, const char *format, ...)
 {
-	char buffer[1024];
+	char *buffer;
 	va_list args;
-	size_t len;
+	int len;
 
 	va_start(args, format);
-	len = vsnprintf(buffer, sizeof(buffer), format, args);
+	len = vasprintf(&buffer, format, args);
 	va_end(args);
+	if (len < 0)
+		return 0;
+	len = buf_output_add(buf, buffer, len);
+	free(buffer);
 
-	return buf_output_add(buf, buffer, min(len, sizeof(buffer) - 1));
+	return len;
 }
 
 int log_info_flush(void)
@@ -71,31 +102,38 @@ int log_info_flush(void)
 	return fflush(f_out);
 }
 
-size_t log_err(const char *format, ...)
+ssize_t log_err(const char *format, ...)
 {
-	char buffer[1024];
+	ssize_t ret;
+	int len;
+	char *buffer;
 	va_list args;
-	size_t len;
 
 	va_start(args, format);
-	len = vsnprintf(buffer, sizeof(buffer), format, args);
+	len = vasprintf(&buffer, format, args);
 	va_end(args);
-	len = min(len, sizeof(buffer) - 1);
+	if (len < 0)
+		return len;
+
+	if (is_backend) {
+		ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+		if (ret != -1)
+			goto done;
+	}
 
-	if (is_backend)
-		return fio_server_text_output(FIO_LOG_ERR, buffer, len);
-	else if (log_syslog) {
+	if (log_syslog) {
 		syslog(LOG_INFO, "%s", buffer);
-		return len;
+		ret = len;
 	} else {
-		if (f_err != stderr) {
-			int fio_unused ret;
-
+		if (f_err != stderr)
 			ret = fwrite(buffer, len, 1, stderr);
-		}
 
-		return fwrite(buffer, len, 1, f_err);
+		ret = fwrite(buffer, len, 1, f_err);
 	}
+
+done:
+	free(buffer);
+	return ret;
 }
 
 const char *log_get_level(int level)