tests: Make test_per_application_leaks more robust

[lttng-tools.git] / src / common / error.hpp

diff --git a/src/common/error.hpp b/src/common/error.hpp
index 5935cf1515228cfafa3318bd52b9fa740c032b98..66f38bf2eca36e7e9356d9eb3fb837e6db4873bb 100644 (file)
--- a/src/common/error.hpp
+++ b/src/common/error.hpp
@@ -226,6 +226,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
        } while (0);
 
 #define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ##args)
        } while (0);
 
 #define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ##args)

+#define _PWARN(fmt, args...)  _ERRMSG("PWARN", PRINT_WARN, 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))


@@ -239,6 +240,13 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
                strerror_r(errno, _perror_buf, sizeof(_perror_buf)); \
                _PERROR(call ": %s", ##args, _perror_buf);           \
        } while (0);
                strerror_r(errno, _perror_buf, sizeof(_perror_buf)); \
                _PERROR(call ": %s", ##args, _perror_buf);           \
        } while (0);

+
+#define PWARN(call, args...)                                         \
+       do {                                                         \
+               char _perror_buf[200];                               \
+               strerror_r(errno, _perror_buf, sizeof(_perror_buf)); \
+               _PWARN(call ": %s", ##args, _perror_buf);            \
+       } while (0);

 #else
 /*
  * Version using GNU strerror_r, for linux with appropriate defines.
 #else
 /*
  * Version using GNU strerror_r, for linux with appropriate defines.


@@ -250,6 +258,13 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
                _perror_buf = strerror_r(errno, _perror_tmp, sizeof(_perror_tmp)); \
                _PERROR(call ": %s", ##args, _perror_buf);                         \
        } while (0);
                _perror_buf = strerror_r(errno, _perror_tmp, sizeof(_perror_tmp)); \
                _PERROR(call ": %s", ##args, _perror_buf);                         \
        } while (0);

+#define PWARN(call, args...)                                                       \
+       do {                                                                       \
+               char *_perror_buf;                                                 \
+               char _perror_tmp[200];                                             \
+               _perror_buf = strerror_r(errno, _perror_tmp, sizeof(_perror_tmp)); \
+               _PWARN(call ": %s", ##args, _perror_buf);                          \
+       } while (0);

 #endif
 
 const char *error_get_str(int32_t code);
 #endif
 
 const char *error_get_str(int32_t code);


@@ -266,7 +281,7 @@ namespace details {
 #define DBG_FMT(format_str, args...)                                                              \
        do {                                                                                      \
                try {                                                                             \
 #define DBG_FMT(format_str, args...)                                                              \
        do {                                                                                      \
                try {                                                                             \

-                       DBG("%s", fmt::format(format_str, ##args).c_str());                       \
+                       DBG("%s", lttng::format(format_str, ##args).c_str());                     \

                } catch (const std::exception& _formatting_exception) {                           \
                        lttng::logging::details::die_formatting_exception(format_str,             \
                                                                          _formatting_exception); \
                } catch (const std::exception& _formatting_exception) {                           \
                        lttng::logging::details::die_formatting_exception(format_str,             \
                                                                          _formatting_exception); \


@@ -276,7 +291,7 @@ namespace details {
 #define WARN_FMT(format_str, args...)                                                             \
        do {                                                                                      \
                try {                                                                             \
 #define WARN_FMT(format_str, args...)                                                             \
        do {                                                                                      \
                try {                                                                             \

-                       WARN("%s", fmt::format(format_str, ##args).c_str());                      \
+                       WARN("%s", lttng::format(format_str, ##args).c_str());                    \

                } catch (const std::exception& _formatting_exception) {                           \
                        lttng::logging::details::die_formatting_exception(format_str,             \
                                                                          _formatting_exception); \
                } catch (const std::exception& _formatting_exception) {                           \
                        lttng::logging::details::die_formatting_exception(format_str,             \
                                                                          _formatting_exception); \


@@ -286,7 +301,7 @@ namespace details {
 #define ERR_FMT(format_str, args...)                                                              \
        do {                                                                                      \
                try {                                                                             \
 #define ERR_FMT(format_str, args...)                                                              \
        do {                                                                                      \
                try {                                                                             \

-                       ERR("%s", fmt::format(format_str, ##args).c_str());                       \
+                       ERR("%s", lttng::format(format_str, ##args).c_str());                     \

                } catch (const std::exception& _formatting_exception) {                           \
                        lttng::logging::details::die_formatting_exception(format_str,             \
                                                                          _formatting_exception); \
                } catch (const std::exception& _formatting_exception) {                           \
                        lttng::logging::details::die_formatting_exception(format_str,             \
                                                                          _formatting_exception); \