X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.h;h=a39dea61893194e7a45740e653dc1e57a39181de;hp=a885be7253628e28950115944cca2d937be653c7;hb=201ab6433e75875ec50c32d55b65ec503613e47f;hpb=fdd5f15f8231e8c91c4deff22e630a34addd0fef diff --git a/log.h b/log.h index a885be72..a39dea61 100644 --- a/log.h +++ b/log.h @@ -4,16 +4,26 @@ #include #include +#include "lib/output_buffer.h" + extern FILE *f_out; extern FILE *f_err; -extern int log_err(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); -extern int log_info(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); -extern int log_local(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); -extern int log_valist(const char *str, va_list); -extern int log_local_buf(const char *buf, size_t); +extern size_t log_err(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); +extern size_t log_info(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); +extern size_t __log_buf(struct buf_output *, const char *format, ...) __attribute__ ((__format__ (__printf__, 2, 3))); +extern size_t log_valist(const char *str, va_list); +extern size_t log_info_buf(const char *buf, size_t len); extern int log_info_flush(void); +#define log_buf(buf, format, args...) \ +do { \ + if ((buf) != NULL) \ + __log_buf(buf, format, ##args); \ + else \ + log_info(format, ##args); \ +} while (0) + enum { FIO_LOG_DEBUG = 1, FIO_LOG_INFO = 2,