use signal safe ust_safe_snprintf()

[ust.git] / include / usterr.h

diff --git a/include/usterr.h b/include/usterr.h
index 1819f973069b99f670fd5411f6d7809c35daffee..6b8817764803f66f55bb2b19ddac83d8987f34bb 100644 (file)
--- 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"
 
@@ -22,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. */ \
@@ -31,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; \
@@ -45,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)