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

diff --git a/debug.h b/debug.h
index 71b346d8..e3aa3f18 100644
--- a/debug.h
+++ b/debug.h
@@ -17,6 +17,12 @@ enum {
 	FD_JOB,
 	FD_MUTEX,
 	FD_PROFILE,
+	FD_TIME,
+	FD_NET,
+	FD_RATE,
+	FD_COMPRESS,
+	FD_STEADYSTATE,
+	FD_HELPERTHREAD,
 	FD_DEBUG_MAX,
 };
 
@@ -25,6 +31,7 @@ extern unsigned int fio_debug_jobno, *fio_debug_jobp;
 #ifdef FIO_INC_DEBUG
 struct debug_level {
 	const char *name;
+	const char *help;
 	unsigned long shift;
 	unsigned int jobno;
 };
@@ -32,23 +39,20 @@ extern 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