X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ca1291c2f63ca6235f4b4885c48413a900aade4..8cc10e99f53995bc7486e4467b4e6ad8d7be3460:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index 9aa3304dd8..0a8c3221ae 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -8,6 +8,9 @@ #include "xbt/dict.h" #include "portable.h" #include "surf_private.h" +#include "surf/surf_resource.h" + + typedef struct workstation_CLM03 { s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */ @@ -347,25 +350,21 @@ static void surf_workstation_model_init_internal(void) /* month = {may}, */ /* year = {2003} */ /* } */ -void surf_workstation_model_init_CLM03(const char *filename) +void surf_workstation_model_init_CLM03(void) { surf_workstation_model_init_internal(); - surf_cpu_model_init_Cas01_im(filename); - surf_network_model_init_LegrandVelho(filename); - update_model_description(surf_workstation_model_description, - "CLM03", surf_workstation_model); + 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); } -void surf_workstation_model_init_compound(const char *filename) +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); }