X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/53d6c6fe82beb22d4207ce63c32a5c3e003754d2..d0ffc37686edcc803601f76ab51fdfed5fc2f241:/src/instr/instr_resource_utilization.c

diff --git a/src/instr/instr_resource_utilization.c b/src/instr/instr_resource_utilization.c
index 3b19236a67..d6b8891dcf 100644
--- a/src/instr/instr_resource_utilization.c
+++ b/src/instr/instr_resource_utilization.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,7 +11,7 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_resource, instr, "tracing (un)-categorized resource utilization");
 
 //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 */
+static xbt_dict_t platform_variables;
 
 //used by all methods
 static void __TRACE_surf_check_variable_set_to_zero(double now,
@@ -33,30 +33,14 @@ static void __TRACE_surf_check_variable_set_to_zero(double now,
 
   // 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 = getContainerByName (resource);
-    type_t type = getVariableType (variable, NULL, container->type);
+    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, key, "", NULL);
+    xbt_dict_set(platform_variables, key, (char*)"", NULL);
   }
   xbt_free(key);
 }
 
-/*
-static void __TRACE_A_event(smx_action_t action, double now, double delta,
-                            const char *variable, const char *resource,
-                            double value)
-{
-  char valuestr[100];
-  snprintf(valuestr, 100, "%f", value);
-
-  __TRACE_surf_check_variable_set_to_zero(now, variable, resource);
-  container_t container = getContainerByName (resource);
-  type_t type = getVariableType (variable, NULL, container->type);
-  new_pajeAddVariable(now, container, type, value);
-  new_pajeSubVariable(now + delta, container, type, value);
-}
-*/
-
 static void instr_event (double now, double delta, type_t variable, container_t resource, double value)
 {
   __TRACE_surf_check_variable_set_to_zero(now, variable->name, resource->name);
@@ -67,13 +51,14 @@ static void instr_event (double now, double delta, type_t variable, container_t
 /*
  * TRACE_surf_link_set_utilization: entry point from SimGrid
  */
-void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_action,
-                                     surf_action_t surf_action,
-                                     double value, double now,
+void TRACE_surf_link_set_utilization(const char *resource,
+                                     const char *category,
+                                     double value,
+                                     double now,
                                      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;
@@ -81,21 +66,21 @@ 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);
   }
 
   //trace categorized utilization
   if (TRACE_categorized()){
-    if (!surf_action->category)
+    if (!category)
       return;
     //variable of this category starts by 'b', because we have a link here
     char category_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", surf_action->category);
+    snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", 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;
@@ -105,13 +90,13 @@ void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_acti
  * TRACE_surf_host_set_utilization: entry point from SimGrid
  */
 void TRACE_surf_host_set_utilization(const char *resource,
-                                     smx_action_t smx_action,
-                                     surf_action_t surf_action,
-                                     double value, double now,
+                                     const char *category,
+                                     double value,
+                                     double now,
                                      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;
@@ -119,21 +104,21 @@ 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);
   }
 
   //trace categorized utilization
   if (TRACE_categorized()){
-    if (!surf_action->category)
+    if (!category)
       return;
     //variable of this category starts by 'p', because we have a host here
     char category_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", surf_action->category);
+    snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", 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;