X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a91630a9a2cad8bdad0180bbdbd54b90f0c82d0a..3203ed1f4fb6f4617e94d5351661ba07e8b8f833:/src/instr/instr_resource_utilization.c

diff --git a/src/instr/instr_resource_utilization.c b/src/instr/instr_resource_utilization.c
index b3120aefd9..235321fa16 100644
--- a/src/instr/instr_resource_utilization.c
+++ b/src/instr/instr_resource_utilization.c
@@ -1,12 +1,10 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
-  * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "instr/instr_private.h"
-
-#ifdef HAVE_TRACING
+#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_resource, instr, "tracing (un)-categorized resource utilization");
 
@@ -51,9 +49,10 @@ 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
@@ -72,11 +71,11 @@ void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_acti
 
   //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 = PJ_container_get (resource);
     type_t type = PJ_type_get (category_type, container->type);
@@ -89,9 +88,9 @@ 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
@@ -110,11 +109,11 @@ void TRACE_surf_host_set_utilization(const char *resource,
 
   //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 = PJ_container_get (resource);
     type_t type = PJ_type_get (category_type, container->type);
@@ -132,4 +131,3 @@ void TRACE_surf_resource_utilization_release()
 {
   xbt_dict_free(&platform_variables);
 }
-#endif /* HAVE_TRACING */