Check for failed links on back_route when crosstraffic is activated

[simgrid.git] / src / surf / workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index f54ec0c..2361121 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -339,6 +339,17 @@ static void surf_workstation_model_init_internal(void)
 
 }
 
+void surf_workstation_model_init_current_default(void)
+{
+  surf_workstation_model_init_internal();
+  xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1);
+  surf_cpu_model_init_Cas01();
+  im_surf_network_model_init_LegrandVelho();
+
+  xbt_dynar_push(model_list, &surf_workstation_model);
+  sg_platf_postparse_add_cb(create_workstations);
+}
+
 /********************************************************************/
 /* The model used in MSG and presented at CCGrid03                  */
 /********************************************************************/
@@ -353,11 +364,11 @@ static void surf_workstation_model_init_internal(void)
 void surf_workstation_model_init_CLM03(void)
 {
   surf_workstation_model_init_internal();
-  surf_cpu_model_init_Cas01_im();
-  surf_network_model_init_LegrandVelho();
-  update_model_description(surf_workstation_model_description,
-                           "CLM03", surf_workstation_model);
+  surf_cpu_model_init_Cas01();
+  surf_network_model_init_CM02();
+
   xbt_dynar_push(model_list, &surf_workstation_model);
+  sg_platf_postparse_add_cb(create_workstations);
 }
 
 void surf_workstation_model_init_compound()
@@ -366,9 +377,6 @@ void surf_workstation_model_init_compound()
   xbt_assert(surf_cpu_model, "No CPU model defined yet!");
   xbt_assert(surf_network_model, "No network model defined yet!");
   surf_workstation_model_init_internal();
-
-  update_model_description(surf_workstation_model_description,
-                           "compound", surf_workstation_model);
-
   xbt_dynar_push(model_list, &surf_workstation_model);
+  sg_platf_postparse_add_cb(create_workstations);
 }