X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=4eb4af5905c40a45c8df1bd12f4bf02a99ea70a0;hp=362ab23c9813b9366c78ff55b4de8ffdd013a631;hb=819a4a96b6ee8ba5ec631b63ae10b82d28c7d0d0;hpb=084d1c6f817eacaaefa1de4f0637ef6c1405d74b

diff --git a/log.c b/log.c
index 362ab23c..4eb4af59 100644
--- a/log.c
+++ b/log.c
@@ -6,32 +6,32 @@
 
 #include "fio.h"
 
-int log_valist(const char *str, va_list args)
+size_t log_info_buf(const char *buf, size_t len)
 {
-	char buffer[1024];
-	size_t len;
-
-	len = vsnprintf(buffer, sizeof(buffer), str, args);
-
-	if (log_syslog)
-		syslog(LOG_INFO, "%s", buffer);
-	else
-		len = fwrite(buffer, len, 1, f_out);
+	if (is_backend) {
+		size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+		if (ret != -1)
+			return ret;
+	}
 
-	return len;
+	if (log_syslog) {
+		syslog(LOG_INFO, "%s", buf);
+		return len;
+	} else
+		return fwrite(buf, len, 1, f_out);
 }
 
-int log_local_buf(const char *buf, size_t len)
+size_t log_valist(const char *str, va_list args)
 {
-	if (log_syslog)
-		syslog(LOG_INFO, "%s", buf);
-	else
-		len = fwrite(buf, len, 1, f_out);
+	char buffer[1024];
+	size_t len;
+
+	len = vsnprintf(buffer, sizeof(buffer), str, args);
 
-	return len;
+	return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
 }
 
-int log_local(const char *format, ...)
+size_t log_info(const char *format, ...)
 {
 	char buffer[1024];
 	va_list args;
@@ -41,15 +41,10 @@ int log_local(const char *format, ...)
 	len = vsnprintf(buffer, sizeof(buffer), format, args);
 	va_end(args);
 
-	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));
 }
 
-int log_info(const char *format, ...)
+size_t __log_buf(struct buf_output *buf, const char *format, ...)
 {
 	char buffer[1024];
 	va_list args;
@@ -59,16 +54,18 @@ int log_info(const char *format, ...)
 	len = vsnprintf(buffer, sizeof(buffer), format, args);
 	va_end(args);
 
-	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 buf_output_add(buf, buffer, min(len, sizeof(buffer) - 1));
+}
+
+int log_info_flush(void)
+{
+	if (is_backend || log_syslog)
+		return 0;
+
+	return fflush(f_out);
 }
 
-int log_err(const char *format, ...)
+size_t log_err(const char *format, ...)
 {
 	char buffer[1024];
 	va_list args;
@@ -77,10 +74,15 @@ int log_err(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_ERR, buffer, len);
-	else if (log_syslog) {
+	if (is_backend) {
+		size_t ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+		if (ret != -1)
+			return ret;
+	}
+
+	if (log_syslog) {
 		syslog(LOG_INFO, "%s", buffer);
 		return len;
 	} else {
@@ -93,3 +95,14 @@ int log_err(const char *format, ...)
 		return fwrite(buffer, len, 1, f_err);
 	}
 }
+
+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];
+}