X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=6c36813d4a9912b5e8742d2da55304f56b00f941;hp=1dacac41f118fdd4678d3c7e0911518f0bab4c88;hb=a15abb450459195ce72d515dc564f07f7726bf5f;hpb=e46d809110bd4ad2980ca64931b683673444454b

diff --git a/log.c b/log.c
index 1dacac41..6c36813d 100644
--- a/log.c
+++ b/log.c
@@ -1,76 +1,148 @@
 #include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
 #include <stdarg.h>
 #include <syslog.h>
 
 #include "fio.h"
+#include "oslib/asprintf.h"
 
-int log_valist(const char *str, va_list args)
+size_t log_info_buf(const char *buf, size_t len)
 {
-	if (log_syslog) {
-		vsyslog(LOG_INFO, str, args);
+	/*
+	 * buf could be NULL (not just "").
+	 */
+	if (!buf)
 		return 0;
-	} else {
-		char buffer[1024];
-		size_t len;
 
-		len = vsnprintf(buffer, sizeof(buffer), str, args);
-		return fwrite(buffer, len, 1, f_out);
+	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 *fmt, va_list args)
+{
+	char *buffer;
+	int len;
+
+	len = vasprintf(&buffer, fmt, args);
+	if (len < 0)
+		return 0;
+	len = log_info_buf(buffer, len);
+	free(buffer);
+
+	return len;
 }
 
-int log_local(const char *format, ...)
+/* add prefix for the specified type in front of the valist */
+void log_prevalist(int type, const char *fmt, va_list 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;
+	len = log_info_buf(buf2, len);
+	free(buf2);
+}
+
+ssize_t log_info(const char *format, ...)
 {
-	char buffer[1024];
 	va_list args;
-	size_t len;
+	ssize_t ret;
 
 	va_start(args, format);
+	ret = log_valist(format, args);
+	va_end(args);
 
-	if (log_syslog) {
-		vsyslog(LOG_INFO, format, args);
-		va_end(args);
-		return 0;
-	} else {
-		len = vsnprintf(buffer, sizeof(buffer), format, args);
-		va_end(args);
-		return fwrite(buffer, len, 1, f_out);
-	}
+	return ret;
 }
 
-int log_info(const char *format, ...)
+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);
 
-	if (is_backend)
-		return fio_server_text_output(buffer, len);
-	else
-		return fwrite(buffer, len, 1, f_out);
+	return len;
 }
 
-int log_err(const char *format, ...)
+int log_info_flush(void)
 {
-	char buffer[1024];
+	if (is_backend || log_syslog)
+		return 0;
+
+	return fflush(f_out);
+}
+
+ssize_t log_err(const char *format, ...)
+{
+	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);
+	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(buffer, len);
-	else {
+	if (log_syslog) {
+		syslog(LOG_INFO, "%s", buffer);
+		ret = len;
+	} else {
 		if (f_err != stderr)
-			fwrite(buffer, len, 1, 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)
+{
+	static const char *levels[] = { "Unknown", "Debug", "Info", "Error",
+						"Unknown" };
+
+	if (level >= FIO_LOG_NR)
+		level = FIO_LOG_NR;
+
+	return levels[level];
 }