X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..56d873227b0d9a0254e04f63eaf6d76efdb0ef19:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 4d92bdd508..896e758c06 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -5,14 +5,15 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" +#include "instr/instr_interface.h" #include "xbt/sysdep.h" #include "xbt/dynar.h" #include "surf/surf.h" +#include "simgrid/sg_config.h" #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/str.h" #include "xbt/config.h" -#include "instr/instr_private.h" #include "surf/surfxml_parse.h" #ifdef HAVE_LUA #include @@ -30,12 +31,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, SD_global_t sd_global = NULL; -XBT_LOG_EXTERNAL_CATEGORY(sd_kernel); -XBT_LOG_EXTERNAL_CATEGORY(sd_task); -XBT_LOG_EXTERNAL_CATEGORY(sd_workstation); - /** - * \brief Initialises SD internal data + * \brief Initializes SD internal data * * This function must be called before any other SD function. Then you * should call SD_create_environment(). @@ -52,24 +49,16 @@ void SD_init(int *argc, char **argv) s_SD_task_t task; - xbt_assert0(!SD_INITIALISED(), "SD_init() already called"); - - /* Connect our log channels: that must be done manually under windows */ - XBT_LOG_CONNECT(sd_kernel, sd); - XBT_LOG_CONNECT(sd_task, sd); - XBT_LOG_CONNECT(sd_workstation, sd); - + xbt_assert(sd_global == NULL, "SD_init() already called"); 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; + 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 = @@ -86,11 +75,13 @@ 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); - xbt_cfg_setdefault_string(_surf_cfg_set, "workstation/model", + xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model", "ptask_L07"); #ifdef HAVE_TRACING @@ -100,6 +91,10 @@ void SD_init(int *argc, char **argv) #ifdef HAVE_JEDULE jedule_sd_init(); #endif + + XBT_DEBUG("ADD SD LEVELS"); + SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy); + SD_LINK_LEVEL = xbt_lib_add_level(link_lib,__SD_link_destroy); } /** @@ -119,53 +114,65 @@ 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; + SD_task_t done_task, next_done_task; -#ifdef HAVE_JEDULE - jedule_sd_cleanup(); - jedule_sd_init(); -#endif + 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->failed_task_set); - } else { - XBT_WARN("SD_application_reinit called before initialization of SimDag"); - /* we cannot use exceptions here because xbt is not running! */ + 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)); + xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){ + if (xbt_dynar_is_empty(done_task->tasks_before)){ + __SD_task_set_state(done_task, SD_SCHEDULABLE); + } else{ + __SD_task_set_state(done_task, SD_NOT_SCHEDULED); + done_task->unsatisfied_dependencies = + xbt_dynar_length(done_task->tasks_before); + done_task->is_not_ready = done_task->unsatisfied_dependencies; + } + free(done_task->workstation_list); + done_task->workstation_list = NULL; + done_task->workstation_nb = 0; } + xbt_swag_free(sd_global->done_task_set); + + 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_dump(); + jedule_sd_cleanup(); + jedule_sd_init(); +#endif } /** * \brief Creates the environment * - * The environment (i.e. the \ref SD_workstation_management "workstations" and the - * \ref SD_link_management "links") is created with the data stored in the given XML - * platform file. + * The environment (i.e. the \ref SD_workstation_management "workstations" + * and the \ref SD_link_management "links") is created with the data stored + * in the given XML platform file. * * \param platform_file name of an XML file describing the environment to create * \see SD_workstation_management, SD_link_management @@ -180,30 +187,22 @@ void SD_application_reinit(void) */ void SD_create_environment(const char *platform_file) { - xbt_dict_cursor_t cursor = NULL; + xbt_lib_cursor_t cursor = NULL; char *name = NULL; - void *surf_workstation = NULL; - void *surf_link = NULL; - - platform_filename = bprintf("%s",platform_file); + void **surf_workstation = NULL; + void **surf_link = NULL; - // 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(); /* now let's create the SD wrappers for workstations and links */ - xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor, - name, surf_workstation) { - __SD_workstation_create(surf_workstation, NULL); + xbt_lib_foreach(host_lib, cursor, name, surf_workstation){ + if(surf_workstation[SURF_WKS_LEVEL]) + __SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL); } - xbt_dict_foreach(surf_model_resource_set(surf_network_model), cursor, - name, surf_link) { - __SD_link_create(surf_link, NULL); + xbt_lib_foreach(link_lib, cursor, name, surf_link) { + if(surf_link[SURF_LINK_LEVEL]) + __SD_link_create(surf_link[SURF_LINK_LEVEL], NULL); } XBT_DEBUG("Workstation number: %d, link number: %d", @@ -219,49 +218,60 @@ void SD_create_environment(const char *platform_file) * The function will execute the \ref SD_RUNNABLE runnable tasks. * If \a how_long is positive, then the simulation will be stopped either * when time reaches \a how_long or when a watch point is reached. - * A nonpositive value for \a how_long means no time limit, in which case + * A non-positive value for \a how_long means no time limit, in which case * the simulation will be stopped either 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 (a negative value means no time limit) - * \return a NULL-terminated array of \ref SD_task_t whose state has changed. + * \return a dynar 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) { + if (first_time) { XBT_VERB("Starting simulation..."); surf_presolve(); /* Takes traces into account */ first_time = 0; } + XBT_VERB("Run simulation for %f seconds", how_long); sd_global->watch_point_reached = 0; + xbt_swag_reset(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 */ elapsed_time = 0.0; while (elapsed_time >= 0.0 && - (how_long < 0.0 || total_time < how_long) && + (how_long < 0.0 || 0.00001 < (how_long -total_time)) && !sd_global->watch_point_reached) { surf_model_t model = NULL; /* dumb variables */ @@ -269,7 +279,7 @@ xbt_dynar_t SD_simulate(double how_long) XBT_DEBUG("Total time: %f", total_time); - elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0); + elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long - total_time: -1.0); XBT_DEBUG("surf_solve() returns %f", elapsed_time); if (elapsed_time > 0.0) total_time += elapsed_time; @@ -289,8 +299,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) { @@ -300,6 +309,10 @@ xbt_dynar_t SD_simulate(double how_long) if (dst->is_not_ready > 0) dst->is_not_ready--; + XBT_DEBUG("Released a dependency on %s: %d remain(s). Became schedulable if %d=0", + SD_task_get_name(dst), dst->unsatisfied_dependencies, + dst->is_not_ready); + if (!(dst->unsatisfied_dependencies)) { if (__SD_task_is_scheduled(dst)) __SD_task_set_state(dst, SD_RUNNABLE); @@ -307,6 +320,10 @@ xbt_dynar_t SD_simulate(double how_long) __SD_task_set_state(dst, SD_SCHEDULABLE); } + if (__SD_task_is_not_scheduled(dst) && !(dst->is_not_ready)) { + __SD_task_set_state(dst, SD_SCHEDULABLE); + } + if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) { SD_dependency_t comm_dep; SD_task_t comm_dst; @@ -316,6 +333,10 @@ xbt_dynar_t SD_simulate(double how_long) comm_dst->is_not_ready > 0) { comm_dst->is_not_ready--; + XBT_DEBUG("%s is a transfer, %s may be ready now if %d=0", + SD_task_get_name(dst), SD_task_get_name(comm_dst), + comm_dst->is_not_ready); + if (!(comm_dst->is_not_ready)) { __SD_task_set_state(comm_dst, SD_SCHEDULABLE); } @@ -326,9 +347,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); } } } @@ -345,24 +365,24 @@ 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_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){ + 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)); - } - xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){ + } + xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){ XBT_WARN("%s is in SD_SCHEDULABLE state", SD_task_get_name(task)); - } - xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){ + } + xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){ XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task)); - } + } } } @@ -370,7 +390,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; } /** @@ -378,87 +398,55 @@ 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(); } /** * \brief Destroys all SD internal data * - * This function should be called when the simulation is over. Don't forget also to destroy - * the tasks. + * This function should be called when the simulation is over. Don't forget + * to destroy too. * * \see SD_init(), SD_task_destroy() */ void SD_exit(void) { #ifdef HAVE_TRACING - TRACE_surf_release(); + TRACE_surf_resource_utilization_release(); #endif - if (SD_INITIALISED()) { - XBT_DEBUG("Destroying workstation and link dictionaries..."); - xbt_dict_free(&sd_global->workstations); - xbt_dict_free(&sd_global->links); - - XBT_DEBUG("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); - - if (sd_global->recyclable_route != NULL) - xbt_free(sd_global->recyclable_route); - - 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_free(sd_global); - sd_global = NULL; + + xbt_mallocator_free(sd_global->task_mallocator); + + XBT_DEBUG("Destroying workstation and link arrays..."); + xbt_free(sd_global->workstation_list); + xbt_free(sd_global->link_list); + xbt_free(sd_global->recyclable_route); + + 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); #ifdef HAVE_TRACING TRACE_end(); #endif + + xbt_free(sd_global); + sd_global = NULL; + #ifdef HAVE_JEDULE jedule_sd_dump(); jedule_sd_cleanup(); + jedule_sd_exit(); #endif - XBT_DEBUG("Exiting Surf..."); - surf_exit(); - } 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 - */ - -void SD_load_environment_script(const char *script_file) -{ -#ifdef HAVE_LUA - lua_State *L = lua_open(); - luaL_openlibs(L); - - if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) { - printf("error: %s\n", lua_tostring(L, -1)); - return; - } -#else - xbt_die - ("Lua is not available!! to call SD_load_environment_script, lua should be available..."); -#endif - return; + XBT_DEBUG("Exiting Surf..."); + surf_exit(); }