X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=share%2Fusterr.h;h=a96a36f2525644456a44608dcf1529f807cfffa1;hb=2028e7fd97170e430b55b8c0e1a6ca1edca7680c;hp=83b3222c72ce4a9031d525389f94670c5375f697;hpb=a584bc4edb73e3f4c0023c42f2fdbc816fb6eab0;p=ust.git

diff --git a/share/usterr.h b/share/usterr.h
index 83b3222..a96a36f 100644
--- a/share/usterr.h
+++ b/share/usterr.h
@@ -1,16 +1,29 @@
 #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
 
-#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)
+/* To stringify the expansion of a define */
+#define XSTR(d) STR(d)
+#define STR(s) #s
+
+#define UST_STR_COMPONENT XSTR(UST_COMPONENT)
 
-#define CPRINTF(fmt, args...) safe_printf(fmt "\n", ## args)
+#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 on line %s:%d", __FILE__, __LINE__); } while(0)
 
 #endif /* USTERR_H */