log: fix bad < 0 check for unsigned

[fio.git] / log.c

diff --git a/log.c b/log.c
index 172f1538c6e7366f784c374db0dcc1b3ea7b4cd6..a327f6aa4c0e68f9e822e349984f31c3d509d9e2 100644 (file)
--- a/log.c
+++ b/log.c
@@ -6,6 +6,8 @@
 
 #include "fio.h"
 
+#define LOG_START_SZ           512
+
 size_t log_info_buf(const char *buf, size_t len)
 {
        /*
@@ -27,40 +29,117 @@ 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)
+static size_t valist_to_buf(char **buffer, const char *fmt, va_list src_args)
+{
+       size_t len, cur = LOG_START_SZ;
+       va_list args;
+
+       do {
+               *buffer = calloc(1, cur);
+               if (!*buffer)
+                       return 0;
+
+               va_copy(args, src_args);
+               len = vsnprintf(*buffer, cur, fmt, args);
+               va_end(args);
+
+               if (len < cur)
+                       break;
+
+               cur = len + 1;
+               free(*buffer);
+       } while (1);
+
+       return len;
+}
+
+/* allocate buffer, fill with prefix string followed by vararg string */
+static size_t prevalist_to_buf(char **buffer, const char *pre, int prelen,
+               const char *fmt, va_list src_args)
 {
-       char buffer[1024];
+       size_t len, cur = LOG_START_SZ;
+       va_list args;
+
+       do {
+               *buffer = calloc(1, cur);
+               if (!*buffer)
+                       return 0;
+
+               va_copy(args, src_args);
+               memcpy(*buffer, pre, prelen);
+               len = prelen + vsnprintf(*buffer + prelen, cur - prelen, fmt, args);
+               va_end(args);
+
+               if (len < cur)
+                       break;
+
+               cur = len + 1;
+               free(*buffer);
+       } while (1);
+
+       return len;
+}
+
+size_t log_valist(const char *fmt, va_list args)
+{
+       char *buffer;
        size_t len;
 
-       len = vsnprintf(buffer, sizeof(buffer), str, args);
+       len = valist_to_buf(&buffer, fmt, args);
+       len = log_info_buf(buffer, len);
+       free(buffer);
+
+       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 pre[32];
+       char *buffer;
+       size_t len;
+       int prelen;
+       pid_t pid;
+
+       pid = gettid();
+       if (fio_debug_jobp && *fio_debug_jobp != -1U
+           && pid != *fio_debug_jobp)
+               return;
+
+       prelen = snprintf(pre, sizeof pre, "%-8s %-5u ", debug_levels[type].name, (int) pid);
+       if (prelen > 0) {
+               len = prevalist_to_buf(&buffer, pre, prelen, fmt, args);
+               len = log_info_buf(buffer, len);
+               free(buffer);
+       }
 }
 
 size_t log_info(const char *format, ...)
 {
-       char buffer[1024];
        va_list args;
-       size_t len;
+       size_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;
 
        va_start(args, format);
-       len = vsnprintf(buffer, sizeof(buffer), format, args);
+       len = valist_to_buf(&buffer, format, args);
        va_end(args);
 
-       return buf_output_add(buf, buffer, min(len, sizeof(buffer) - 1));
+       len = buf_output_add(buf, buffer, len);
+       free(buffer);
+
+       return len;
 }
 
 int log_info_flush(void)
@@ -73,33 +152,33 @@ int log_info_flush(void)
 
 size_t log_err(const char *format, ...)
 {
-       char buffer[1024];
+       size_t ret, len;
+       char *buffer;
        va_list args;
-       size_t len;
 
        va_start(args, format);
-       len = vsnprintf(buffer, sizeof(buffer), format, args);
+       len = valist_to_buf(&buffer, format, args);
        va_end(args);
-       len = min(len, sizeof(buffer) - 1);
 
        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)