X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=c4a3b52075367919b191219f84d14a9b46936338;hp=ec3ebce49e2065423c7ebefa54bc28b4dd7a25f7;hb=9142eb54f7ab1428ecc6b2af99154b877892cca6;hpb=734f38cb03e03390cddfd2d31cdbbd3f3d7f9e7f

diff --git a/log.c b/log.c
index ec3ebce4..c4a3b520 100644
--- a/log.c
+++ b/log.c
@@ -12,7 +12,10 @@ int log_valist(const char *str, va_list args)
 	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
@@ -21,20 +24,12 @@ int log_valist(const char *str, va_list args)
 	return len;
 }
 
-int log_local(const char *format, ...)
+int log_local_buf(const char *buf, size_t len)
 {
-	char buffer[1024];
-	va_list args;
-	size_t len;
-
-	va_start(args, format);
-	len = vsnprintf(buffer, sizeof(buffer), format, args);
-	va_end(args);
-
 	if (log_syslog)
-		syslog(LOG_INFO, "%s", buffer);
+		syslog(LOG_INFO, "%s", buf);
 	else
-		len = fwrite(buffer, len, 1, f_out);
+		len = fwrite(buf, len, 1, f_out);
 
 	return len;
 }
@@ -48,13 +43,25 @@ int 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(buffer, len);
-	else
+		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);
 }
 
+int log_info_flush(void)
+{
+	if (is_backend || log_syslog)
+		return 0;
+
+	return fflush(f_out);
+}
+
 int log_err(const char *format, ...)
 {
 	char buffer[1024];
@@ -64,13 +71,31 @@ 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(buffer, len);
-	else {
-		if (f_err != stderr)
-			fwrite(buffer, len, 1, stderr);
+		return fio_server_text_output(FIO_LOG_ERR, buffer, len);
+	else if (log_syslog) {
+		syslog(LOG_INFO, "%s", buffer);
+		return len;
+	} else {
+		if (f_err != stderr) {
+			int fio_unused ret;
+
+			ret = fwrite(buffer, len, 1, stderr);
+		}
 
 		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];
+}