From: Jens Axboe <axboe@fb.com>
Date: Tue, 27 Oct 2015 08:43:32 +0000 (+0900)
Subject: log: abstract out and use generic buffer logger
X-Git-Tag: fio-2.2.11~11
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=830814d41dc8b8b9757eb2a6cf7ed7be7128d1f2

log: abstract out and use generic buffer logger

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/log.c b/log.c
index e3ca29cd..8d511b54 100644
--- a/log.c
+++ b/log.c
@@ -6,22 +6,25 @@
 
 #include "fio.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) {
+		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)
 {
 	char buffer[1024];
 	size_t len;
 
 	len = vsnprintf(buffer, sizeof(buffer), str, args);
-	len = min(len, sizeof(buffer) - 1);
 
-	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);
-
-	return len;
+	return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
 }
 
 size_t log_local_buf(const char *buf, size_t len)
@@ -43,15 +46,8 @@ size_t log_info(const char *format, ...)
 	va_start(args, format);
 	len = vsnprintf(buffer, sizeof(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);
+	return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
 }
 
 size_t __log_buf(struct buf_output *buf, const char *format, ...)
diff --git a/log.h b/log.h
index aeabca9c..f1cf0039 100644
--- a/log.h
+++ b/log.h
@@ -14,6 +14,7 @@ extern size_t log_info(const char *format, ...) __attribute__ ((__format__ (__pr
 extern size_t __log_buf(struct buf_output *, const char *format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
 extern size_t log_valist(const char *str, va_list);
 extern size_t log_local_buf(const char *buf, size_t);
+extern size_t log_info_buf(const char *buf, size_t len);
 extern int log_info_flush(void);
 
 #define log_buf(buf, format, args...)		\