X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=6c239fe56e2ea2c041069490a79d3fff1d3f0284;hp=d072b00c804cb129b0b87b47410d43b75ade6499;hb=9bbd8e06acdcc06e6a6b22670c79a4da3e793f70;hpb=017429025b3f27b7fdbd931a30f310869479f66e

diff --git a/src/common/error.h b/src/common/error.h
index d072b00c8..6c239fe56 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -57,13 +57,13 @@ 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.
@@ -73,22 +73,25 @@ extern int lttng_opt_mi;
  * 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 && lttng_opt_mi == 0 &&            \
-				type == PRINT_MSG) {                                \
-			fprintf(stdout, fmt, ## args);                          \
-		} 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) ||                      \
-				((type & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) &&  \
-					lttng_opt_verbose == 3))) {                     \
-			fprintf(stderr, fmt, ## args);                          \
-		} else if (lttng_opt_quiet == 0 &&                          \
-				(type & (PRINT_WARN | 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);                             \
+		}                                                                  \
+		if ((type) & (PRINT_ERR | PRINT_BUG)) {                            \
+			lttng_abort_on_error();                                    \
+		}                                                                  \
 	} while (0);
 
 /* Three level of debug. Use -v, -vv or -vvv for the levels */
@@ -103,7 +106,7 @@ extern int lttng_opt_mi;
 #define ERR(fmt, args...) \
 	__lttng_print(PRINT_ERR, "Error: " fmt "\n", ## args)
 #define WARN(fmt, args...) \
-	__lttng_print(PRINT_ERR, "Warning: " fmt "\n", ## args)
+	__lttng_print(PRINT_WARN, "Warning: " fmt "\n", ## args)
 
 #define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args)
 
@@ -174,4 +177,6 @@ const char *error_get_str(int32_t code);
  */
 const char *log_add_time();
 
+void lttng_abort_on_error(void);
+
 #endif /* _ERROR_H */