X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fusterr.h;h=dc51d840b42879d6e8f11e1f7567a9f05dc2edad;hb=377d33ed8d03fbfd6c8655862de50d7fc213c0f4;hp=3ec7ae0dd697d1d7d6fd073d1d98762758131f92;hpb=3e43d6d37041b251cd969f9ec33271cb1c37b8a0;p=ust.git

diff --git a/include/usterr.h b/include/usterr.h
index 3ec7ae0..dc51d84 100644
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -15,8 +15,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef USTERR_H
-#define USTERR_H
+#ifndef _USTERR_H
+#define _USTERR_H
 
 #include <string.h>
 #include <sys/types.h>
@@ -30,7 +30,6 @@
 #include "share.h"
 
 #ifndef UST_COMPONENT
-//#error UST_COMPONENT is undefined
 #define UST_COMPONENT libust
 #endif
 
@@ -38,44 +37,22 @@
 #define XSTR(d) STR(d)
 #define STR(s) #s
 
-/* We sometimes print in the tracing path, and tracing can occur in
- * 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, ...)
-	__attribute__ ((format (printf, 3, 4)));
-
-#define sigsafe_print_err(fmt, args...) \
-{ \
-	/* Can't use dynamic allocation. Limit ourselves to 250 chars. */ \
-	char ____buf[250]; \
-	int ____saved_errno; \
-\
-	/* Save the errno. */ \
-	____saved_errno = errno; \
-\
-	ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
-\
-	/* Add end of string in case of buffer overflow. */ \
-	____buf[sizeof(____buf)-1] = 0; \
-\
-	patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
-	/* Can't print errors because we are in the error printing code path. */ \
-\
-	/* Restore errno, in order to be async-signal safe. */ \
-	errno = ____saved_errno; \
+/* A dummy function to force format checking */
+static inline void __attribute__ ((format (printf, 1, 2)))
+	__check_ust_safe_fmt(const char *fmt, ...)
+{
 }
 
 #define UST_STR_COMPONENT XSTR(UST_COMPONENT)
 
-#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 ERRMSG(fmt, args...) do { fprintf(stderr, UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args, __func__); } while(0)
 
 #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)
+# define DBG_raw(fmt, args...) do { fprintf(stderr, fmt, ## args); } while(0)
 #else
-# define DBG(fmt, args...) do {} while(0)
-# define DBG_raw(fmt, args...) do {} while(0)
+# define DBG(fmt, args...) __check_ust_safe_fmt(fmt, ## args)
+# define DBG_raw(fmt, args...) __check_ust_safe_fmt(fmt, ## args)
 #endif
 #define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
 #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
@@ -102,4 +79,4 @@ extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...)
 #define WARN_ON(condition) do { if (unlikely(condition)) WARN("condition not respected on line %s:%d", __FILE__, __LINE__); } while(0)
 #define WARN_ON_ONCE(condition) WARN_ON(condition)
 
-#endif /* USTERR_H */
+#endif /* _USTERR_H */