X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18063eeb619847565123bd64a8f017c932608fd2..dc623452c9774e898e5547d8aa3757d1621aeb75:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 4d8b6046cc..0d765d5790 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -25,7 +25,10 @@ void SD_init(int *argc, char **argv) { sd_global = xbt_new0(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->watch_point_reached = 0; s_SD_task_t task; @@ -67,17 +70,9 @@ void SD_create_environment(const char *platform_file) { surf_timer_resource_init(platform_file); /* tell Surf to create the environnement */ - - /*printf("surf_workstation_resource = %p, workstation_set = %p\n", surf_workstation_resource, workstation_set); - printf("surf_network_resource = %p, network_link_set = %p\n", surf_network_resource, network_link_set);*/ - /*surf_workstation_resource_init_KCCFLN05(platform_file);*/ surf_workstation_resource_init_CLM03(platform_file); - /*printf("surf_workstation_resource = %p, workstation_set = %p\n", surf_workstation_resource, workstation_set); - printf("surf_network_resource = %p, network_link_set = %p\n", surf_network_resource, network_link_set);*/ - - /* now let's create the SD wrappers for workstations and links */ xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) { __SD_workstation_create(surf_workstation, NULL); @@ -96,7 +91,7 @@ void SD_create_environment(const char *platform_file) { * when a watch point is reached, or when no more task can be executed. * Then you can call SD_simulate() again. * - * \param how_long maximum duration of the simulation + * \param how_long maximum duration of the simulation (a negative value means no time limit) * \return a NULL-terminated array of \ref SD_task_t whose state has changed. * \see SD_task_schedule(), SD_task_watch() */ @@ -129,8 +124,8 @@ 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)); - action = __SD_task_run(task); - surf_workstation_resource->common_public->action_set_data(action, 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 */ @@ -143,9 +138,14 @@ SD_task_t* SD_simulate(double how_long) /* main loop */ elapsed_time = 0.0; - while (elapsed_time >= 0.0 && total_time < how_long && !sd_global->watch_point_reached) { + while (elapsed_time >= 0.0 && + (how_long < 0.0 || total_time < how_long) && + !sd_global->watch_point_reached) { + + DEBUG1("Total time: %f", total_time); elapsed_time = surf_solve(); + DEBUG1("surf_solve() returns %f", elapsed_time); if (elapsed_time > 0.0) total_time += elapsed_time; @@ -154,6 +154,8 @@ SD_task_t* SD_simulate(double how_long) 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; /* the state has changed */ if (!task->state_changed) { @@ -175,8 +177,8 @@ 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)); - action = __SD_task_run(dst); - surf_workstation_resource->common_public->action_set_data(action, 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; @@ -194,6 +196,9 @@ SD_task_t* SD_simulate(double how_long) task = action->data; INFO1("Task '%s' failed", SD_task_get_name(task)); __SD_task_set_state(task, SD_FAILED); + surf_workstation_resource->common_public->action_free(action); + task->surf_action = NULL; + if (!task->state_changed) { task->state_changed = 1; changed_tasks[changed_task_number++] = task; @@ -214,13 +219,23 @@ SD_task_t* SD_simulate(double how_long) } INFO0("Simulation finished"); - printf("elapsed_time = %f, total_time = %f, watch_point_reached = %d\n", elapsed_time, total_time, sd_global->watch_point_reached); + DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d", elapsed_time, total_time, sd_global->watch_point_reached); + DEBUG1("current time = %f", surf_get_clock()); return changed_tasks; } /** - * \brief Destroys all SD internal data. + * \brief Returns the current clock + * + * \return the current clock, in second + */ +double SD_get_clock(void) { + return surf_get_clock(); +} + +/** + * \brief Destroys all SD internal data * * This function should be called when the simulation is over. Don't forget also to destroy * the tasks. @@ -229,10 +244,18 @@ SD_task_t* SD_simulate(double how_long) */ void SD_exit(void) { if (sd_global != NULL) { + DEBUG0("Destroying workstation and link dictionaries..."); xbt_dict_free(&sd_global->workstations); xbt_dict_free(&sd_global->links); - xbt_free(sd_global); + DEBUG0("Destroying workstation and link arrays if necessary..."); + if (sd_global->workstation_list != NULL) + xbt_free(sd_global->workstation_list); + + if (sd_global->link_list != NULL) + xbt_free(sd_global->link_list); + + 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); @@ -240,6 +263,9 @@ void SD_exit(void) { xbt_swag_free(sd_global->done_task_set); xbt_swag_free(sd_global->failed_task_set); + xbt_free(sd_global); + + DEBUG0("Exiting Surf..."); surf_exit(); } }