X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b30f00857843f1cee60814ed519ff82e8ef4787..cd31471b40c49ec4e41867bbb35580c2f54d1ee4:/src/instr/variables_instr.c

diff --git a/src/instr/variables_instr.c b/src/instr/variables_instr.c
index bd1c38adc9..9f4a752cb2 100644
--- a/src/instr/variables_instr.c
+++ b/src/instr/variables_instr.c
@@ -1,75 +1,65 @@
-/*
- * variables_instr.c
- *
- *  Created on: Feb 23, 2010
- *      Author: Lucas Schnorr
- *     License: 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.
- *
- *     Copyright (c) 2009 The SimGrid team.
- */
+/* Copyright (c) 2010. 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. */
 
 #include "instr/private.h"
-#include "instr/config.h"
 #include "surf/surf_private.h"
 #include "surf/network_private.h"
 
 #ifdef HAVE_TRACING
 
-extern routing_t used_routing;
+extern routing_global_t global_routing;
 
 void __TRACE_link_variable (double time, const char *src, const char *dst, const char *variable, double value, const char *what)
 {
+  char valuestr[100];
+  xbt_dynar_t route = NULL;
+  unsigned int i;
+  void *link_ptr;
+  char *link = NULL;
   if (!IS_TRACING || !IS_TRACING_PLATFORM) return;
 
-  char valuestr[100];
   snprintf (valuestr, 100, "%g", value);
 
   if (strcmp (what, "declare") == 0){
-	pajeDefineVariableType (variable, "LINK", variable);
-	return;
+    pajeDefineVariableType (variable, "LINK", variable);
+    return;
   }
 
-  if (!used_routing) return;
-
-  int src_id, dst_id;
-  src_id = *(int*)xbt_dict_get(used_routing->host_id,src);
-  dst_id = *(int*)xbt_dict_get(used_routing->host_id,dst);
-  xbt_dynar_t route = used_routing->get_route(src_id, dst_id);
+  if (!global_routing) return;
+  route = global_routing->get_route(src, dst);
 
-  unsigned int i;
-  void *link_ptr;
   xbt_dynar_foreach(route, i, link_ptr) {
-	char *link = (*(link_CM02_t)link_ptr).lmm_resource.generic_resource.name;
+    link = (*(link_CM02_t)link_ptr).lmm_resource.generic_resource.name;
 
-	if (strcmp (what, "set") == 0){
-	  pajeSetVariable (time, variable, link, valuestr);
-	}else if (strcmp (what, "add") == 0){
-	  pajeAddVariable (time, variable, link, valuestr);
-	}else if (strcmp (what, "sub") == 0){
-	  pajeSubVariable (time, variable, link, valuestr);
-	}
+    if (strcmp (what, "set") == 0){
+      pajeSetVariable (time, variable, link, valuestr);
+    }else if (strcmp (what, "add") == 0){
+      pajeAddVariable (time, variable, link, valuestr);
+    }else if (strcmp (what, "sub") == 0){
+      pajeSubVariable (time, variable, link, valuestr);
+    }
   }
 }
 
 void __TRACE_host_variable (double time, const char *variable, double value, const char *what)
 {
+  char valuestr[100];
   if (!IS_TRACING || !IS_TRACING_PLATFORM) return;
 
-  char valuestr[100];
   snprintf (valuestr, 100, "%g", value);
 
   if (strcmp (what, "declare") == 0){
-	pajeDefineVariableType (variable, "HOST", variable);
+    pajeDefineVariableType (variable, "HOST", variable);
   }else if (strcmp (what, "set") == 0){
-	pajeSetVariable (time, variable, MSG_host_self()->name, valuestr);
+    pajeSetVariable (time, variable, MSG_host_self()->name, valuestr);
   }else if (strcmp (what, "add") == 0){
-	pajeAddVariable (time, variable, MSG_host_self()->name, valuestr);
+    pajeAddVariable (time, variable, MSG_host_self()->name, valuestr);
   }else if (strcmp (what, "sub") == 0){
-	pajeSubVariable (time, variable, MSG_host_self()->name, valuestr);
+    pajeSubVariable (time, variable, MSG_host_self()->name, valuestr);
   }
 }
 
-
 #endif /* HAVE_TRACING */