From: Lucas Schnorr <Lucas.Schnorr@imag.fr>
Date: Mon, 26 Dec 2011 13:50:11 +0000 (+0100)
Subject: [trace] tracing needs a Full network/optim, otherwise it won't work for network
X-Git-Tag: exp_20120216~206
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b2fb141eada975e36db406b18e4fdee68012d3a7

[trace] tracing needs a Full network/optim, otherwise it won't work for network

Todo:
- find a way to trace the lazy network update method
---

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 6c442894be..ffff7f877d 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -517,6 +517,16 @@ void TRACE_generate_triva_cat_conf (void)
   }
 }
 
+void TRACE_set_network_update_mechanism (void)
+{
+  if (TRACE_is_enabled()){
+    if (TRACE_categorized() || TRACE_uncategorized()){
+      XBT_INFO ("Tracing resource utilization active, network/optim configuration now set to Full.");
+      xbt_cfg_set_string (_surf_cfg_set, "network/optim", "Full");
+    }
+  }
+}
+
 #undef OPT_TRACING
 #undef OPT_TRACING_PLATFORM
 #undef OPT_TRACING_SMPI
diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 842dc7fd2a..ffdaac29d5 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -172,6 +172,7 @@ void TRACE_global_init(int *argc, char **argv);
 void TRACE_help(int detailed);
 void TRACE_generate_triva_uncat_conf (void);
 void TRACE_generate_triva_cat_conf (void);
+void TRACE_set_network_update_mechanism (void);
 
 /* from resource_utilization.c */
 void TRACE_surf_host_set_utilization(const char *resource,
diff --git a/src/surf/network.c b/src/surf/network.c
index 442b4b36e6..f144df9c05 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -1046,6 +1046,10 @@ static void surf_network_model_init_internal(void)
 }
 
 static void set_update_mechanism(void) {
+#ifdef HAVE_TRACING
+  TRACE_set_network_update_mechanism ();
+#endif
+
   char *optim = xbt_cfg_get_string(_surf_cfg_set, "network/optim");
   int select = xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update");