X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a18fb7c6c81b1f58a9f8111fcf0ade106c4746b..708989f9970b6f37f3ca7c7b568bcbfeaa53867f:/src/instr/instr_resource_utilization.c

diff --git a/src/instr/instr_resource_utilization.c b/src/instr/instr_resource_utilization.c
index 4c4b2e3b69..02fb2dbbe6 100644
--- a/src/instr/instr_resource_utilization.c
+++ b/src/instr/instr_resource_utilization.c
@@ -18,40 +18,29 @@ 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);
-    container_t container = getContainerByName (resource);
-    type_t type = getVariableType (variable, NULL, container->type);
+  /*
+   * To trace resource utilization, we use pajeAddVariable and pajeSubVariable only.
+   * The Paje simulator needs a pajeSetVariable in the first place so it knows
+   * the initial value of all variables for subsequent adds/subs. If we don't do
+   * so, the first pajeAddVariable is added to a non-determined value within
+   * the Paje simulator, causing analysis problems.
+   */
+
+  // create a key considering the resource and variable
+  int n = strlen(variable)+strlen(resource)+1;
+  char *key = (char*)xbt_malloc(n*sizeof(char));
+  snprintf (key, n, "%s%s", resource, variable);
+
+  // check if key exists: if it doesn't, set the variable to zero and mark this in the dict
+  if (!xbt_dict_get_or_null(platform_variables, key)) {
+    container_t container = PJ_container_get (resource);
+    type_t type = PJ_type_get (variable, container->type);
     new_pajeSetVariable (now, container, type, 0);
-    xbt_dict_set(platform_variables, resource, array, NULL);
-  } 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 (TRACE_categorized ()){
-        container_t container = getContainerByName (resource);
-        type_t type = getVariableType (variable, NULL, container->type);
-        new_pajeSetVariable (now, container, type, 0);
-      }
-    }
+    xbt_dict_set(platform_variables, key, (char*)"", NULL);
   }
-  /* end of check */
+  xbt_free(key);
 }
 
-
-
 /*
 static void __TRACE_A_event(smx_action_t action, double now, double delta,
                             const char *variable, const char *resource,
@@ -61,7 +50,7 @@ static void __TRACE_A_event(smx_action_t action, double now, double delta,
   snprintf(valuestr, 100, "%f", value);
 
   __TRACE_surf_check_variable_set_to_zero(now, variable, resource);
-  container_t container = getContainerByName (resource);
+  container_t container = PJ_container_get (resource);
   type_t type = getVariableType (variable, NULL, container->type);
   new_pajeAddVariable(now, container, type, value);
   new_pajeSubVariable(now + delta, container, type, value);
@@ -84,7 +73,7 @@ void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_acti
                                      double delta)
 {
   //only trace link utilization if link is known by tracing mechanism
-  if (!knownContainerWithName(resource))
+  if (!PJ_container_get_or_null(resource))
     return;
   if (!value)
     return;
@@ -92,8 +81,8 @@ void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_acti
   //trace uncategorized link utilization
   if (TRACE_uncategorized()){
     XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now+delta, resource, value);
-    container_t container = getContainerByName (resource);
-    type_t type = getVariableType("bandwidth_used", NULL, container->type);
+    container_t container = PJ_container_get (resource);
+    type_t type = PJ_type_get ("bandwidth_used", container->type);
     instr_event (now, delta, type, container, value);
   }
 
@@ -105,8 +94,8 @@ void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_acti
     char category_type[INSTR_DEFAULT_STR_SIZE];
     snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", surf_action->category);
     XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
-    container_t container = getContainerByName (resource);
-    type_t type = getVariableType(category_type, NULL, container->type);
+    container_t container = PJ_container_get (resource);
+    type_t type = PJ_type_get (category_type, container->type);
     instr_event (now, delta, type, container, value);
   }
   return;
@@ -122,7 +111,7 @@ void TRACE_surf_host_set_utilization(const char *resource,
                                      double delta)
 {
   //only trace host utilization if host is known by tracing mechanism
-  if (!knownContainerWithName(resource))
+  if (!PJ_container_get_or_null(resource))
     return;
   if (!value)
     return;
@@ -130,8 +119,8 @@ void TRACE_surf_host_set_utilization(const char *resource,
   //trace uncategorized host utilization
   if (TRACE_uncategorized()){
     XBT_DEBUG("UNCAT HOST [%f - %f] %s power_used %f", now, now+delta, resource, value);
-    container_t container = getContainerByName (resource);
-    type_t type = getVariableType("power_used", NULL, container->type);
+    container_t container = PJ_container_get (resource);
+    type_t type = PJ_type_get ("power_used", container->type);
     instr_event (now, delta, type, container, value);
   }
 
@@ -143,8 +132,8 @@ void TRACE_surf_host_set_utilization(const char *resource,
     char category_type[INSTR_DEFAULT_STR_SIZE];
     snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", surf_action->category);
     XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
-    container_t container = getContainerByName (resource);
-    type_t type = getVariableType(category_type, NULL, container->type);
+    container_t container = PJ_container_get (resource);
+    type_t type = PJ_type_get (category_type, container->type);
     instr_event (now, delta, type, container, value);
   }
   return;
@@ -152,10 +141,11 @@ void TRACE_surf_host_set_utilization(const char *resource,
 
 void TRACE_surf_resource_utilization_alloc()
 {
-  platform_variables = xbt_dict_new_homogeneous(xbt_dynar_free_voidp);
+  platform_variables = xbt_dict_new_homogeneous(NULL);
 }
 
 void TRACE_surf_resource_utilization_release()
 {
+  xbt_dict_free(&platform_variables);
 }
 #endif /* HAVE_TRACING */