X-Git-Url: https://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=include%2Fusterr.h;h=6b8817764803f66f55bb2b19ddac83d8987f34bb;hp=a32b0b6603d66a347409bcbd66bcbc96961182df;hb=bf0d695d692163edb23b8fbbbd976387dfef232d;hpb=c1f205309da615f1f0c68beedf37365942246537

diff --git a/include/usterr.h b/include/usterr.h
index a32b0b6..6b88177 100644
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -23,6 +23,8 @@
  * signal handlers, so we must use a print method which is signal safe.
  */
 
+extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...);
+
 #define sigsafe_print_err(fmt, args...) \
 { \
 	/* Can't use dynamic allocation. Limit ourselves to 250 chars. */ \
@@ -32,7 +34,7 @@
 	/* Save the errno. */ \
 	____saved_errno = errno; \
 \
-	snprintf(____buf, sizeof(____buf), fmt, ## args); \
+	ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
 \
 	/* Add end of string in case of buffer overflow. */ \
 	____buf[sizeof(____buf)-1] = 0; \
@@ -46,13 +48,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)