X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=00519d840c65f20475b61c8b4ab43506728ad754;hp=f8c0a1d06198bf218687a0ed8e67f3036ecba5d5;hb=b1325effaf300e21bb804113cc202b0e42ea61da;hpb=ffe600149a7608221985751e1bf293234bf2545c

diff --git a/src/common/error.h b/src/common/error.h
index f8c0a1d06..00519d840 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -22,6 +22,8 @@
 #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"
@@ -34,8 +36,20 @@
 #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;
+extern int lttng_opt_mi;
 
 /* Error type. */
 #define PRINT_ERR   0x1
@@ -48,12 +62,18 @@ extern int lttng_opt_verbose;
 
 /*
  * Macro for printing message depending on command line option and verbosity.
+ *
+ * Machine interface:
+ * We use lttng_opt_mi to suppress all normal msg to stdout. We don't
+ * want any nested msg to show up when printing mi to stdout(if it's the case).
+ * All warnings and errors should be printed to stderr as normal.
  */
 #define __lttng_print(type, fmt, args...)                           \
 	do {                                                            \
-		if (lttng_opt_quiet == 0 && type == PRINT_MSG) {            \
+		if (lttng_opt_quiet == 0 && lttng_opt_mi == 0 &&            \
+				type == PRINT_MSG) {                                \
 			fprintf(stdout, fmt, ## args);                          \
-		} else if (lttng_opt_quiet == 0 &&                          \
+		} else if (lttng_opt_quiet == 0 && lttng_opt_mi == 0 &&     \
 				(((type & PRINT_DBG) && lttng_opt_verbose == 1) ||  \
 				((type & (PRINT_DBG | PRINT_DBG2)) &&               \
 					lttng_opt_verbose == 2) ||                      \
@@ -69,8 +89,8 @@ extern int lttng_opt_verbose;
 
 /* Three level of debug. Use -v, -vv or -vvv for the levels */
 #define _ERRMSG(msg, type, fmt, args...) __lttng_print(type, msg \
-		" [%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", \
-			(long) getpid(), (long) gettid(), ## args, __func__)
+		" - %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)
@@ -79,13 +99,41 @@ extern int lttng_opt_verbose;
 #define ERR(fmt, args...) \
 	__lttng_print(PRINT_ERR, "Error: " fmt "\n", ## args)
 #define WARN(fmt, args...) \
-	__lttng_print(PRINT_WARN, "Warning: " fmt "\n", ## args)
+	__lttng_print(PRINT_ERR, "Warning: " fmt "\n", ## args)
 
 #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 LOG(type, fmt, args...)			\
+	do {					\
+		switch (type) {			\
+		case PRINT_ERR:			\
+			ERR(fmt, ## args);	\
+			break;			\
+		case PRINT_WARN:		\
+			WARN(fmt, ## args);	\
+			break;			\
+		case PRINT_BUG:			\
+			BUG(fmt, ## args);	\
+			break;			\
+		case PRINT_MSG:			\
+			MSG(fmt, ## args);	\
+			break;			\
+		case PRINT_DBG:			\
+			DBG(fmt, ## args);	\
+			break;			\
+		case PRINT_DBG2:		\
+			DBG2(fmt, ## args);	\
+			break;			\
+		case PRINT_DBG3:		\
+			DBG3(fmt, ## args);	\
+			break;			\
+		default:			\
+			assert(0);		\
+		}				\
+	} while(0);
 
 #define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args)
 
@@ -115,4 +163,11 @@ extern int lttng_opt_verbose;
 
 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 */