X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=log.c;h=237bac28899c9feaf603835040732d0901d1acbf;hb=855dc4d44e000b68c01b0e33eae3389b49eb7f7f;hp=c7856eb74f6266e364951c4320e25ee95688e2c4;hpb=c78e8496d438982157657711fbff8bedb621c1c9;p=fio.git

diff --git a/log.c b/log.c
index c7856eb7..237bac28 100644
--- a/log.c
+++ b/log.c
@@ -1,12 +1,10 @@
 #include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
 #include <stdarg.h>
 #include <syslog.h>
 
 #include "fio.h"
-
-#define LOG_START_SZ		512
+#include "oslib/asprintf.h"
 
 size_t log_info_buf(const char *buf, size_t len)
 {
@@ -17,7 +15,7 @@ size_t log_info_buf(const char *buf, size_t len)
 		return 0;
 
 	if (is_backend) {
-		size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+		ssize_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
 		if (ret != -1)
 			return ret;
 	}
@@ -29,78 +27,73 @@ size_t log_info_buf(const char *buf, size_t len)
 		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)
 {
-	size_t len, cur = LOG_START_SZ;
 	char *buffer;
+	int len;
 
-	do {
-		buffer = calloc(1, cur);
-
-		len = vsnprintf(buffer, cur, str, args);
-		if (len < cur)
-			break;
-
-		cur = len + 1;
-		free(buffer);
-	} while (1);
-
-	cur = log_info_buf(buffer, len);
+	len = vasprintf(&buffer, fmt, args);
+	if (len < 0)
+		return 0;
+	len = log_info_buf(buffer, len);
 	free(buffer);
 
-	return cur;
+	return len;
 }
 
-size_t log_info(const char *format, ...)
+/* add prefix for the specified type in front of the valist */
+#ifdef FIO_INC_DEBUG
+void log_prevalist(int type, const char *fmt, va_list args)
 {
-	size_t len, cur = LOG_START_SZ;
-	char *buffer;
-	va_list args;
-
-	do {
-		buffer = calloc(1, cur);
-
-		va_start(args, format);
-		len = vsnprintf(buffer, cur, format, args);
-		va_end(args);
+	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;
+	log_info_buf(buf2, len);
+	free(buf2);
+}
+#endif
 
-		if (len < cur)
-			break;
+ssize_t log_info(const char *format, ...)
+{
+	va_list args;
+	ssize_t ret;
 
-		cur = len + 1;
-		free(buffer);
-	} while (1);
+	va_start(args, format);
+	ret = log_valist(format, args);
+	va_end(args);
 
-	cur = log_info_buf(buffer, len);
-	free(buffer);
-
-	return cur;
+	return ret;
 }
 
 size_t __log_buf(struct buf_output *buf, const char *format, ...)
 {
-	size_t len, cur = LOG_START_SZ;
 	char *buffer;
 	va_list args;
+	int len;
 
-	do {
-		buffer = calloc(1, cur);
-
-		va_start(args, format);
-		len = vsnprintf(buffer, cur, format, args);
-		va_end(args);
-
-		if (len < cur)
-			break;
-
-		cur = len + 1;
-		free(buffer);
-	} while (1);
-
-	cur = buf_output_add(buf, buffer, len);
+	va_start(args, format);
+	len = vasprintf(&buffer, format, args);
+	va_end(args);
+	if (len < 0)
+		return 0;
+	len = buf_output_add(buf, buffer, len);
 	free(buffer);
 
-	return cur;
+	return len;
 }
 
 int log_info_flush(void)
@@ -111,26 +104,18 @@ int log_info_flush(void)
 	return fflush(f_out);
 }
 
-size_t log_err(const char *format, ...)
+ssize_t log_err(const char *format, ...)
 {
-	size_t ret, len, cur = LOG_START_SZ;
+	ssize_t ret;
+	int len;
 	char *buffer;
 	va_list args;
 
-	do {
-		buffer = calloc(1, cur);
-
-		va_start(args, format);
-		len = vsnprintf(buffer, cur, format, args);
-		va_end(args);
-
-		if (len < cur)
-			break;
-
-		cur = len + 1;
-		free(buffer);
-	} while (1);
-
+	va_start(args, format);
+	len = vasprintf(&buffer, format, args);
+	va_end(args);
+	if (len < 0)
+		return len;
 
 	if (is_backend) {
 		ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);