Introduce a new 'trace' log verbosity, used for GRAS_IN/GRAS_OUT macros

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@353 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/gras/log.h b/include/gras/log.h
index fdba22e..32c9521 100644 (file)
--- a/include/gras/log.h
+++ b/include/gras/log.h
@@ -35,14 +35,15 @@
  */
 typedef enum {
   gras_log_priority_none          = 0, 
  */
 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;
 
   gras_log_priority_uninitialized = -1 
 } gras_log_priority_t;


@@ -539,11 +540,11 @@ extern gras_log_appender_t *gras_log_default_appender;
 #define CRITICAL6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_critical, f,a1,a2,a3,a4,a5,a6)
 
 #ifdef __GNUC__
 #define CRITICAL6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_critical, f,a1,a2,a3,a4,a5,a6)
 
 #ifdef __GNUC__

-#define GRAS_IN  DEBUG1(">> begin of %s",__FUNCTION__)
-#define GRAS_OUT DEBUG1("<< end of %s",__FUNCTION__)
+#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
 #else

-#define GRAS_IN  DEBUG0(">> begin of function")
-#define GRAS_OUT DEBUG0("<< end of function")
+#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_ */
 #endif
 
 #endif /* ! _GRAS_LOG_H_ */

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 8e290e9..48bb911 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -35,6 +35,7 @@ static void _free_setting(void *s) {
 
 const char *gras_log_priority_names[8] = {
   "NONE",
 
 const char *gras_log_priority_names[8] = {
   "NONE",

+  "TRACE",

   "DEBUG",
   "VERBOSE",
   "INFO",
   "DEBUG",
   "VERBOSE",
   "INFO",


@@ -217,13 +218,13 @@ static gras_error_t _gras_log_parse_setting(const char* control_string,
     }
     
     DEBUG1("New priority name = %s",neweq);
     }
     
     DEBUG1("New priority name = %s",neweq);

-    for (i=0; i<6; i++) {
+    for (i=0; i<gras_log_priority_infinite-1; i++) {

       if (!strncmp(gras_log_priority_names[i],neweq,p-eq)) {
        DEBUG1("This is priority %d",i);
        break;
       }
     }
       if (!strncmp(gras_log_priority_names[i],neweq,p-eq)) {
        DEBUG1("This is priority %d",i);
        break;
       }
     }

-    if (i<6) {
+    if (i<gras_log_priority_infinite-1) {

       set->thresh=i;
     } else {
       gras_assert1(FALSE,"Unknown priority name: %s",eq+1);
       set->thresh=i;
     } else {
       gras_assert1(FALSE,"Unknown priority name: %s",eq+1);