Fix a race condition in _XBT_LOG_ISENABLEDV().

[simgrid.git] / include / xbt / log.h

diff --git a/include/xbt/log.h b/include/xbt/log.h
index d80ba1e..ad7e612 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -1,6 +1,6 @@
 /* log - a generic logging facility in the spirit of log4j                  */
 
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2011. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -242,8 +242,6 @@ typedef struct xbt_log_category_s s_xbt_log_category_t,
  * Do NOT access any members of this structure directly. FIXME: move to private?
  */
 
-#define XBT_LOG_BUFF_SIZE 2048  /* Size of the static string in which we build the log string */
-
 struct xbt_log_category_s {
   xbt_log_category_t parent;
   xbt_log_category_t firstChild;
@@ -263,8 +261,8 @@ struct xbt_log_event_s {
   const char *functionName;
   int lineNum;
   va_list ap;
-  va_list ap_copy;              /* need a copy to launch dynamic layouts when the static ones overflowed */
-  char buffer[XBT_LOG_BUFF_SIZE];
+  char *buffer;
+  int buffer_size;
 };
 
 /**
@@ -367,9 +365,9 @@ extern xbt_log_layout_t xbt_log_default_layout;
  */
 #define _XBT_LOG_ISENABLEDV(catv, priority)                  \
        (priority >= XBT_LOG_STATIC_THRESHOLD                 \
-        && priority >= catv.threshold                         \
         && (catv.threshold != xbt_log_priority_uninitialized \
-            || _xbt_log_cat_init(&catv, priority)) )
+            || _xbt_log_cat_init(&catv, priority))           \
+        && priority >= catv.threshold)
 
 /*
  * Internal Macros
@@ -384,10 +382,6 @@ extern xbt_log_layout_t xbt_log_default_layout;
  * Setting the LogEvent's valist member is done inside _log_logEvent.
  */
 
-#include <string.h>             /* memset */
-#define _XBT_LOG_EV_BUFFER_ZERO() \
-  memset(_log_ev.buffer, 0, XBT_LOG_BUFF_SIZE)
-
 /* Logging Macros */
 
 #ifdef XBT_LOG_MAYDAY
@@ -408,7 +402,6 @@ extern xbt_log_layout_t xbt_log_default_layout;
       _log_ev.fileName = __FILE__;                                      \
       _log_ev.functionName = _XBT_FUNCTION;                             \
       _log_ev.lineNum = __LINE__;                                       \
-      _XBT_LOG_EV_BUFFER_ZERO();                                        \
       _xbt_log_event_log(&_log_ev, __VA_ARGS__);                        \
     }                                                                   \
   }  while (0)