X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=share%2Fusterr.h;h=6a3e2a332fa7f4cbe05184bdaf38a01e491c88e9;hb=3158b808d3a8c45995ac7a40b022f9d569290b49;hp=366718da7682b2c758bea859160f352069186a9a;hpb=ba6459ba344b54a4f7775e431447be79fd7790f8;p=lttng-ust.git

diff --git a/share/usterr.h b/share/usterr.h
index 366718da..6a3e2a33 100644
--- a/share/usterr.h
+++ b/share/usterr.h
@@ -1,11 +1,27 @@
 #ifndef USTERR_H
 #define USTERR_H
 
-#define DBG(fmt, args...) fprintf(stderr, fmt "\n", ## args)
-#define WARN(fmt, args...) fprintf(stderr, "usertrace: WARNING: " fmt "\n", ## args)
-#define ERR(fmt, args...) fprintf(stderr, "usertrace: ERROR: " fmt "\n", ## args)
-#define BUG(fmt, args...) fprintf(stderr, "usertrace: BUG: " fmt "\n", ## args)
-#define PERROR(call) perror("usertrace: ERROR: " call)
+#ifndef UST_COMPONENT
+//#error UST_COMPONENT is undefined
+#define UST_COMPONENT libust
+#endif
+
+/* To stringify the expansion of a define */
+#define XSTR(d) STR(d)
+#define STR(s) #s
+
+#define UST_STR_COMPONENT XSTR(UST_COMPONENT)
+
+#define DEBUG
+#ifdef DEBUG
+# define DBG(fmt, args...) do { fprintf(stderr, UST_STR_COMPONENT ": " fmt "(" __FILE__ ":" XSTR(__LINE__) ")\n", ## args); fflush(stderr); } while(0)
+#else
+# define DBG(fmt, args...) do {} while(0)
+#endif
+#define WARN(fmt, args...) fprintf(stderr, UST_STR_COMPONENT ": Warning: " fmt "\n", ## args); fflush(stderr)
+#define ERR(fmt, args...) fprintf(stderr, UST_STR_COMPONENT ": Error: " fmt "\n", ## args); fflush(stderr)
+#define BUG(fmt, args...) fprintf(stderr, UST_STR_COMPONENT ": BUG: " fmt "\n", ## args); fflush(stderr)
+#define PERROR(call) perror(UST_STR_COMPONENT ": Error: " call)
 
 #define BUG_ON(condition) do { if (unlikely(condition)) ERR("condition not respected (BUG)"); } while(0)
 #define WARN_ON(condition) do { if (unlikely(condition)) WARN("condition not respected on line %s:%d", __FILE__, __LINE__); } while(0)