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

diff --git a/src/common/error.h b/src/common/error.h
index f8c0a1d06..9c9d2a7b1 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"
@@ -30,47 +32,69 @@
 #include <lttng/lttng-error.h>
 #include <common/compat/tid.h>
 
+/* Avoid conflict with Solaris <sys/regset.h> */
+#if defined(ERR) && defined(__sun__)
+#undef ERR
+#endif
+
 /* 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;
+extern int lttng_opt_mi;
 
 /* Error type. */
-#define PRINT_ERR   0x1
-#define PRINT_WARN  0x2
-#define PRINT_BUG   0x3
-#define PRINT_MSG   0x4
-#define PRINT_DBG   0x10
-#define PRINT_DBG2  0x20
-#define PRINT_DBG3  0x30
+#define PRINT_ERR   (1 << 0)
+#define PRINT_WARN  (1 << 1)
+#define PRINT_BUG   (1 << 2)
+#define PRINT_MSG   (1 << 3)
+#define PRINT_DBG   (1 << 4)
+#define PRINT_DBG2  (1 << 5)
+#define PRINT_DBG3  (1 << 6)
 
 /*
  * 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) {            \
-			fprintf(stdout, fmt, ## args);                          \
-		} else if (lttng_opt_quiet == 0 &&                          \
-				(((type & PRINT_DBG) && lttng_opt_verbose == 1) ||  \
-				((type & (PRINT_DBG | PRINT_DBG2)) &&               \
-					lttng_opt_verbose == 2) ||                      \
-				((type & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) &&  \
-					lttng_opt_verbose == 3))) {                     \
-			fprintf(stderr, fmt, ## args);                          \
-		} else if (lttng_opt_quiet == 0 && (type & (PRINT_WARN))) { \
-			fprintf(stderr, fmt, ## args);                          \
-		} else if (type & (PRINT_ERR | PRINT_BUG)) {                \
-			fprintf(stderr, fmt, ## args);                          \
-		}                                                           \
+#define __lttng_print(type, fmt, args...)                                          \
+	do {                                                                       \
+		if (!lttng_opt_quiet && !lttng_opt_mi &&                           \
+				(type) == PRINT_MSG) {                             \
+			fprintf(stdout, fmt, ## args);                             \
+		} else if (!lttng_opt_quiet && !lttng_opt_mi &&                    \
+				((((type) & PRINT_DBG) && lttng_opt_verbose == 1) || \
+				(((type) & (PRINT_DBG | PRINT_DBG2)) &&            \
+					lttng_opt_verbose == 2) ||                 \
+				(((type) & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) && \
+					lttng_opt_verbose == 3))) {                \
+			fprintf(stderr, fmt, ## args);                             \
+		} else if (!lttng_opt_quiet &&                                     \
+				((type) & (PRINT_WARN | PRINT_ERR | PRINT_BUG))) { \
+			fprintf(stderr, fmt, ## args);                             \
+		}                                                                  \
 	} while (0);
 
 /* 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)
@@ -86,6 +110,34 @@ extern int lttng_opt_verbose;
 #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 +167,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 */