Update ag_parameters after last discussion.

[loba.git] / misc.h

diff --git a/misc.h b/misc.h
index 47a6928bc48e2ec94cb2d7af6039d019560239c4..e58ac61626948597ee9db3f7462eceddfb8292ab 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -17,41 +17,19 @@ namespace misc {
 #define LOG_ISENABLED(priority) \
     (_XBT_LOG_ISENABLEDV((*_XBT_LOGV(default)), (priority)))
 
 #define LOG_ISENABLED(priority) \
     (_XBT_LOG_ISENABLEDV((*_XBT_LOGV(default)), (priority)))
 

-#ifndef XBT_CLOG
-#  define XBT_CLOG_(catv, prio, ...)                                    \
-    do {                                                                \
-        if (_XBT_LOG_ISENABLEDV(catv, prio)) {                          \
-            s_xbt_log_event_t _log_ev;                                  \
-            _log_ev.cat = &(catv);                                      \
-            _log_ev.priority = (prio);                                  \
-            _log_ev.fileName = __FILE__;                                \
-            _log_ev.functionName = _XBT_FUNCTION;                       \
-            _log_ev.lineNum = __LINE__;                                 \
-            memset(_log_ev.buffer, 0, XBT_LOG_BUFF_SIZE);               \
-            _xbt_log_event_log(&_log_ev, __VA_ARGS__);                  \
-        }                                                               \
-    }  while (0)
-#  define XBT_CLOG(c, p, ...) XBT_CLOG_(_XBT_LOGV(c), p, __VA_ARGS__)
-#  define XBT_CDEBUG(c, ...) XBT_CLOG(c, xbt_log_priority_debug, __VA_ARGS__)
-#  define XBT_CVERB(c, ...) XBT_CLOG(c, xbt_log_priority_verbose, __VA_ARGS__)
-#  define XBT_CINFO(c, ...) XBT_CLOG(c, xbt_log_priority_info, __VA_ARGS__)
-#  define XBT_CWARN(c, ...) XBT_CLOG(c, xbt_log_priority_warning, __VA_ARGS__)
-#  define XBT_CERROR(c, ...) XBT_CLOG(c, xbt_log_priority_error, __VA_ARGS__)
-#  define XBT_CCRITICAL(c, ...) XBT_CLOG(c, xbt_log_priority_critical, __VA_ARGS__)
-#  define XBT_LOG(...) XBT_CLOG_((*_XBT_LOGV(default)), __VA_ARGS__)
-#  define XBT_DEBUG(...) XBT_LOG(xbt_log_priority_debug, __VA_ARGS__)
-#  define XBT_VERB(...) XBT_LOG(xbt_log_priority_verbose, __VA_ARGS__)
-#  define XBT_INFO(...) XBT_LOG(xbt_log_priority_info, __VA_ARGS__)
-#  define XBT_WARN(...) XBT_LOG(xbt_log_priority_warning, __VA_ARGS__)
-#  define XBT_ERROR(...) XBT_LOG(xbt_log_priority_error, __VA_ARGS__)
-#  define XBT_CRITICAL(...) XBT_LOG(xbt_log_priority_critical, __VA_ARGS__)
-#endif
-

 /* Defines XBT_XCLOG(...) which behave like XBT_CLOG(...), except that the
  * given category is not passed through _XBT_LOGV before use.
  */
 #define XBT_XCLOG(c, p, ...) XBT_CLOG_((*(c)), p, __VA_ARGS__)
 
 /* Defines XBT_XCLOG(...) which behave like XBT_CLOG(...), except that the
  * given category is not passed through _XBT_LOGV before use.
  */
 #define XBT_XCLOG(c, p, ...) XBT_CLOG_((*(c)), p, __VA_ARGS__)
 

+/* Use a faster version of TRY if available.
+ */
+#if defined(TRY_NO_BACKTRACE)
+#  define TRY_FAST TRY_NO_BACKTRACE
+#else
+#  define TRY_FAST TRY
+#endif
+

 #endif // !MISC_H
 
 // Local variables:
 #endif // !MISC_H
 
 // Local variables: