X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=share%2Fusterr.h;h=a96a36f2525644456a44608dcf1529f807cfffa1;hb=f293009f641db927f1983505d46f93a2509160fc;hp=6b871ff56da4363f4bb248c5bc4919ffbc36ad65;hpb=c9b64079ec044b3004b9db71ebf9b263f7af3e97;p=lttng-ust.git

diff --git a/share/usterr.h b/share/usterr.h
index 6b871ff5..a96a36f2 100644
--- a/share/usterr.h
+++ b/share/usterr.h
@@ -1,8 +1,29 @@
-#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 PERROR(call) perror("usertrace: ERROR: " call)
+#ifndef USTERR_H
+#define USTERR_H
+
+#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: 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"); } while(0)
+#define WARN_ON(condition) do { if (unlikely(condition)) WARN("condition not respected on line %s:%d", __FILE__, __LINE__); } while(0)
 
+#endif /* USTERR_H */