[trace] no longer mandate network/optim to Full when tracing is activated

details:
- network lazy instrumentation is coming

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 27707594870a3415cf43eb0da23968f21eb1a8f4..ce36bb4a28091693d624853a004fcdbcc94e94e1 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -506,16 +506,6 @@ 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
 #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 2666a294de9dfc34a865bf39b64133771f9a3687..0ea9da69354624eb6808337ad24434ba48535504 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -170,7 +170,6 @@ 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_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,
 
 /* 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 d325f8a6394e7e50c257f326a603b40413222e15..8b9657363f9c4227221c66ffb26d10a8df82bb7a 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -1109,10 +1109,6 @@ static void surf_network_model_init_internal(void)
 
 static void set_update_mechanism(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");
   char *optim = xbt_cfg_get_string(_surf_cfg_set, "network/optim");
   int select =
       xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update");