Add support for multiple output formats

[fio.git] / log.c

diff --git a/log.c b/log.c
index a16baafc97846f68e08b1d466eff67ed130b24ae..c4a3b52075367919b191219f84d14a9b46936338 100644 (file)
--- 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,10 +71,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 +88,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];
+}