int surf_workstation_model_description_size = 4;
s_surf_model_description_t surf_workstation_model_description[] = {
- {"CLM03", NULL, surf_workstation_model_init_CLM03},
- {"KCCFLN05", NULL, surf_workstation_model_init_KCCFLN05},
- {"compound", NULL, surf_workstation_model_init_compound},
- {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07}
+ {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations},
+ {"compound", NULL, surf_workstation_model_init_compound, NULL},
+ {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL}
};
void update_model_description(s_surf_model_description_t * table,
static char *path_name = NULL;
FILE *surf_fopen(const char *name, const char *mode)
{
- int i;
+ unsigned int iter;
char *path = NULL;
FILE *file = NULL;
unsigned int path_name_len = 0; /* don't count '\0' */
path_name = xbt_new0(char, path_name_len + 1);
}
- xbt_dynar_foreach(surf_path, i, path) {
+ xbt_dynar_foreach(surf_path, iter, path) {
if (path_name_len < strlen(path) + strlen(name) + 1) {
path_name_len = strlen(path) + strlen(name) + 1; /* plus '/' */
path_name = xbt_realloc(path_name, path_name_len + 1);
}
+ #ifdef WIN32
+ sprintf(path_name, "%s\\%s", path, name);
+ #else
sprintf(path_name, "%s/%s", path, name);
+ #endif
file = fopen(path_name, mode);
if (file)
return file;
void surf_exit(void)
{
- int i;
+ unsigned int iter;
surf_model_t model = NULL;
- xbt_dynar_foreach(model_list, i, model) {
+ xbt_dynar_foreach(model_list, iter, model) {
model->common_private->finalize();
}
free(path_name);
path_name = NULL;
}
+ surf_parse_free_callbacks();
+ xbt_dict_free(&route_table);
NOW=0; /* Just in case the user plans to restart the simulation afterward */
xbt_exit();
}
surf_model_object_t model_obj = NULL;
surf_model_t model = NULL;
tmgr_trace_event_t event = NULL;
- int i;
+ unsigned int iter;
if (first_run) {
DEBUG0
update_resource_state(model_obj, event, value);
}
}
- xbt_dynar_foreach(model_list, i, model) {
+ xbt_dynar_foreach(model_list, iter, model) {
model->common_private->update_actions_state(NOW, 0.0);
}
first_run = 0;
min = -1.0;
DEBUG0("Looking for next action end");
- xbt_dynar_foreach(model_list, i, model) {
+ xbt_dynar_foreach(model_list, iter, model) {
DEBUG1("Running for Resource [%s]", model->common_public->name);
model_next_action_end =
model->common_private->share_resources(NOW);
NOW = NOW + min;
- xbt_dynar_foreach(model_list, i, model) {
+ xbt_dynar_foreach(model_list, iter, model) {
model->common_private->update_actions_state(NOW, min);
}