Be consistent and hold mutex in any case when returning from condition_t::timedwait().

[loba.git] / misc.h

diff --git a/misc.h b/misc.h
index 1decbefd4b27fa6497aa3e0b94c5c70d9a496ac5..557bed515bd94cee2b57d207b7eebafa897eb9b8 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -3,6 +3,13 @@
 
 #include <xbt/log.h>
 
+/* Returns c-string "s" if n > 1, empty string "" otherwise. */
+#define ESSE(n) (misc::str_esse + ((n) <= 1))
+
+namespace misc {
+    extern const char str_esse[];
+}
+
 /* Returns true if the given priority is enabled for the default
  * category.  Priority is xbt_log_priority_SUFFIX, where SUFFIX may
  * be: trace, debug, verbose, info, warning, error, critical.
@@ -10,7 +17,10 @@
 #define LOG_ISENABLED(priority) \
     (_XBT_LOG_ISENABLEDV((*_XBT_LOGV(default)), (priority)))
 
-#define ESSE(n) ((n) > 1 ? "s" : "")
+/* 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__)
 
 #endif // !MISC_H