X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=684ff5e5f4f9af9852c35e32d7182005c0985a38;hp=5837d1cc33184b34398f94a29775224e0d38e469;hb=c66f2a27dd7d3394775f4a9a942c899c973c3b42;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76

diff --git a/src/common/error.h b/src/common/error.h
index 5837d1cc3..684ff5e5f 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -20,19 +20,37 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
+#include <urcu/tls-compat.h>
+#include <time.h>
 
 #ifndef _GNU_SOURCE
 #error "lttng-tools error.h needs _GNU_SOURCE"
 #endif
 
+#include <lttng/lttng-error.h>
+#include <common/compat/tid.h>
+
 /* Stringify the expansion of a define */
 #define XSTR(d) STR(d)
 #define STR(s) #s
 
+/*
+ * Contains the string of the log entry time. This is used as a thread local
+ * storage so we don't race between thread and also avoid memory allocation
+ * every time a log is fired.
+ */
+struct log_time {
+	/* Format: 00:00:00.000000 plus NULL byte. */
+	char str[16];
+};
+extern DECLARE_URCU_TLS(struct log_time, error_log_time);
+
 extern int lttng_opt_quiet;
 extern int lttng_opt_verbose;
 
+/* Error type. */
 #define PRINT_ERR   0x1
 #define PRINT_WARN  0x2
 #define PRINT_BUG   0x3
@@ -62,26 +80,27 @@ extern int lttng_opt_verbose;
 		}                                                           \
 	} 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 MSG(fmt, args...) \
 	__lttng_print(PRINT_MSG, fmt "\n", ## args)
+#define _MSG(fmt, args...) \
+	__lttng_print(PRINT_MSG, fmt, ## args)
 #define ERR(fmt, args...) \
 	__lttng_print(PRINT_ERR, "Error: " fmt "\n", ## args)
 #define WARN(fmt, args...) \
-	__lttng_print(PRINT_WARN, "Warning: " fmt "\n", ## args)
-#define BUG(fmt, args...) \
-	__lttng_print(PRINT_BUG, "BUG: " fmt "\n", ## args)
+	__lttng_print(PRINT_ERR, "Warning: " fmt "\n", ## args)
 
-/* Three level of debug. Use -v, -vv or -vvv for the levels */
-#define DBG(fmt, args...) __lttng_print(PRINT_DBG, "DEBUG1: " fmt \
-		" [in %s() at " __FILE__ ":" XSTR(__LINE__) "]\n", ## args, __func__)
-#define DBG2(fmt, args...) __lttng_print(PRINT_DBG2, "DEBUG2: " fmt \
-		" [in %s() at " __FILE__ ":" XSTR(__LINE__) "]\n", ## args, __func__)
-#define DBG3(fmt, args...) __lttng_print(PRINT_DBG3, "DEBUG3: " fmt \
-		" [in %s() at " __FILE__ ":" XSTR(__LINE__) "]\n", ## args, __func__)
+#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 _PERROR(fmt, args...) \
-	__lttng_print(PRINT_ERR, "PERROR: " fmt \
-		" [in %s() at " __FILE__ ":" XSTR(__LINE__) "]\n", ## args, __func__)
+#define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args)
 
 #if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
 
@@ -107,4 +126,13 @@ extern int lttng_opt_verbose;
 	} while(0);
 #endif
 
+const char *error_get_str(int32_t code);
+
+/*
+ * Function that format the time and return the reference of log_time.str to
+ * the caller. On error, an empty string is returned thus no time will be
+ * printed in the log.
+ */
+const char *log_add_time();
+
 #endif /* _ERROR_H */