cosmetic on the API

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

diff --git a/include/gras/log.h b/include/gras/log.h
index 8c0782e..32c9521 100644 (file)
--- a/include/gras/log.h
+++ b/include/gras/log.h
@@ -35,14 +35,15 @@
  */
 typedef enum {
   gras_log_priority_none          = 0, 
-  gras_log_priority_debug         = 1, 
-  gras_log_priority_verbose       = 2, 
-  gras_log_priority_info          = 3, 
-  gras_log_priority_warning       = 4, 
-  gras_log_priority_error         = 5, 
-  gras_log_priority_critical      = 6, 
+  gras_log_priority_trace         = 1, 
+  gras_log_priority_debug         = 2, 
+  gras_log_priority_verbose       = 3, 
+  gras_log_priority_info          = 4, 
+  gras_log_priority_warning       = 5, 
+  gras_log_priority_error         = 6, 
+  gras_log_priority_critical      = 7, 
 
-  gras_log_priority_infinite      = 7, 
+  gras_log_priority_infinite      = 8, 
 
   gras_log_priority_uninitialized = -1 
 } gras_log_priority_t;
@@ -150,13 +151,14 @@ typedef struct gras_log_category_s gras_log_category_t;
  * Do NOT access any members of this structure directly.
  */
 struct gras_log_category_s {
-  gras_log_category_t *parent;
-  gras_log_category_t *firstChild, *nextSibling;
-  const char *name;
-  int threshold;
-  int isThreshInherited;
-  gras_log_appender_t *appender;
-  int willLogToParent;
+            gras_log_category_t *parent;
+/*@null@*/  gras_log_category_t *firstChild; 
+/*@null@*/  gras_log_category_t *nextSibling;
+            const char *name;
+            int threshold;
+            int isThreshInherited;
+/*@null@*/  gras_log_appender_t *appender;
+            int willLogToParent;
   // TODO: Formats?
 };
 
@@ -537,7 +539,12 @@ extern gras_log_appender_t *gras_log_default_appender;
 #define CRITICAL5(f,a1,a2,a3,a4,a5)    LOG5(gras_log_priority_critical, f,a1,a2,a3,a4,a5)
 #define CRITICAL6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_critical, f,a1,a2,a3,a4,a5,a6)
 
-#define GRAS_IN  DEBUG0(">> begin of function")
-#define GRAS_OUT DEBUG0("<< end of function")
+#ifdef __GNUC__
+#define GRAS_IN  LOG1(gras_log_priority_trace, ">> begin of %s", __FUNCTION__)
+#define GRAS_OUT LOG1(gras_log_priority_trace, "<< end of %s", __FUNCTION__)
+#else
+#define GRAS_IN  LOG0(gras_log_priority_trace, ">> begin of function")
+#define GRAS_OUT LOG0(gras_log_priority_trace, "<< end of function")
+#endif
 
 #endif /* ! _GRAS_LOG_H_ */