#include "private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
+#include "xbt/xbt_os_time.h"
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
"Logging specific to SIMIX (environment)");
void *workstation = NULL;
char *workstation_model_name;
int workstation_id = -1;
+ double start, end;
simix_config_init(); /* make sure that our configuration set is created */
- surf_timer_resource_init(file);
+ surf_timer_model_init(file);
/* which model do you want today? */
workstation_model_name =
DEBUG1("Model : %s", workstation_model_name);
workstation_id =
- find_resource_description(surf_workstation_resource_description,
- surf_workstation_resource_description_size,
- workstation_model_name);
+ find_model_description(surf_workstation_model_description,
+ workstation_model_name);
if (!strcmp(workstation_model_name, "compound")) {
xbt_ex_t e;
char *network_model_name = NULL;
}
network_id =
- find_resource_description(surf_network_resource_description,
- surf_network_resource_description_size,
- network_model_name);
+ find_model_description(surf_network_model_description,
+ network_model_name);
cpu_id =
- find_resource_description(surf_cpu_resource_description,
- surf_cpu_resource_description_size,
- cpu_model_name);
+ find_model_description(surf_cpu_model_description,
+ cpu_model_name);
- surf_cpu_resource_description[cpu_id].resource_init(file);
- surf_network_resource_description[network_id].resource_init(file);
- }
+ surf_cpu_model_description[cpu_id].model_init(file);
+ surf_network_model_description[network_id].model_init(file);
+
+
+ }
+ surf_workstation_model_description[workstation_id].
+ model_init(file);
+
+ start = xbt_os_time();
+ parse_platform_file(file);
- surf_workstation_resource_description[workstation_id].
- resource_init(file);
+ if (surf_workstation_model_description[workstation_id].create_ws != NULL)
+ surf_workstation_model_description[workstation_id].create_ws();
+ end = xbt_os_time();
+ DEBUG1("PARSE TIME: %lg", (end-start));
_simix_init_status = 2; /* inited; don't change settings now */