X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc623452c9774e898e5547d8aa3757d1621aeb75..178d9ca3560ec4b1e756970b888b4e36212ce670:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 0d765d5790..21cda51923 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -20,24 +20,29 @@ 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 = xbt_new(s_SD_global_t, 1); sd_global->workstations = xbt_dict_new(); sd_global->workstation_count = 0; sd_global->workstation_list = NULL; 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)); + sd_global->task_number = 0; surf_init(argc, argv); } @@ -68,12 +73,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); } @@ -81,6 +90,8 @@ void SD_create_environment(const char *platform_file) { xbt_dict_foreach(network_link_set, cursor, name, surf_link) { __SD_link_create(surf_link, NULL); } + + DEBUG2("Workstation number: %d, link number: %d", SD_workstation_get_number(), SD_link_get_number()); } /** @@ -104,14 +115,16 @@ SD_task_t* SD_simulate(double how_long) surf_action_t action; SD_task_t *changed_tasks = NULL; int changed_task_number = 0; - int changed_task_capacity = 16; /* will be increased if necessary */ + int changed_task_capacity = sd_global->task_number + 1; int i; static int first_time = 1; + SD_CHECK_INIT_DONE(); + INFO0("Starting simulation..."); /* create the array that will be returned */ - changed_tasks = xbt_new0(SD_task_t, changed_task_capacity); + changed_tasks = xbt_new(SD_task_t, changed_task_capacity); changed_tasks[0] = NULL; if (first_time) { @@ -124,16 +137,16 @@ 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)); - task->surf_action = __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,18 +166,20 @@ 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) { task->state_changed = 1; changed_tasks[changed_task_number++] = 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; } @@ -177,16 +192,16 @@ 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; } } } @@ -202,10 +217,12 @@ SD_task_t* SD_simulate(double how_long) if (!task->state_changed) { task->state_changed = 1; changed_tasks[changed_task_number++] = 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; } } @@ -231,6 +248,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 +262,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 +274,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! */ + } }