log: fix bad < 0 check for unsigned

[fio.git] / log.c

diff --git a/log.c b/log.c
index c7856eb74f6266e364951c4320e25ee95688e2c4..a327f6aa4c0e68f9e822e349984f31c3d509d9e2 100644 (file)
--- a/log.c
+++ b/log.c
@@ -29,78 +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;
-       char *buffer;
+       va_list args;
 
        do {
-               buffer = calloc(1, cur);
+               *buffer = calloc(1, cur);
+               if (!*buffer)
+                       return 0;
+
+               va_copy(args, src_args);
+               len = vsnprintf(*buffer, cur, fmt, args);
+               va_end(args);
 
-               len = vsnprintf(buffer, cur, str, args);
                if (len < cur)
                        break;
 
                cur = len + 1;
-               free(buffer);
+               free(*buffer);
        } while (1);
 
-       cur = log_info_buf(buffer, len);
-       free(buffer);
-
-       return cur;
+       return len;
 }
 
-size_t log_info(const char *format, ...)
+/* 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)
 {
        size_t len, cur = LOG_START_SZ;
-       char *buffer;
        va_list args;
 
        do {
-               buffer = calloc(1, cur);
+               *buffer = calloc(1, cur);
+               if (!*buffer)
+                       return 0;
 
-               va_start(args, format);
-               len = vsnprintf(buffer, cur, format, args);
+               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);
+               free(*buffer);
        } while (1);
 
-       cur = log_info_buf(buffer, len);
+       return len;
+}
+
+size_t log_valist(const char *fmt, va_list args)
+{
+       char *buffer;
+       size_t len;
+
+       len = valist_to_buf(&buffer, fmt, args);
+       len = log_info_buf(buffer, len);
        free(buffer);
 
-       return cur;
+       return len;
 }
 
-size_t __log_buf(struct buf_output *buf, const char *format, ...)
+/* add prefix for the specified type in front of the valist */
+void log_prevalist(int type, const char *fmt, va_list args)
 {
-       size_t len, cur = LOG_START_SZ;
+       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, ...)
+{
        va_list args;
+       size_t ret;
 
-       do {
-               buffer = calloc(1, cur);
+       va_start(args, format);
+       ret = log_valist(format, args);
+       va_end(args);
 
-               va_start(args, format);
-               len = vsnprintf(buffer, cur, format, args);
-               va_end(args);
+       return ret;
+}
 
-               if (len < cur)
-                       break;
+size_t __log_buf(struct buf_output *buf, const char *format, ...)
+{
+       char *buffer;
+       va_list args;
+       size_t len;
 
-               cur = len + 1;
-               free(buffer);
-       } while (1);
+       va_start(args, format);
+       len = valist_to_buf(&buffer, format, args);
+       va_end(args);
 
-       cur = buf_output_add(buf, buffer, len);
+       len = buf_output_add(buf, buffer, len);
        free(buffer);
 
-       return cur;
+       return len;
 }
 
 int log_info_flush(void)
@@ -113,24 +152,13 @@ int log_info_flush(void)
 
 size_t log_err(const char *format, ...)
 {
-       size_t ret, len, cur = LOG_START_SZ;
+       size_t ret, len;
        char *buffer;
        va_list args;
 
-       do {
-               buffer = calloc(1, cur);
-
-               va_start(args, format);
-               len = vsnprintf(buffer, cur, format, args);
-               va_end(args);
-
-               if (len < cur)
-                       break;
-
-               cur = len + 1;
-               free(buffer);
-       } while (1);
-
+       va_start(args, format);
+       len = valist_to_buf(&buffer, format, args);
+       va_end(args);
 
        if (is_backend) {
                ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);