From 2ea79162b045f519a573e82448ee6c5df68d84ae Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 3 Jun 2019 13:57:27 +0200 Subject: [PATCH] Reduce code duplication. --- include/xbt/log.h | 211 +++++++--------------------------------------- 1 file changed, 29 insertions(+), 182 deletions(-) diff --git a/include/xbt/log.h b/include/xbt/log.h index 1053dbf263..361472f628 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -376,34 +376,21 @@ extern xbt_log_layout_t xbt_log_default_layout; # define XBT_LOG(...) XBT_CLOG(0, __VA_ARGS__) #else -// This code is duplicated to remove one level of indirection, working around a MSVC bug -// See: http://stackoverflow.com/questions/9183993/msvc-variadic-macro-expansion - -# define XBT_CLOG(category, prio, ...) \ - do { \ - if (_XBT_LOG_ISENABLEDV((category), prio)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = &(category); \ - _log_ev.priority = (prio); \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) - -# define XBT_LOG(prio,...) \ - do { \ - if (_XBT_LOG_ISENABLEDV((*_simgrid_log_category__default), prio)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = _simgrid_log_category__default; \ - _log_ev.priority = (prio); \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_CLOG(category, prio, ...) \ + do { \ + if (_XBT_LOG_ISENABLEDV((category), prio)) { \ + s_xbt_log_event_t _log_ev; \ + _log_ev.cat = &(category); \ + _log_ev.priority = (prio); \ + _log_ev.fileName = __FILE__; \ + _log_ev.functionName = __func__; \ + _log_ev.lineNum = __LINE__; \ + _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ + } \ + } while (0) + +#define XBT_LOG(prio, ...) XBT_CLOG(*_simgrid_log_category__default, prio, __VA_ARGS__) + #endif /** @ingroup XBT_log @@ -412,214 +399,74 @@ extern xbt_log_layout_t xbt_log_default_layout; * @param ... the format string and its arguments * @brief Log an event at the DEBUG priority on the specified category with these args. */ -#define XBT_CDEBUG(categ, ...) \ - do { \ - if (XBT_LOG_ISENABLED (categ, xbt_log_priority_debug)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = &(_XBT_LOGV(categ)); \ - _log_ev.priority = xbt_log_priority_debug; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_CDEBUG(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_debug, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the VERB priority on the specified category with these args. */ -#define XBT_CVERB(categ, ...) \ - do { \ - if (XBT_LOG_ISENABLED (categ, xbt_log_priority_verbose)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = &(_XBT_LOGV(categ)); \ - _log_ev.priority = xbt_log_priority_verbose; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_CVERB(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_verbose, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the INFO priority on the specified category with these args. */ -#define XBT_CINFO(categ, ...) \ - do { \ - if (XBT_LOG_ISENABLED (categ, xbt_log_priority_info)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = &(_XBT_LOGV(categ)); \ - _log_ev.priority = xbt_log_priority_info; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) - +#define XBT_CINFO(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_info, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the WARN priority on the specified category with these args. */ -#define XBT_CWARN(categ, ...) \ - do { \ - if (XBT_LOG_ISENABLED (categ, xbt_log_priority_warning)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = &(_XBT_LOGV(categ)); \ - _log_ev.priority = xbt_log_priority_warning; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) - +#define XBT_CWARN(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_warning, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the ERROR priority on the specified category with these args. */ -#define XBT_CERROR(categ, ...) \ - do { \ - if (XBT_LOG_ISENABLED (categ, xbt_log_priority_error)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = &(_XBT_LOGV(categ)); \ - _log_ev.priority = xbt_log_priority_error; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_CERROR(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_error, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer - * @brief Log an event at the CRITICAL priority on the specified category with these args (CCRITICALn exists for any n<10). - */ -#define XBT_CCRITICAL(categ, ...) \ - do { \ - if (XBT_LOG_ISENABLED (categ, xbt_log_priority_critical)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = &(_XBT_LOGV(categ)); \ - _log_ev.priority = xbt_log_priority_critical; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) + * @brief Log an event at the CRITICAL priority on the specified category with these args. + */ +#define XBT_CCRITICAL(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_critical, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @param ... the format string and its arguments * @brief Log an event at the DEBUG priority on the default category with these args. */ -#define XBT_DEBUG(...) \ - do { \ - if (_XBT_LOG_ISENABLEDV(*_simgrid_log_category__default, \ - xbt_log_priority_debug)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = _simgrid_log_category__default; \ - _log_ev.priority = xbt_log_priority_debug; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_DEBUG(...) XBT_LOG(xbt_log_priority_debug, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the VERB priority on the default category with these args. */ -#define XBT_VERB(...) \ - do { \ - if (_XBT_LOG_ISENABLEDV(*_simgrid_log_category__default, \ - xbt_log_priority_verbose)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = _simgrid_log_category__default; \ - _log_ev.priority = xbt_log_priority_verbose; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_VERB(...) XBT_LOG(xbt_log_priority_verbose, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the INFO priority on the default category with these args. */ -#define XBT_INFO(...) \ - do { \ - if (_XBT_LOG_ISENABLEDV(*_simgrid_log_category__default, \ - xbt_log_priority_info)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = _simgrid_log_category__default; \ - _log_ev.priority = xbt_log_priority_info; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_INFO(...) XBT_LOG(xbt_log_priority_info, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the WARN priority on the default category with these args. */ -#define XBT_WARN(...) \ - do { \ - if (_XBT_LOG_ISENABLEDV(*_simgrid_log_category__default, \ - xbt_log_priority_warning)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = _simgrid_log_category__default; \ - _log_ev.priority = xbt_log_priority_warning; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_WARN(...) XBT_LOG(xbt_log_priority_warning, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the ERROR priority on the default category with these args. */ -#define XBT_ERROR(...) \ - do { \ - if (_XBT_LOG_ISENABLEDV(*_simgrid_log_category__default, \ - xbt_log_priority_error)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = _simgrid_log_category__default; \ - _log_ev.priority = xbt_log_priority_error; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_ERROR(...) XBT_LOG(xbt_log_priority_error, __VA_ARGS__) /** @ingroup XBT_log * @hideinitializer * @brief Log an event at the CRITICAL priority on the default category with these args. */ -#define XBT_CRITICAL(...) \ - do { \ - if (_XBT_LOG_ISENABLEDV(*_simgrid_log_category__default, \ - xbt_log_priority_critical)) { \ - s_xbt_log_event_t _log_ev; \ - _log_ev.cat = _simgrid_log_category__default; \ - _log_ev.priority = xbt_log_priority_critical; \ - _log_ev.fileName = __FILE__; \ - _log_ev.functionName = __func__; \ - _log_ev.lineNum = __LINE__; \ - _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ - } \ - } while (0) +#define XBT_CRITICAL(...) XBT_LOG(xbt_log_priority_critical, __VA_ARGS__) #define _XBT_IN_OUT(...) \ _XBT_IF_ONE_ARG(_XBT_IN_OUT_ARG1, _XBT_IN_OUT_ARGN, __VA_ARGS__)(__VA_ARGS__) -- 2.20.1