X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.hpp;h=885902bb9d19f7be22779f5c58f76f6302f7f2c7;hb=28f23191dcbf047429d51950a337a57d7a3f866a;hp=390c4dccc1ada97dbbe8e6b886791366eac0ddc1;hpb=f250b40e2179eccdb83766bf4abef5a35036c47b;p=lttng-tools.git diff --git a/src/common/error.hpp b/src/common/error.hpp index 390c4dccc..885902bb9 100644 --- a/src/common/error.hpp +++ b/src/common/error.hpp @@ -24,9 +24,10 @@ #error "lttng-tools error.h needs _GNU_SOURCE" #endif -#include #include +#include + /* Avoid conflict with Solaris */ #if defined(ERR) && defined(__sun__) #undef ERR @@ -34,7 +35,7 @@ /* Stringify the expansion of a define */ #define XSTR(d) STR(d) -#define STR(s) #s +#define STR(s) #s /* * Contains the string of the log entry time. This is used as a thread local @@ -45,7 +46,7 @@ struct log_time { /* Format: 00:00:00.000000000 plus NULL byte. */ char str[19]; }; -extern LTTNG_EXPORT DECLARE_URCU_TLS(struct log_time, error_log_time); +extern LTTNG_EXPORT DECLARE_URCU_TLS(struct log_time, error_log_time); extern DECLARE_URCU_TLS(const char *, logger_thread_name); extern int lttng_opt_quiet; @@ -54,13 +55,13 @@ extern int lttng_opt_mi; /* Error type. */ enum lttng_error_level { - PRINT_ERR = 0, - PRINT_BUG = 1, - PRINT_WARN = 2, - PRINT_MSG = 3, - PRINT_DBG = 4, - PRINT_DBG2 = 5, - PRINT_DBG3 = 6, + PRINT_ERR = 0, + PRINT_BUG = 1, + PRINT_WARN = 2, + PRINT_MSG = 3, + PRINT_DBG = 4, + PRINT_DBG2 = 5, + PRINT_DBG3 = 6, }; static inline bool __lttng_print_check_opt(enum lttng_error_level type) @@ -135,101 +136,99 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type) * 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_print_check_opt(type)) { \ - fprintf((type) == PRINT_MSG ? stdout : stderr, fmt, ## args); \ - } \ - __lttng_print_check_abort(type); \ +#define __lttng_print(type, fmt, args...) \ + do { \ + if (__lttng_print_check_opt(type)) { \ + fprintf((type) == PRINT_MSG ? stdout : stderr, fmt, ##args); \ + } \ + __lttng_print_check_abort(type); \ } while (0) /* Three level of debug. Use -v, -vv or -vvv for the levels */ -#define _ERRMSG(msg, type, fmt, args...) \ - do { \ - if (caa_unlikely(__lttng_print_check_opt(type))) { \ - char generic_name[MAX_INT_DEC_LEN(long) + \ - MAX_INT_DEC_LEN(long)]; \ - \ - snprintf(generic_name, sizeof(generic_name), \ - "%ld/%ld", (long) getpid(), \ - (long) lttng_gettid()); \ - \ - __lttng_print(type, \ - msg " - %s [%s]: " fmt \ - " (in %s() at " __FILE__ \ - ":" XSTR(__LINE__) ")\n", \ - log_add_time(), \ - URCU_TLS(logger_thread_name) ?: \ - generic_name, \ - ##args, __func__); \ - } \ +#define _ERRMSG(msg, type, fmt, args...) \ + do { \ + if (caa_unlikely(__lttng_print_check_opt(type))) { \ + char generic_name[MAX_INT_DEC_LEN(long) + MAX_INT_DEC_LEN(long)]; \ + \ + snprintf(generic_name, \ + sizeof(generic_name), \ + "%ld/%ld", \ + (long) getpid(), \ + (long) lttng_gettid()); \ + \ + __lttng_print(type, \ + msg " - %s [%s]: " fmt " (in %s() at " __FILE__ \ + ":" XSTR(__LINE__) ")\n", \ + log_add_time(), \ + URCU_TLS(logger_thread_name) ?: generic_name, \ + ##args, \ + __func__); \ + } \ } while (0) -#define _ERRMSG_NO_LOC(msg, type, fmt, args...) \ - do { \ - if (caa_unlikely(__lttng_print_check_opt(type))) { \ - char generic_name[MAX_INT_DEC_LEN(long) + \ - MAX_INT_DEC_LEN(long)]; \ - \ - snprintf(generic_name, sizeof(generic_name), \ - "%ld/%ld", (long) getpid(), \ - (long) lttng_gettid()); \ - \ - __lttng_print(type, msg " - %s [%s]: " fmt "\n", \ - log_add_time(), \ - URCU_TLS(logger_thread_name) ?: \ - generic_name, \ - ##args); \ - } \ +#define _ERRMSG_NO_LOC(msg, type, fmt, args...) \ + do { \ + if (caa_unlikely(__lttng_print_check_opt(type))) { \ + char generic_name[MAX_INT_DEC_LEN(long) + MAX_INT_DEC_LEN(long)]; \ + \ + snprintf(generic_name, \ + sizeof(generic_name), \ + "%ld/%ld", \ + (long) getpid(), \ + (long) lttng_gettid()); \ + \ + __lttng_print(type, \ + msg " - %s [%s]: " fmt "\n", \ + log_add_time(), \ + URCU_TLS(logger_thread_name) ?: generic_name, \ + ##args); \ + } \ } while (0) -#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 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...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args) +#define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ##args) -#define DBG(fmt, args...) _ERRMSG("DBG1", PRINT_DBG, fmt, ## args) -#define DBG_NO_LOC(fmt, args...) _ERRMSG_NO_LOC("DBG1", PRINT_DBG, fmt, ## args) -#define DBG2(fmt, args...) _ERRMSG("DBG2", PRINT_DBG2, fmt, ## args) -#define DBG3(fmt, args...) _ERRMSG("DBG3", 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: \ - abort(); \ - } \ - } while(0); +#define DBG(fmt, args...) _ERRMSG("DBG1", PRINT_DBG, fmt, ##args) +#define DBG_NO_LOC(fmt, args...) _ERRMSG_NO_LOC("DBG1", PRINT_DBG, fmt, ##args) +#define DBG2(fmt, args...) _ERRMSG("DBG2", PRINT_DBG2, fmt, ##args) +#define DBG3(fmt, args...) _ERRMSG("DBG3", 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: \ + abort(); \ + } \ + } while (0); -#define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args) +#define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ##args) -#if !defined(__GLIBC__) || ((_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. @@ -244,13 +243,12 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type) /* * Version using GNU strerror_r, for linux with appropriate defines. */ -#define PERROR(call, args...) \ - do { \ - char *_perror_buf; \ - char _perror_tmp[200]; \ - _perror_buf = strerror_r( \ - errno, _perror_tmp, sizeof(_perror_tmp)); \ - _PERROR(call ": %s", ##args, _perror_buf); \ +#define PERROR(call, args...) \ + do { \ + char *_perror_buf; \ + char _perror_tmp[200]; \ + _perror_buf = strerror_r(errno, _perror_tmp, sizeof(_perror_tmp)); \ + _PERROR(call ": %s", ##args, _perror_buf); \ } while (0); #endif