char *name = NULL;
void *workstation = NULL;
char *workstation_model_name;
+ int workstation_id = -1;
simix_config_init(); /* make sure that our configuration set is created */
surf_timer_resource_init(file);
/* which model do you want today? */
- workstation_model_name = xbt_cfg_get_string (_simix_cfg_set, "surf_workstation_model");
+ workstation_model_name = xbt_cfg_get_string (_simix_cfg_set, "workstation_model");
DEBUG1("Model : %s", workstation_model_name);
- if (!strcmp(workstation_model_name,"KCCFLN05")) {
- surf_workstation_resource_init_KCCFLN05(file);
- } else if (!strcmp(workstation_model_name,"KCCFLN05_proportional")) {
- surf_workstation_resource_init_KCCFLN05_proportional(file);
- } else if (!strcmp(workstation_model_name,"KCCFLN05_Vegas")) {
- surf_workstation_resource_init_KCCFLN05_Vegas(file);
- } else if (!strcmp(workstation_model_name,"KCCFLN05_Reno")) {
- surf_workstation_resource_init_KCCFLN05_Reno(file);
- } else if (!strcmp(workstation_model_name,"CLM03")) {
- surf_workstation_resource_init_CLM03(file);
- } else {
- xbt_assert0(0,"The impossible happened (once again)");
+ 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);
}
+
+ surf_workstation_resource_description[workstation_id].resource_init(file);
+
_simix_init_status = 2; /* inited; don't change settings now */
xbt_dict_foreach(workstation_set, cursor, name, workstation) {