X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8781b2b94b359245595de3eb6d14d38b9a420e4..e727abe62548b7e41e373141953030d1186cb1fb:/src/simdag/sd_global.c?ds=sidebyside diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 48aea2f910..aea07a142d 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -20,7 +20,9 @@ SD_global_t sd_global = NULL; * \see SD_create_environment(), SD_exit() */ void SD_init(int *argc, char **argv) { - xbt_assert0(sd_global == NULL, "SD_init already called"); + if (SD_INITIALISED()) { + xbt_assert0(0, "SD_init() already called"); + } sd_global = xbt_new0(s_SD_global_t, 1); sd_global->workstations = xbt_dict_new(); @@ -29,12 +31,14 @@ void SD_init(int *argc, char **argv) { sd_global->links = xbt_dict_new(); sd_global->link_count = 0; sd_global->link_list = NULL; + sd_global->recyclable_route = NULL; sd_global->watch_point_reached = 0; s_SD_task_t task; sd_global->not_scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->ready_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); + sd_global->in_fifo_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->running_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->done_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->failed_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); @@ -68,12 +72,16 @@ void SD_create_environment(const char *platform_file) { SD_CHECK_INIT_DONE(); + DEBUG0("SD_create_environment"); + surf_timer_resource_init(platform_file); /* tell Surf to create the environnement */ - /*surf_workstation_resource_init_KCCFLN05(platform_file);*/ - surf_workstation_resource_init_CLM03(platform_file); + DEBUG0("Calling surf_workstation_resource_init"); + surf_workstation_resource_init_KCCFLN05(platform_file); + /* surf_workstation_resource_init_CLM03(platform_file); */ /* now let's create the SD wrappers for workstations and links */ + DEBUG0("Creating SimDags hosts and links"); xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) { __SD_workstation_create(surf_workstation, NULL); } @@ -108,6 +116,8 @@ SD_task_t* SD_simulate(double how_long) int i; static int first_time = 1; + SD_CHECK_INIT_DONE(); + INFO0("Starting simulation..."); /* create the array that will be returned */ @@ -124,16 +134,14 @@ SD_task_t* SD_simulate(double how_long) /* explore the ready tasks */ xbt_swag_foreach(task, sd_global->ready_task_set) { INFO1("Executing task '%s'", SD_task_get_name(task)); - __SD_task_run(task); - surf_workstation_resource->common_public->action_set_data(task->surf_action, task); - task->state_changed = 1; - - changed_tasks[changed_task_number++] = task; /* replace NULL by the task */ - if (changed_task_number == changed_task_capacity) { - changed_task_capacity *= 2; - changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity); + if ((task->state_changed = __SD_task_try_to_run(task))) { + changed_tasks[changed_task_number++] = task; /* replace NULL by the task */ + if (changed_task_number == changed_task_capacity) { + changed_task_capacity *= 2; + changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity); + } + changed_tasks[changed_task_number] = NULL; } - changed_tasks[changed_task_number] = NULL; } /* main loop */ @@ -153,9 +161,9 @@ SD_task_t* SD_simulate(double how_long) while ((action = xbt_swag_extract(surf_workstation_resource->common_public->states.done_action_set))) { task = action->data; INFO1("Task '%s' done", SD_task_get_name(task)); - __SD_task_set_state(task, SD_DONE); - surf_workstation_resource->common_public->action_free(action); - task->surf_action = NULL; + DEBUG0("Calling __SD_task_just_done"); + __SD_task_just_done(task); + DEBUG1("__SD_task_just_done called on task '%s'", SD_task_get_name(task)); /* the state has changed */ if (!task->state_changed) { @@ -177,16 +185,14 @@ SD_task_t* SD_simulate(double how_long) /* is dst ready now? */ if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) { INFO1("Executing task '%s'", SD_task_get_name(dst)); - dst->surf_action = __SD_task_run(dst); - surf_workstation_resource->common_public->action_set_data(dst->surf_action, dst); - dst->state_changed = 1; - - changed_tasks[changed_task_number++] = dst; - if (changed_task_number == changed_task_capacity) { - changed_task_capacity *= 2; - changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity); + if (__SD_task_try_to_run(dst)) { + changed_tasks[changed_task_number++] = dst; + if (changed_task_number == changed_task_capacity) { + changed_task_capacity *= 2; + changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity); + } + changed_tasks[changed_task_number] = NULL; } - changed_tasks[changed_task_number] = NULL; } } } @@ -231,6 +237,8 @@ SD_task_t* SD_simulate(double how_long) * \return the current clock, in second */ double SD_get_clock(void) { + SD_CHECK_INIT_DONE(); + return surf_get_clock(); } @@ -243,7 +251,7 @@ double SD_get_clock(void) { * \see SD_init(), SD_task_destroy() */ void SD_exit(void) { - if (sd_global != NULL) { + if (SD_INITIALISED()) { DEBUG0("Destroying workstation and link dictionaries..."); xbt_dict_free(&sd_global->workstations); xbt_dict_free(&sd_global->links); @@ -255,17 +263,26 @@ void SD_exit(void) { if (sd_global->link_list != NULL) xbt_free(sd_global->link_list); + if (sd_global->recyclable_route != NULL) + xbt_free(sd_global->recyclable_route); + DEBUG0("Destroying the swags..."); xbt_swag_free(sd_global->not_scheduled_task_set); xbt_swag_free(sd_global->scheduled_task_set); xbt_swag_free(sd_global->ready_task_set); + xbt_swag_free(sd_global->in_fifo_task_set); xbt_swag_free(sd_global->running_task_set); xbt_swag_free(sd_global->done_task_set); xbt_swag_free(sd_global->failed_task_set); xbt_free(sd_global); + sd_global = NULL; DEBUG0("Exiting Surf..."); surf_exit(); } + else { + fprintf(stderr, "Warning: SD_exit() called while SimDag was not running\n"); + /* we cannot use exceptions here because xbt is not running! */ + } }