X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fusterr.h;h=75d507ac10825825ec931a00f561d625192d1690;hb=106e716d77762f0d27456e276be8c3df8e129eae;hp=ed6d04e87c44a52d4b9398a2c25148b10997c6c1;hpb=5a000089fda0ac1a519f79640c376ac54b6cd1c0;p=ust.git

diff --git a/include/usterr.h b/include/usterr.h
index ed6d04e..75d507a 100644
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -6,6 +6,7 @@
 #include <sys/syscall.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <stdio.h>
 
 #include "share.h"
 
@@ -45,13 +46,14 @@
 
 #define UST_STR_COMPONENT XSTR(UST_COMPONENT)
 
-#define ERRMSG(fmt, args...) do { sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (" __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args); fflush(stderr); } while(0)
+#define ERRMSG(fmt, args...) do { sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args, __func__); fflush(stderr); } while(0)
 
-/*#define DEBUG*/
-#ifdef DEBUG
+#ifdef UST_DEBUG
 # define DBG(fmt, args...) ERRMSG(fmt, ## args)
+# define DBG_raw(fmt, args...) do { sigsafe_print_err(fmt, ## args); fflush(stderr); } while(0)
 #else
 # define DBG(fmt, args...) do {} while(0)
+# define DBG_raw(fmt, args...) do {} while(0)
 #endif
 #define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
 #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)