X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=4822c33526d29fd4b7d9c0731f5030c75c982909;hp=a16baafc97846f68e08b1d466eff67ed130b24ae;hb=7d1ca6cfa8c1440ddc095faf7f4e6c8716629838;hpb=1f39e5556fc0418ac6d1bd8531a91c94836a6350

diff --git a/log.c b/log.c
index a16baafc..4822c335 100644
--- a/log.c
+++ b/log.c
@@ -12,6 +12,7 @@ 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 (log_syslog)
 		syslog(LOG_INFO, "%s", buffer);
@@ -21,6 +22,16 @@ int log_valist(const char *str, va_list args)
 	return len;
 }
 
+int log_local_buf(const char *buf, size_t len)
+{
+	if (log_syslog)
+		syslog(LOG_INFO, "%s", buf);
+	else
+		len = fwrite(buf, len, 1, f_out);
+
+	return len;
+}
+
 int log_local(const char *format, ...)
 {
 	char buffer[1024];
@@ -30,6 +41,7 @@ int log_local(const char *format, ...)
 	va_start(args, format);
 	len = vsnprintf(buffer, sizeof(buffer), format, args);
 	va_end(args);
+	len = min(len, sizeof(buffer) - 1);
 
 	if (log_syslog)
 		syslog(LOG_INFO, "%s", buffer);
@@ -48,13 +60,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,10 +88,14 @@ 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 {
+		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;
 
@@ -77,3 +105,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];
+}