X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/664dc244fe35c13d02c15d1d43a89b37bef56342..5606e02195f83d9e7809135223b01a71e0a0cc67:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 1688cacfd9..28398afd67 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -52,7 +52,7 @@ void SD_init(int *argc, char **argv) s_SD_task_t task; - xbt_assert0(!SD_INITIALISED(), "SD_init() already called"); + xbt_assert(sd_global == NULL, "SD_init() already called"); /* Connect our log channels: that must be done manually under windows */ XBT_LOG_CONNECT(sd_kernel, sd); @@ -66,6 +66,8 @@ void SD_init(int *argc, char **argv) sd_global->recyclable_route = NULL; sd_global->watch_point_reached = 0; + sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f,SD_task_free_f,SD_task_recycle_f); + sd_global->not_scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->schedulable_task_set = @@ -82,6 +84,8 @@ void SD_init(int *argc, char **argv) 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->return_set = + xbt_swag_new(xbt_swag_offset(task, return_hookup)); sd_global->task_number = 0; surf_init(argc, argv); @@ -119,45 +123,38 @@ void SD_application_reinit(void) s_SD_task_t task; - if (SD_INITIALISED()) { - XBT_DEBUG("Recreating the swags..."); - xbt_swag_free(sd_global->not_scheduled_task_set); - xbt_swag_free(sd_global->schedulable_task_set); - xbt_swag_free(sd_global->scheduled_task_set); - xbt_swag_free(sd_global->runnable_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); - - sd_global->not_scheduled_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->schedulable_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->runnable_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; + XBT_DEBUG("Recreating the swags..."); + xbt_swag_free(sd_global->not_scheduled_task_set); + xbt_swag_free(sd_global->schedulable_task_set); + xbt_swag_free(sd_global->scheduled_task_set); + xbt_swag_free(sd_global->runnable_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); + + sd_global->not_scheduled_task_set = + xbt_swag_new(xbt_swag_offset(task, state_hookup)); + sd_global->schedulable_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->runnable_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; #ifdef HAVE_JEDULE - jedule_sd_cleanup(); - jedule_sd_init(); + jedule_sd_cleanup(); + jedule_sd_init(); #endif - - } else { - XBT_WARN("SD_application_reinit called before initialization of SimDag"); - /* we cannot use exceptions here because xbt is not running! */ - } - } /** @@ -185,13 +182,11 @@ void SD_create_environment(const char *platform_file) void **surf_workstation = NULL; void **surf_link = NULL; - platform_filename = bprintf("%s",platform_file); - // Reset callbacks surf_parse_reset_callbacks(); // Add config callbacks surf_parse_add_callback_config(); - SD_CHECK_INIT_DONE(); + parse_platform_file(platform_file); surf_config_models_create_elms(); @@ -202,6 +197,7 @@ void SD_create_environment(const char *platform_file) } xbt_lib_foreach(link_lib, cursor, name, surf_link) { + if(surf_link[SURF_LINK_LEVEL]) __SD_link_create(surf_link[SURF_LINK_LEVEL], NULL); } @@ -227,34 +223,44 @@ void SD_create_environment(const char *platform_file) * \return a NULL-terminated array of \ref SD_task_t whose state has changed. * \see SD_task_schedule(), SD_task_watch() */ -xbt_dynar_t SD_simulate(double how_long) -{ + +xbt_dynar_t SD_simulate(double how_long) { + xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL); + SD_task_t task; + + SD_simulate_swag(how_long); + while( (task = xbt_swag_extract(sd_global->return_set)) != NULL) { + xbt_dynar_push(changed_tasks, &task); + } + + return changed_tasks; +} + +xbt_swag_t SD_simulate_swag(double how_long) { double total_time = 0.0; /* we stop the simulation when total_time >= how_long */ double elapsed_time = 0.0; SD_task_t task, task_safe, dst; SD_dependency_t dependency; surf_action_t action; - xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL); unsigned int iter, depcnt; static int first_time = 1; - SD_CHECK_INIT_DONE(); - if (first_time) { - XBT_VERB("Starting simulation..."); + XBT_VERB("Starting simulation..."); - surf_presolve(); /* Takes traces into account */ - first_time = 0; - } + surf_presolve(); /* Takes traces into account */ + first_time = 0; + } sd_global->watch_point_reached = 0; + while(xbt_swag_extract(sd_global->return_set)) {} + /* explore the runnable tasks */ xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) { XBT_VERB("Executing task '%s'", SD_task_get_name(task)); - if (__SD_task_try_to_run(task) - && !xbt_dynar_member(changed_tasks, &task)) - xbt_dynar_push(changed_tasks, &task); + if (__SD_task_try_to_run(task)) + xbt_swag_insert(task,sd_global->return_set); } /* main loop */ @@ -288,8 +294,7 @@ xbt_dynar_t SD_simulate(double how_long) SD_task_get_name(task)); /* the state has changed */ - if (!xbt_dynar_member(changed_tasks, &task)) - xbt_dynar_push(changed_tasks, &task); + xbt_swag_insert(task,sd_global->return_set); /* remove the dependencies after this task */ xbt_dynar_foreach(task->tasks_after, depcnt, dependency) { @@ -325,9 +330,8 @@ xbt_dynar_t SD_simulate(double how_long) if (__SD_task_is_runnable(dst) && !sd_global->watch_point_reached) { XBT_VERB("Executing task '%s'", SD_task_get_name(dst)); - if (__SD_task_try_to_run(dst) && - !xbt_dynar_member(changed_tasks, &task)) - xbt_dynar_push(changed_tasks, &task); + if (__SD_task_try_to_run(dst)) + xbt_swag_insert(dst,sd_global->return_set); } } } @@ -344,15 +348,15 @@ xbt_dynar_t SD_simulate(double how_long) surf_workstation_model->action_unref(action); task->surf_action = NULL; - if (!xbt_dynar_member(changed_tasks, &task)) - xbt_dynar_push(changed_tasks, &task); + xbt_swag_insert(task,sd_global->return_set); } } } if (!sd_global->watch_point_reached && how_long<0){ if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){ - XBT_WARN("Simulation is finished but some tasks are still not done"); + XBT_WARN("Simulation is finished but %d tasks are still not done", + (sd_global->task_number - xbt_swag_size(sd_global->done_task_set))); xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){ XBT_WARN("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task)); } @@ -369,7 +373,7 @@ xbt_dynar_t SD_simulate(double how_long) elapsed_time, total_time, sd_global->watch_point_reached); XBT_DEBUG("current time = %f", surf_get_clock()); - return changed_tasks; + return sd_global->return_set; } /** @@ -377,10 +381,7 @@ xbt_dynar_t SD_simulate(double how_long) * * \return the current clock, in second */ -double SD_get_clock(void) -{ - SD_CHECK_INIT_DONE(); - +double SD_get_clock(void) { return surf_get_clock(); } @@ -398,39 +399,34 @@ void SD_exit(void) TRACE_surf_release(); #endif - if (SD_INITIALISED()) { - XBT_DEBUG("Destroying workstation and link dictionaries..."); - - XBT_DEBUG("Destroying workstation and link arrays if necessary..."); - if (sd_global->workstation_list != NULL) - xbt_free(sd_global->workstation_list); + xbt_mallocator_free(sd_global->task_mallocator); - if (sd_global->link_list != NULL) - xbt_free(sd_global->link_list); + XBT_DEBUG("Destroying workstation and link arrays if necessary..."); + if (sd_global->workstation_list != NULL) + xbt_free(sd_global->workstation_list); - if (sd_global->recyclable_route != NULL) - xbt_free(sd_global->recyclable_route); + if (sd_global->link_list != NULL) + xbt_free(sd_global->link_list); - XBT_DEBUG("Destroying the swags..."); - xbt_swag_free(sd_global->not_scheduled_task_set); - xbt_swag_free(sd_global->schedulable_task_set); - xbt_swag_free(sd_global->scheduled_task_set); - xbt_swag_free(sd_global->runnable_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); + if (sd_global->recyclable_route != NULL) + xbt_free(sd_global->recyclable_route); - XBT_DEBUG("Exiting Surf..."); - surf_exit(); + XBT_DEBUG("Destroying the swags..."); + xbt_swag_free(sd_global->not_scheduled_task_set); + xbt_swag_free(sd_global->schedulable_task_set); + xbt_swag_free(sd_global->scheduled_task_set); + xbt_swag_free(sd_global->runnable_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_swag_free(sd_global->return_set); - // Exit the LIB host_lib - xbt_lib_free(&host_lib); - xbt_lib_free(&link_lib); - xbt_lib_free(&as_router_lib); + XBT_DEBUG("Exiting Surf..."); + surf_exit(); - xbt_free(sd_global); - sd_global = NULL; + xbt_free(sd_global); + sd_global = NULL; #ifdef HAVE_TRACING TRACE_end(); @@ -439,15 +435,10 @@ void SD_exit(void) jedule_sd_dump(); jedule_sd_cleanup(); #endif - - } else { - XBT_WARN("SD_exit() called, but SimDag is not running"); - /* we cannot use exceptions here because xbt is not running! */ - } } /** - * \bried load script file + * \brief load script file */ void SD_load_environment_script(const char *script_file)