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

diff --git a/share/usterr.h b/share/usterr.h
index a96a36f..a1a9dac 100644
--- a/share/usterr.h
+++ b/share/usterr.h
@@ -1,6 +1,11 @@
 #ifndef USTERR_H
 #define USTERR_H
 
+#include <string.h>
+#include <sys/types.h>
+#include <sys/syscall.h>
+#include <errno.h>
+
 #ifndef UST_COMPONENT
 //#error UST_COMPONENT is undefined
 #define UST_COMPONENT libust
@@ -12,16 +17,34 @@
 
 #define UST_STR_COMPONENT XSTR(UST_COMPONENT)
 
+#define ERRMSG(fmt, args...) do { fprintf(stderr, UST_STR_COMPONENT "[%ld/%ld]: " fmt " (" __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args); fflush(stderr); } while(0)
+
 #define DEBUG
 #ifdef DEBUG
-# define DBG(fmt, args...) do { fprintf(stderr, UST_STR_COMPONENT ": " fmt "(" __FILE__ ":" XSTR(__LINE__) ")\n", ## args); fflush(stderr); } while(0)
+# define DBG(fmt, args...) ERRMSG(fmt, ## args)
 #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 WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
+#define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
+#define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args)
+
+#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)
+#define PERROR(call, args...)\
+	do { \
+		char buf[200] = "Error in strerror_r()"; \
+		strerror_r(errno, buf, sizeof(buf)); \
+		ERRMSG("Error: " call ": %s", ## args, buf); \
+	} while(0);
+#else
+#define PERROR(call, args...)\
+	do { \
+		char *buf; \
+		char tmp[200]; \
+		buf = strerror_r(errno, tmp, sizeof(tmp)); \
+		ERRMSG("Error: " call ": %s", ## args, buf); \
+	} while(0);
+#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)