- if (!strcmp(workstation_model_name,"KCCFLN05")) {
- surf_workstation_resource_init_KCCFLN05(file);
-#ifdef HAVE_SDP
- } else if (!strcmp(workstation_model_name,"SDP")) {
- surf_workstation_resource_init_KCCFLN05_proportional(file);
-#endif
- } else if (!strcmp(workstation_model_name,"Vegas")) {
- surf_workstation_resource_init_KCCFLN05_Vegas(file);
- } else if (!strcmp(workstation_model_name,"Reno")) {
- surf_workstation_resource_init_KCCFLN05_Reno(file);
- } else if (!strcmp(workstation_model_name,"CLM03")) {
- surf_workstation_resource_init_CLM03(file);
-#ifdef HAVE_GTNETS
- } else if (!strcmp(workstation_model_name,"GTNets")) {
- surf_workstation_resource_init_GTNETS(file);
-#endif
- } else if (!strcmp(workstation_model_name,"compound")) {
- char *network_model_name = xbt_cfg_get_string (_simix_cfg_set, "network_model");
- char *cpu_model_name = xbt_cfg_get_string (_simix_cfg_set, "cpu_model");
-
- if(!strcmp(cpu_model_name,"Cas01")) {
- surf_cpu_resource_init_Cas01(file);
- } else DIE_IMPOSSIBLE;
-
- if(!strcmp(network_model_name,"CM02")) {
- surf_network_resource_init_CM02(file);
-#ifdef HAVE_GTNETS
- } else if(!strcmp(network_model_name,"GTNets")) {
- surf_network_resource_init_GTNETS(file);
-#endif
- } else if(!strcmp(network_model_name,"Reno")) {
- surf_network_resource_init_Reno(file);
- } else if(!strcmp(network_model_name,"Vegas")) {
- surf_network_resource_init_Vegas(file);
-#ifdef HAVE_SDP
- } else if(!strcmp(network_model_name,"SDP")) {
- surf_network_resource_init_SDP(file);
-#endif
- } else
- DIE_IMPOSSIBLE;
-
- surf_workstation_resource_init_compound(file);
- } else {
- DIE_IMPOSSIBLE;
+ workstation_id = find_resource_description(surf_workstation_resource_description,
+ surf_workstation_resource_description_size,
+ workstation_model_name);
+ if(!strcmp(workstation_model_name,"compound")) {
+ xbt_ex_t e;
+ char *network_model_name = NULL;
+ char *cpu_model_name = NULL;
+ int network_id = -1;
+ int cpu_id = -1;
+
+ TRY {
+ cpu_model_name = xbt_cfg_get_string (_simix_cfg_set, "cpu_model");
+ } CATCH(e) {
+ if (e.category == bound_error) {
+ xbt_assert0(0,"Set a cpu model to use with the 'compound' workstation model");
+ xbt_ex_free(e);
+ } else {
+ RETHROW;
+ }
+ }
+
+ TRY {
+ network_model_name=xbt_cfg_get_string (_simix_cfg_set, "network_model");
+ } CATCH(e) {
+ if (e.category == bound_error) {
+ xbt_assert0(0,"Set a network model to use with the 'compound' workstation model");
+ xbt_ex_free(e);
+ } else {
+ RETHROW;
+ }
+ }
+
+ network_id = find_resource_description(surf_network_resource_description,
+ surf_network_resource_description_size,
+ network_model_name);
+ cpu_id = find_resource_description(surf_cpu_resource_description,
+ surf_cpu_resource_description_size,
+ cpu_model_name);
+
+ surf_cpu_resource_description[cpu_id].resource_init(file);
+ surf_network_resource_description[network_id].resource_init(file);