X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=c90c4ae07a1902d73eb17cc1c7ae90af652fb9a8;hb=806530f232d6b76d86f6c03263ca443aa0f5a08c;hp=ad6113fa7494599cebcdb81b0a3bd7c2ef4956a0;hpb=ab530aafeeff0dc4ae4b001bb3994bfaf2d5e55f;p=lttng-tools.git

diff --git a/src/common/error.h b/src/common/error.h
index ad6113fa7..c90c4ae07 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <urcu/tls-compat.h>
-#include <time.h>
+#include <common/compat/time.h>
 
 #ifndef _GNU_SOURCE
 #error "lttng-tools error.h needs _GNU_SOURCE"
@@ -48,8 +48,8 @@
  * 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);
 
@@ -58,7 +58,7 @@ extern int lttng_opt_verbose;
 extern int lttng_opt_mi;
 
 /* Error type. */
-enum lttng_error_type {
+enum lttng_error_level {
 	PRINT_ERR =	0,
 	PRINT_BUG =	1,
 	PRINT_WARN =	2,
@@ -68,7 +68,7 @@ enum lttng_error_type {
 	PRINT_DBG3 =	6,
 };
 
-static inline bool __lttng_print_check_opt(enum lttng_error_type type)
+static inline bool __lttng_print_check_opt(enum lttng_error_level type)
 {
 	/* lttng_opt_mi and lttng_opt_quiet. */
 	switch (type) {
@@ -117,7 +117,7 @@ static inline bool __lttng_print_check_opt(enum lttng_error_type type)
 
 void lttng_abort_on_error(void);
 
-static inline void __lttng_print_check_abort(enum lttng_error_type type)
+static inline void __lttng_print_check_abort(enum lttng_error_level type)
 {
 	switch (type) {
 	case PRINT_DBG3:
@@ -153,6 +153,10 @@ static inline void __lttng_print_check_abort(enum lttng_error_type type)
 		" - %s [%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", \
 			log_add_time(), (long) getpid(), (long) gettid(), ## args, __func__)
 
+#define _ERRMSG_NO_LOC(msg, type, fmt, args...) __lttng_print(type, msg	\
+		" - %s [%ld/%ld]: " fmt "\n", \
+			log_add_time(), (long) getpid(), (long) gettid(), ## args)
+
 #define MSG(fmt, args...) \
 	__lttng_print(PRINT_MSG, fmt "\n", ## args)
 #define _MSG(fmt, args...) \
@@ -165,6 +169,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_type type)
 #define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args)
 
 #define DBG(fmt, args...) _ERRMSG("DEBUG1", PRINT_DBG, fmt, ## args)
+#define DBG_NO_LOC(fmt, args...) _ERRMSG_NO_LOC("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...)			\
@@ -198,7 +203,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_type 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.