usterr: improve error reporting primitives

diff --git a/share/usterr.h b/share/usterr.h
index 93333e557ca6edca06d4975ad9694aeeacf1495b..a1a9dac2714fc97d0c75418bfa3035cb1ba339df 100644 (file)
--- a/share/usterr.h
+++ b/share/usterr.h
@@ -2,6 +2,9 @@
 #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
@@ -14,22 +17,24 @@
 
 #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 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)); \
-               fprintf(stderr, UST_STR_COMPONENT ": Error: " call ": %s\n", ## args, buf); fflush(stderr); \
+               ERRMSG("Error: " call ": %s", ## args, buf); \
        } while(0);
 #else
 #define PERROR(call, args...)\
@@ -37,7 +42,7 @@
                char *buf; \
                char tmp[200]; \
                buf = strerror_r(errno, tmp, sizeof(tmp)); \
-               fprintf(stderr, UST_STR_COMPONENT ": Error: " call ": %s\n", ## args, buf); fflush(stderr); \
+               ERRMSG("Error: " call ": %s", ## args, buf); \
        } while(0);
 #endif