X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=a327f6aa4c0e68f9e822e349984f31c3d509d9e2;hp=c4a3b52075367919b191219f84d14a9b46936338;hb=971caeb177d3bc4f65fa31381bbfb83710bfc690;hpb=10aa136bddbaa7c845ab4eacb4a9a4a88d6657a3

diff --git a/log.c b/log.c
index c4a3b520..a327f6aa 100644
--- a/log.c
+++ b/log.c
@@ -6,52 +6,140 @@
 
 #include "fio.h"
 
-int log_valist(const char *str, va_list args)
+#define LOG_START_SZ		512
+
+size_t log_info_buf(const char *buf, size_t len)
 {
-	char buffer[1024];
-	size_t len;
+	/*
+	 * buf could be NULL (not just "").
+	 */
+	if (!buf)
+		return 0;
 
-	len = vsnprintf(buffer, sizeof(buffer), str, args);
-	len = min(len, sizeof(buffer) - 1);
+	if (is_backend) {
+		size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+		if (ret != -1)
+			return ret;
+	}
 
-	if (is_backend)
-		len = fio_server_text_output(FIO_LOG_INFO, buffer, len);
-	if (log_syslog)
-		syslog(LOG_INFO, "%s", buffer);
-	else
-		len = fwrite(buffer, len, 1, f_out);
+	if (log_syslog) {
+		syslog(LOG_INFO, "%s", buf);
+		return len;
+	} else
+		return fwrite(buf, len, 1, f_out);
+}
+
+static size_t valist_to_buf(char **buffer, const char *fmt, va_list src_args)
+{
+	size_t len, cur = LOG_START_SZ;
+	va_list args;
+
+	do {
+		*buffer = calloc(1, cur);
+		if (!*buffer)
+			return 0;
+
+		va_copy(args, src_args);
+		len = vsnprintf(*buffer, cur, fmt, args);
+		va_end(args);
+
+		if (len < cur)
+			break;
+
+		cur = len + 1;
+		free(*buffer);
+	} while (1);
 
 	return len;
 }
 
-int log_local_buf(const char *buf, size_t len)
+/* allocate buffer, fill with prefix string followed by vararg string */
+static size_t prevalist_to_buf(char **buffer, const char *pre, int prelen,
+		const char *fmt, va_list src_args)
 {
-	if (log_syslog)
-		syslog(LOG_INFO, "%s", buf);
-	else
-		len = fwrite(buf, len, 1, f_out);
+	size_t len, cur = LOG_START_SZ;
+	va_list args;
+
+	do {
+		*buffer = calloc(1, cur);
+		if (!*buffer)
+			return 0;
+
+		va_copy(args, src_args);
+		memcpy(*buffer, pre, prelen);
+		len = prelen + vsnprintf(*buffer + prelen, cur - prelen, fmt, args);
+		va_end(args);
+
+		if (len < cur)
+			break;
+
+		cur = len + 1;
+		free(*buffer);
+	} while (1);
 
 	return len;
 }
 
-int log_info(const char *format, ...)
+size_t log_valist(const char *fmt, va_list args)
 {
-	char buffer[1024];
+	char *buffer;
+	size_t len;
+
+	len = valist_to_buf(&buffer, fmt, args);
+	len = log_info_buf(buffer, len);
+	free(buffer);
+
+	return len;
+}
+
+/* add prefix for the specified type in front of the valist */
+void log_prevalist(int type, const char *fmt, va_list args)
+{
+	char pre[32];
+	char *buffer;
+	size_t len;
+	int prelen;
+	pid_t pid;
+
+	pid = gettid();
+	if (fio_debug_jobp && *fio_debug_jobp != -1U
+	    && pid != *fio_debug_jobp)
+		return;
+
+	prelen = snprintf(pre, sizeof pre, "%-8s %-5u ", debug_levels[type].name, (int) pid);
+	if (prelen > 0) {
+		len = prevalist_to_buf(&buffer, pre, prelen, fmt, args);
+		len = log_info_buf(buffer, len);
+		free(buffer);
+	}
+}
+
+size_t log_info(const char *format, ...)
+{
+	va_list args;
+	size_t ret;
+
+	va_start(args, format);
+	ret = log_valist(format, args);
+	va_end(args);
+
+	return ret;
+}
+
+size_t __log_buf(struct buf_output *buf, const char *format, ...)
+{
+	char *buffer;
 	va_list args;
 	size_t len;
 
 	va_start(args, format);
-	len = vsnprintf(buffer, sizeof(buffer), format, args);
+	len = valist_to_buf(&buffer, format, args);
 	va_end(args);
-	len = min(len, sizeof(buffer) - 1);
 
-	if (is_backend)
-		return fio_server_text_output(FIO_LOG_INFO, buffer, len);
-	else if (log_syslog) {
-		syslog(LOG_INFO, "%s", buffer);
-		return len;
-	} else
-		return fwrite(buffer, len, 1, f_out);
+	len = buf_output_add(buf, buffer, len);
+	free(buffer);
+
+	return len;
 }
 
 int log_info_flush(void)
@@ -62,31 +150,35 @@ int log_info_flush(void)
 	return fflush(f_out);
 }
 
-int log_err(const char *format, ...)
+size_t log_err(const char *format, ...)
 {
-	char buffer[1024];
+	size_t ret, len;
+	char *buffer;
 	va_list args;
-	size_t len;
 
 	va_start(args, format);
-	len = vsnprintf(buffer, sizeof(buffer), format, args);
+	len = valist_to_buf(&buffer, format, args);
 	va_end(args);
-	len = min(len, sizeof(buffer) - 1);
 
-	if (is_backend)
-		return fio_server_text_output(FIO_LOG_ERR, buffer, len);
-	else if (log_syslog) {
+	if (is_backend) {
+		ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+		if (ret != -1)
+			goto done;
+	}
+
+	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)