log: fix signedness issue

[fio.git] / log.c

diff --git a/log.c b/log.c
index 4eb4af5905c40a45c8df1bd12f4bf02a99ea70a0..6c36813d4a9912b5e8742d2da55304f56b00f941 100644 (file)
--- a/log.c
+++ b/log.c
@@ -1,15 +1,21 @@
 #include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
 #include <stdarg.h>
 #include <syslog.h>
 
 #include "fio.h"
+#include "oslib/asprintf.h"
 
 size_t log_info_buf(const char *buf, size_t len)
 {
+       /*
+        * buf could be NULL (not just "").
+        */
+       if (!buf)
+               return 0;
+
        if (is_backend) {
-               size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+               ssize_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
                if (ret != -1)
                        return ret;
        }
@@ -21,40 +27,71 @@ size_t log_info_buf(const char *buf, size_t len)
                return fwrite(buf, len, 1, f_out);
 }
 
-size_t log_valist(const char *str, va_list args)
+size_t log_valist(const char *fmt, va_list args)
 {
-       char buffer[1024];
-       size_t len;
+       char *buffer;
+       int len;
+
+       len = vasprintf(&buffer, fmt, args);
+       if (len < 0)
+               return 0;
+       len = log_info_buf(buffer, len);
+       free(buffer);
 
-       len = vsnprintf(buffer, sizeof(buffer), str, args);
+       return len;
+}
 
-       return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
+/* add prefix for the specified type in front of the valist */
+void log_prevalist(int type, const char *fmt, va_list args)
+{
+       char *buf1, *buf2;
+       int len;
+       pid_t pid;
+
+       pid = gettid();
+       if (fio_debug_jobp && *fio_debug_jobp != -1U
+           && pid != *fio_debug_jobp)
+               return;
+
+       len = vasprintf(&buf1, fmt, args);
+       if (len < 0)
+               return;
+       len = asprintf(&buf2, "%-8s %-5u %s", debug_levels[type].name,
+                      (int) pid, buf1);
+       free(buf1);
+       if (len < 0)
+               return;
+       len = log_info_buf(buf2, len);
+       free(buf2);
 }
 
-size_t log_info(const char *format, ...)
+ssize_t log_info(const char *format, ...)
 {
-       char buffer[1024];
        va_list args;
-       size_t len;
+       ssize_t ret;
 
        va_start(args, format);
-       len = vsnprintf(buffer, sizeof(buffer), format, args);
+       ret = log_valist(format, args);
        va_end(args);
 
-       return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
+       return ret;
 }
 
 size_t __log_buf(struct buf_output *buf, const char *format, ...)
 {
-       char buffer[1024];
+       char *buffer;
        va_list args;
-       size_t len;
+       int len;
 
        va_start(args, format);
-       len = vsnprintf(buffer, sizeof(buffer), format, args);
+       len = vasprintf(&buffer, format, args);
        va_end(args);
+       if (len < 0)
+               return 0;
+       len = buf_output_add(buf, buffer, len);
+       free(buffer);
 
-       return buf_output_add(buf, buffer, min(len, sizeof(buffer) - 1));
+       return len;
 }
 
 int log_info_flush(void)
@@ -65,35 +102,38 @@ int log_info_flush(void)
        return fflush(f_out);
 }
 
-size_t log_err(const char *format, ...)
+ssize_t log_err(const char *format, ...)
 {
-       char buffer[1024];
+       ssize_t ret;
+       int len;
+       char *buffer;
        va_list args;
-       size_t len;
 
        va_start(args, format);
-       len = vsnprintf(buffer, sizeof(buffer), format, args);
+       len = vasprintf(&buffer, format, args);
        va_end(args);
-       len = min(len, sizeof(buffer) - 1);
+       if (len < 0)
+               return len;
 
        if (is_backend) {
-               size_t ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+               ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
                if (ret != -1)
-                       return ret;
+                       goto done;
        }
 
        if (log_syslog) {
                syslog(LOG_INFO, "%s", buffer);
-               return len;
+               ret = len;
        } else {
-               if (f_err != stderr) {
-                       int fio_unused ret;
-
+               if (f_err != stderr)
                        ret = fwrite(buffer, len, 1, stderr);
-               }
 
-               return fwrite(buffer, len, 1, f_err);
+               ret = fwrite(buffer, len, 1, f_err);
        }
+
+done:
+       free(buffer);
+       return ret;
 }
 
 const char *log_get_level(int level)