cosmetics on tracing mechanism

[simgrid.git] / src / instr / resource_utilization.c

diff --git a/src/instr/resource_utilization.c b/src/instr/resource_utilization.c
index afb26ee..7382fd6 100644 (file)
--- a/src/instr/resource_utilization.c
+++ b/src/instr/resource_utilization.c
@@ -10,6 +10,9 @@
 
 #define VARIABLE_SEPARATOR '#'
 
+//to check if variables were previously set to 0, otherwise paje won't simulate them
+static xbt_dict_t platform_variables; /* host or link name -> array of categories */
+
 //B
 static xbt_dict_t method_b_dict;
 
@@ -58,6 +61,36 @@ static void __TRACE_define_method (char *method)
   }
 }
 
+//used by all methods
+static void __TRACE_surf_check_variable_set_to_zero (double now, const char *variable, const char *resource)
+{
+  /* check if we have to set it to 0 */
+  if (!xbt_dict_get_or_null (platform_variables, resource)){
+    xbt_dynar_t array = xbt_dynar_new(sizeof(char*), xbt_free);
+    char *var_cpy = xbt_strdup(variable);
+    xbt_dynar_push (array, &var_cpy);
+    if (IS_TRACING_PLATFORM) pajeSetVariable (now, variable, resource, "0");
+    xbt_dict_set (platform_variables, resource, array, xbt_dynar_free_voidp);
+  }else{
+    xbt_dynar_t array = xbt_dict_get (platform_variables, resource);
+    unsigned int i;
+    char* cat;
+    int flag = 0;
+    xbt_dynar_foreach (array, i, cat) {
+      if (strcmp(variable, cat)==0){
+        flag = 1;
+      }
+    }
+    if (flag==0){
+      char *var_cpy = xbt_strdup(variable);
+      xbt_dynar_push (array, &var_cpy);
+      if (IS_TRACING_PLATFORM) pajeSetVariable (now, variable, resource, "0");
+    }
+  }
+  /* end of check */
+}
+
+#define A_METHOD
 //A
 static void __TRACE_surf_resource_utilization_A (double now, double delta, const char *variable, const char *resource, double value)
 {
@@ -72,6 +105,7 @@ static void __TRACE_surf_resource_utilization_A (double now, double delta, const
   return;
 }
 
+#define B_METHOD
 //B
 static void __TRACE_surf_resource_utilization_initialize_B ()
 {
@@ -210,6 +244,7 @@ static void __TRACE_surf_resource_utilization_finalize_B ()
   xbt_dict_free (&method_b_dict);
 }
 
+#define C_METHOD
 //C
 static void __TRACE_surf_resource_utilization_start_C (smx_action_t action)
 {
@@ -291,22 +326,24 @@ static void __TRACE_surf_resource_utilization_finalize_C ()
   xbt_dict_free (&method_c_dict);
 }
 
+#define RESOURCE_UTILIZATION_INTERFACE
 /*
  * TRACE_surf_link_set_utilization: entry point from SimGrid
  */
-void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta)
+void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, double value, double now, double delta)
 {
   char type[100];
   if (!IS_TRACING || !IS_TRACED(smx_action)) return;
 
-  if (strcmp (name, "__loopback__")==0 ||
-      strcmp (name, "loopback")==0){ //ignore loopback updates
-    return;
-  }
+  //only trace link utilization if link is known by tracing mechanism
+  if (!TRACE_surf_link_is_traced (link)) return;
+
   if (!value) return;
 
+  char resource[100];
+  snprintf (resource, 100, "%p", link);
   snprintf (type, 100, "b%s", smx_action->category);
-  __TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
+  TRACE_surf_resource_utilization_event (smx_action, now, delta, type, resource, value);
   return;
 }
 
@@ -321,28 +358,21 @@ void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action,
   if (!value) return;
 
   snprintf (type, 100, "p%s", smx_action->category);
-  __TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
+  TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
   return;
 }
 
 /*
  * __TRACE_surf_resource_utilization_*: entry points from tracing functions
  */
-void __TRACE_surf_resource_utilization_start (smx_action_t action)
+void TRACE_surf_resource_utilization_start (smx_action_t action)
 {
   if (currentMethod == methodC){
     __TRACE_surf_resource_utilization_start_C (action);
   }
 }
 
-void __TRACE_surf_resource_utilization_end (smx_action_t action)
-{
-  if (currentMethod == methodC){
-    __TRACE_surf_resource_utilization_end_C (action);
-  }
-}
-
-void __TRACE_surf_resource_utilization_event (smx_action_t action, double now, double delta, const char *variable, const char *resource, double value)
+void TRACE_surf_resource_utilization_event (smx_action_t action, double now, double delta, const char *variable, const char *resource, double value)
 {
   if (currentMethod == methodA){
     __TRACE_surf_resource_utilization_A (now, delta, variable, resource, value);
@@ -353,9 +383,18 @@ void __TRACE_surf_resource_utilization_event (smx_action_t action, double now, d
   }
 }
 
-void __TRACE_surf_resource_utilization_initialize ()
+void TRACE_surf_resource_utilization_end (smx_action_t action)
+{
+  if (currentMethod == methodC){
+    __TRACE_surf_resource_utilization_end_C (action);
+  }
+}
+
+void TRACE_surf_resource_utilization_alloc ()
 {
-  __TRACE_define_method (_TRACE_platform_method());
+  platform_variables = xbt_dict_new();
+
+  __TRACE_define_method (TRACE_get_platform_method());
 
   if (currentMethod == methodA){
   }else if (currentMethod == methodB){
@@ -365,7 +404,7 @@ void __TRACE_surf_resource_utilization_initialize ()
   }
 }
 
-void __TRACE_surf_resource_utilization_finalize ()
+void TRACE_surf_resource_utilization_release ()
 {
   if (currentMethod == methodA){
   }else if (currentMethod == methodB){