Experimental: use TRY_NO_BACKTRACE if available.

No functional change.

diff --git a/messages.cpp b/messages.cpp
index 2d5de949b0ddd72a05d2661ae81b0234018bdde7..e9fbced1c63d659bc9dd358980eca2ff1bda858e 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -72,7 +72,7 @@ bool message_queue::pop(message*& msg, m_host_t& from, double timeout)
         if (!queue.try_pop(task)) {
             xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");
         if (!queue.try_pop(task)) {
             xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");

-            TRY {
+            TRY_FAST {

                 if (timeout > 0)
                     cond.timedwait(mutex, timeout);
                 else
                 if (timeout > 0)
                     cond.timedwait(mutex, timeout);
                 else

diff --git a/misc.h b/misc.h
index 557bed515bd94cee2b57d207b7eebafa897eb9b8..e58ac61626948597ee9db3f7462eceddfb8292ab 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -22,6 +22,14 @@ namespace misc {
  */
 #define XBT_XCLOG(c, p, ...) XBT_CLOG_((*(c)), p, __VA_ARGS__)
 
  */
 #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: