X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.h;h=b50d4484cb575f295bae3428a7e5bd94574ef750;hp=eea1129ba4ff3756fcd969545b6340e6fcc34032;hb=c0681c9d734a4d25162d1868cc3c61e9d5978c0a;hpb=03e20d687566753b90383571e5e152c5142bdffd

diff --git a/log.h b/log.h
index eea1129b..b50d4484 100644
--- a/log.h
+++ b/log.h
@@ -2,23 +2,38 @@
 #define FIO_LOG_H
 
 #include <stdio.h>
+#include <stdarg.h>
+
+#include "lib/output_buffer.h"
 
 extern FILE *f_out;
 extern FILE *f_err;
 
-/*
- * If logging output to a file, stderr should go to both stderr and f_err
- */
-#define log_err(args, ...)	do {				\
-	fprintf(f_err, args,  ##__VA_ARGS__);		\
-	if (f_err != stderr)						\
-		fprintf(stderr, args,  ##__VA_ARGS__);	\
-	} while (0)
+extern ssize_t log_err(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+extern ssize_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 void log_prevalist(int type, 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...)			\
+({							\
+	size_t __ret;					\
+	if ((buf) != NULL)				\
+		__ret = __log_buf(buf, format, ##args);	\
+	else						\
+		__ret = log_info(format, ##args);	\
+	__ret;						\
+})
 
-#define log_info(args, ...)	fprintf(f_out, args, ##__VA_ARGS__)
-#define log_valist(str, args)	vfprintf(f_out, (str), (args))
+enum {
+	FIO_LOG_DEBUG	= 1,
+	FIO_LOG_INFO	= 2,
+	FIO_LOG_ERR	= 3,
+	FIO_LOG_NR	= 4,
+};
 
-FILE *get_f_out(void);
-FILE *get_f_err(void);
+extern const char *log_get_level(int level);
 
 #endif