X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=debug.h;h=8a8cf8710e04fd70365925b90ec4cf6081ddecae;hb=ab5643cb04dac549b2202231d5c6e33339b7fe7d;hp=71b346d8d41bc716dfd59b3d1e1887cdcbebe89a;hpb=79d16311c8d0c7188d73df77838fb1b4b6ff58db;p=fio.git

diff --git a/debug.h b/debug.h
index 71b346d8..8a8cf871 100644
--- a/debug.h
+++ b/debug.h
@@ -1,8 +1,7 @@
 #ifndef FIO_DEBUG_H
 #define FIO_DEBUG_H
 
-#include <assert.h>
-#include "log.h"
+#include "lib/types.h"
 
 enum {
 	FD_PROCESS	= 0,
@@ -17,38 +16,59 @@ enum {
 	FD_JOB,
 	FD_MUTEX,
 	FD_PROFILE,
+	FD_TIME,
+	FD_NET,
+	FD_RATE,
+	FD_COMPRESS,
+	FD_STEADYSTATE,
+	FD_HELPERTHREAD,
 	FD_DEBUG_MAX,
 };
 
-extern unsigned int fio_debug_jobno, *fio_debug_jobp;
+extern unsigned int fio_debug_jobno, *fio_debug_jobp, *fio_warned;
+
+static inline bool fio_did_warn(unsigned int mask)
+{
+	if (*fio_warned & mask)
+		return true;
+
+	*fio_warned |= mask;
+	return false;
+}
+
+enum {
+	FIO_WARN_ROOT_FLUSH	= 1,
+	FIO_WARN_VERIFY_BUF	= 2,
+	FIO_WARN_ZONED_BUG	= 4,
+	FIO_WARN_IOLOG_DROP	= 8,
+	FIO_WARN_FADVISE	= 16,
+};
 
 #ifdef FIO_INC_DEBUG
 struct debug_level {
 	const char *name;
+	const char *help;
 	unsigned long shift;
 	unsigned int jobno;
 };
-extern struct debug_level debug_levels[];
+extern const struct debug_level debug_levels[];
 
 extern unsigned long fio_debug;
 
-#define dprint(type, str, args...)				\
-	do {							\
-		pid_t pid = getpid();				\
-		assert(type < FD_DEBUG_MAX);			\
-		if ((((1 << type)) & fio_debug) == 0)		\
-			break;					\
-		if (fio_debug_jobp && *fio_debug_jobp != -1U	\
-		    && pid != *fio_debug_jobp)			\
-			break;					\
-		log_info("%-8s ", debug_levels[(type)].name);	\
-		log_info("%-5u ", (int) pid);			\
-		log_info(str, ##args);				\
-	} while (0)
+void __dprint(int type, const char *str, ...) __attribute__((format (printf, 2, 3)));
+
+#define dprint(type, str, args...)			\
+	do {						\
+		if (((1 << type) & fio_debug) == 0)	\
+			break;				\
+		__dprint((type), (str), ##args);	\
+	} while (0)					\
 
 #else
 
-#define dprint(type, str, args...)
+static inline void dprint(int type, const char *str, ...)
+{
+}
 #endif
 
 #endif