glusterfs: update for new API

[fio.git] / log.c

diff --git a/log.c b/log.c
index f34892dc46971b233d43db7307a4dc135e521388..6c36813d4a9912b5e8742d2da55304f56b00f941 100644 (file)
--- a/log.c
+++ b/log.c
@@ -1,12 +1,10 @@
 #include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
 #include <stdarg.h>
 #include <syslog.h>
 
 #include "fio.h"
-
-#define LOG_START_SZ           512
+#include "oslib/asprintf.h"
 
 size_t log_info_buf(const char *buf, size_t len)
 {
@@ -17,7 +15,7 @@ size_t log_info_buf(const char *buf, size_t len)
                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;
        }
@@ -29,78 +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)
 {
-       size_t len, cur = LOG_START_SZ;
        char *buffer;
+       int len;
 
-       do {
-               buffer = calloc(1, cur);
-
-               len = vsnprintf(buffer, cur, str, args);
-               if (len <= cur)
-                       break;
-
-               cur = len;
-               free(buffer);
-       } while (1);
-
-       cur = log_info_buf(buffer, len);
+       len = vasprintf(&buffer, fmt, args);
+       if (len < 0)
+               return 0;
+       len = log_info_buf(buffer, len);
        free(buffer);
 
-       return cur;
+       return len;
 }
 
-size_t log_info(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 *buffer;
-       va_list args;
-
-       do {
-               buffer = calloc(1, cur);
-
-               va_start(args, format);
-               len = vsnprintf(buffer, cur, format, args);
-               va_end(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);
+}
 
-               if (len <= cur)
-                       break;
+ssize_t log_info(const char *format, ...)
+{
+       va_list args;
+       ssize_t ret;
 
-               cur = len;
-               free(buffer);
-       } while (1);
+       va_start(args, format);
+       ret = log_valist(format, args);
+       va_end(args);
 
-       cur = log_info_buf(buffer, len);
-       free(buffer);
-
-       return cur;
+       return ret;
 }
 
 size_t __log_buf(struct buf_output *buf, const char *format, ...)
 {
-       size_t len, cur = LOG_START_SZ;
        char *buffer;
        va_list args;
+       int len;
 
-       do {
-               buffer = calloc(1, cur);
-
-               va_start(args, format);
-               len = vsnprintf(buffer, cur, format, args);
-               va_end(args);
-
-               if (len <= cur)
-                       break;
-
-               cur = len;
-               free(buffer);
-       } while (1);
-
-       cur = buf_output_add(buf, buffer, len);
+       va_start(args, format);
+       len = vasprintf(&buffer, format, args);
+       va_end(args);
+       if (len < 0)
+               return 0;
+       len = buf_output_add(buf, buffer, len);
        free(buffer);
 
-       return cur;
+       return len;
 }
 
 int log_info_flush(void)
@@ -111,26 +102,18 @@ int log_info_flush(void)
        return fflush(f_out);
 }
 
-size_t log_err(const char *format, ...)
+ssize_t log_err(const char *format, ...)
 {
-       size_t ret, len, cur = LOG_START_SZ;
+       ssize_t ret;
+       int 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;
-               free(buffer);
-       } while (1);
-
+       va_start(args, format);
+       len = vasprintf(&buffer, format, args);
+       va_end(args);
+       if (len < 0)
+               return len;
 
        if (is_backend) {
                ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);