Don't setup output buffers we are not going to use

[fio.git] / log.c

diff --git a/log.c b/log.c
index ec3ebce49e2065423c7ebefa54bc28b4dd7a25f7..e3ca29cd2c388f1c861e1663599f39acebad650c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -6,13 +6,16 @@
 
 #include "fio.h"
 
-int log_valist(const char *str, va_list args)
+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
@@ -21,7 +24,17 @@ int log_valist(const char *str, va_list args)
        return len;
 }
 
-int log_local(const char *format, ...)
+size_t 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;
+}
+
+size_t log_info(const char *format, ...)
 {
        char buffer[1024];
        va_list args;
@@ -30,16 +43,18 @@ 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)
+       if (is_backend)
+               return fio_server_text_output(FIO_LOG_INFO, buffer, len);
+       else if (log_syslog) {
                syslog(LOG_INFO, "%s", buffer);
-       else
-               len = fwrite(buffer, len, 1, f_out);
-
-       return len;
+               return len;
+       } else
+               return fwrite(buffer, len, 1, f_out);
 }
 
-int log_info(const char *format, ...)
+size_t __log_buf(struct buf_output *buf, const char *format, ...)
 {
        char buffer[1024];
        va_list args;
@@ -48,14 +63,20 @@ 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 fwrite(buffer, len, 1, f_out);
+       return buf_output_add(buf, buffer, len);
+}
+
+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;
@@ -64,13 +85,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];
+}