Include surf_resource.h, for surf_resource_name().

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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index f54ec0c..e9c0cc6 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -354,10 +354,12 @@ 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);
+  im_surf_network_model_init_LegrandVelho();
+  // FIXME: prefer the proper interface instead of bypassing the cfg module that way
+  //xbt_cfg_set_parse(_surf_cfg_set, "network/model:LV08");
+  //xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01");
   xbt_dynar_push(model_list, &surf_workstation_model);
+  sg_platf_postparse_add_cb(create_workstations);
 }
 
 void surf_workstation_model_init_compound()
@@ -366,9 +368,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);
 }