X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=ea00ea5f96f7b81eb5bfb045e9ae893e5303644d;hp=0fbd3a2ed8ae19e8bc5db51a6275729eb8ab04ae;hb=f5fb86c1254b785eee8caf87cb996d33eda0ede9;hpb=ce69c47f5fb8cef80cf7ae8e766e4db354598e6d

diff --git a/src/common/error.h b/src/common/error.h
index 0fbd3a2ed..ea00ea5f9 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _ERROR_H
@@ -24,7 +14,9 @@
 #include <string.h>
 #include <stdbool.h>
 #include <urcu/tls-compat.h>
-#include <time.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"
@@ -48,10 +40,11 @@
  * every time a log is fired.
  */
 struct log_time {
-	/* Format: 00:00:00.000000 plus NULL byte. */
-	char str[16];
+	/* Format: 00:00:00.000000000 plus NULL byte. */
+	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;
@@ -149,9 +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) 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...)                          \
+	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)
@@ -164,9 +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 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,7 +227,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
 
 #define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args)
 
-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
 
 /*
  * Version using XSI strerror_r.
@@ -229,6 +258,10 @@ const char *error_get_str(int32_t code);
  * the caller. On error, an empty string is returned thus no time will be
  * printed in the log.
  */
-const char *log_add_time();
+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 */