X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=8af989e0436fd910678eb994fa7ebef48c63dd0a;hp=33a299c4e4952e3882bdbc457e0bd55c042982bc;hb=0c818c97b35a36971c326171d9aea5b0a432ced9;hpb=898ba13216992affd6cb40fe11c64bdc6e65ca9e

diff --git a/src/common/error.h b/src/common/error.h
index 33a299c4e..8af989e04 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -8,13 +8,15 @@
 #ifndef _ERROR_H
 #define _ERROR_H
 
-#include <errno.h>
+#include <common/compat/errno.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdbool.h>
 #include <urcu/tls-compat.h>
 #include <common/compat/time.h>
+#include <common/string-utils/format.h>
+#include <common/macros.h>
 
 #ifndef _GNU_SOURCE
 #error "lttng-tools error.h needs _GNU_SOURCE"
@@ -42,6 +44,7 @@ struct log_time {
 	char str[19];
 };
 extern DECLARE_URCU_TLS(struct log_time, error_log_time);
+extern DECLARE_URCU_TLS(const char *, logger_thread_name);
 
 extern int lttng_opt_quiet;
 extern int lttng_opt_verbose;
@@ -139,13 +142,44 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
 	} while (0)
 
 /* Three level of debug. Use -v, -vv or -vvv for the levels */
-#define _ERRMSG(msg, type, fmt, args...) __lttng_print(type, msg \
-		" - %s [%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", \
-			log_add_time(), (long) getpid(), (long) lttng_gettid(), ## args, __func__)
+#define _ERRMSG(msg, type, fmt, args...)                                \
+	do {                                                            \
+		if (caa_unlikely(__lttng_print_check_opt(type))) {      \
+			char generic_name[MAX_INT_DEC_LEN(long) +       \
+					  MAX_INT_DEC_LEN(long)];       \
+                                                                        \
+			snprintf(generic_name, sizeof(generic_name),    \
+					"%ld/%ld", (long) getpid(),     \
+					(long) lttng_gettid());         \
+                                                                        \
+			__lttng_print(type,                             \
+					msg " - %s [%s]: " fmt          \
+					    " (in %s() at " __FILE__    \
+					    ":" XSTR(__LINE__) ")\n",   \
+					log_add_time(),                 \
+					URCU_TLS(logger_thread_name) ?: \
+							generic_name,   \
+					##args, __func__);              \
+		}                                                       \
+	} while (0)
 
-#define _ERRMSG_NO_LOC(msg, type, fmt, args...) __lttng_print(type, msg	\
-		" - %s [%ld/%ld]: " fmt "\n", \
-			log_add_time(), (long) getpid(), (long) lttng_gettid(), ## args)
+#define _ERRMSG_NO_LOC(msg, type, fmt, args...)                          \
+	do {                                                             \
+		if (caa_unlikely(__lttng_print_check_opt(type))) {       \
+			char generic_name[MAX_INT_DEC_LEN(long) +        \
+					  MAX_INT_DEC_LEN(long)];        \
+                                                                         \
+			snprintf(generic_name, sizeof(generic_name),     \
+					"%ld/%ld", (long) getpid(),      \
+					(long) lttng_gettid());          \
+                                                                         \
+			__lttng_print(type, msg " - %s [%s]: " fmt "\n", \
+					log_add_time(),                  \
+					URCU_TLS(logger_thread_name) ?:  \
+							generic_name,    \
+					##args);                         \
+		}                                                        \
+	} while (0)
 
 #define MSG(fmt, args...) \
 	__lttng_print(PRINT_MSG, fmt "\n", ## args)
@@ -158,10 +192,10 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
 
 #define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args)
 
-#define DBG(fmt, args...) _ERRMSG("DEBUG1", PRINT_DBG, fmt, ## args)
-#define DBG_NO_LOC(fmt, args...) _ERRMSG_NO_LOC("DEBUG1", PRINT_DBG, fmt, ## args)
-#define DBG2(fmt, args...) _ERRMSG("DEBUG2", PRINT_DBG2, fmt, ## args)
-#define DBG3(fmt, args...) _ERRMSG("DEBUG3", PRINT_DBG3, fmt, ## args)
+#define DBG(fmt, args...) _ERRMSG("DBG1", PRINT_DBG, fmt, ## args)
+#define DBG_NO_LOC(fmt, args...) _ERRMSG_NO_LOC("DBG1", PRINT_DBG, fmt, ## args)
+#define DBG2(fmt, args...) _ERRMSG("DBG2", PRINT_DBG2, fmt, ## args)
+#define DBG3(fmt, args...) _ERRMSG("DBG3", PRINT_DBG3, fmt, ## args)
 #define LOG(type, fmt, args...)			\
 	do {					\
 		switch (type) {			\
@@ -198,23 +232,24 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
 /*
  * Version using XSI strerror_r.
  */
-#define PERROR(call, args...) \
-	do { \
-		char buf[200]; \
-		strerror_r(errno, buf, sizeof(buf)); \
-		_PERROR(call ": %s", ## args, buf); \
-	} while(0);
+#define PERROR(call, args...)                                        \
+	do {                                                         \
+		char _perror_buf[200];                               \
+		strerror_r(errno, _perror_buf, sizeof(_perror_buf)); \
+		_PERROR(call ": %s", ##args, _perror_buf);           \
+	} while (0);
 #else
 /*
  * Version using GNU strerror_r, for linux with appropriate defines.
  */
-#define PERROR(call, args...) \
-	do { \
-		char *buf; \
-		char tmp[200]; \
-		buf = strerror_r(errno, tmp, sizeof(tmp)); \
-		_PERROR(call ": %s", ## args, buf); \
-	} while(0);
+#define PERROR(call, args...)                                             \
+	do {                                                              \
+		char *_perror_buf;                                        \
+		char _perror_tmp[200];                                    \
+		_perror_buf = strerror_r(                                 \
+				errno, _perror_tmp, sizeof(_perror_tmp)); \
+		_PERROR(call ": %s", ##args, _perror_buf);                \
+	} while (0);
 #endif
 
 const char *error_get_str(int32_t code);
@@ -226,4 +261,8 @@ const char *error_get_str(int32_t code);
  */
 const char *log_add_time(void);
 
+/* Name must be a statically-allocated string. */
+LTTNG_HIDDEN
+void logger_set_thread_name(const char *name, bool set_pthread_name);
+
 #endif /* _ERROR_H */