X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7417d92e963c0d6ed8443454a56c85a3728d214..0de7df8a3bc351fdff4c4a3e106608b15c842143:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index c927951112..a73ce53abd 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -1,3 +1,9 @@ +/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "private.h" #include "xbt/sysdep.h" #include "xbt/dynar.h" @@ -6,6 +12,17 @@ #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 +#include +#include +#endif + +#ifdef HAVE_JEDULE +#include "instr/jedule/jedule_sd_binding.h" +#endif XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, @@ -13,14 +30,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, SD_global_t sd_global = NULL; -/* $Id$ */ - -/* Copyright (c) 2007 Arnaud Legrand. - All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - XBT_LOG_EXTERNAL_CATEGORY(sd_kernel); XBT_LOG_EXTERNAL_CATEGORY(sd_task); XBT_LOG_EXTERNAL_CATEGORY(sd_workstation); @@ -37,6 +46,9 @@ XBT_LOG_EXTERNAL_CATEGORY(sd_workstation); */ void SD_init(int *argc, char **argv) { +#ifdef HAVE_TRACING + TRACE_global_init(argc, argv); +#endif s_SD_task_t task; @@ -59,23 +71,35 @@ void SD_init(int *argc, char **argv) sd_global->watch_point_reached = 0; sd_global->not_scheduled_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + 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->ready_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + 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)); + xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->running_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->done_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->failed_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->task_number = 0; surf_init(argc, argv); - xbt_cfg_set_string(_surf_cfg_set, "workstation_model", "ptask_L07"); + + xbt_cfg_setdefault_string(_surf_cfg_set, "workstation/model", + "ptask_L07"); + +#ifdef HAVE_TRACING + TRACE_start (); +#endif + +#ifdef HAVE_JEDULE + jedule_sd_init(); +#endif } /** @@ -98,28 +122,37 @@ void SD_application_reinit(void) if (SD_INITIALISED()) { DEBUG0("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->ready_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)); + 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->ready_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + 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)); + xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->running_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->done_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->failed_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); + xbt_swag_new(xbt_swag_offset(task, state_hookup)); sd_global->task_number = 0; + +#ifdef HAVE_JEDULE + jedule_sd_cleanup(); + jedule_sd_init(); +#endif + } else { WARN0("SD_application_reinit called before initialization of SimDag"); /* we cannot use exceptions here because xbt is not running! */ @@ -152,14 +185,15 @@ void SD_create_environment(const char *platform_file) void *surf_workstation = NULL; void *surf_link = NULL; - SD_CHECK_INIT_DONE(); - - DEBUG0("SD_create_environment"); - - surf_timer_model_init(platform_file); - surf_config_models_setup(platform_file); + 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(); /* now let's create the SD wrappers for workstations and links */ xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor, @@ -167,57 +201,60 @@ void SD_create_environment(const char *platform_file) __SD_workstation_create(surf_workstation, NULL); } - xbt_dict_foreach(link_set, cursor, name, surf_link) { + xbt_dict_foreach(surf_model_resource_set(surf_network_model), 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()); +#ifdef HAVE_JEDULE + jedule_setup_platform(); +#endif } /** * \brief Launches the simulation. * - * The function will execute the \ref SD_READY ready tasks. - * The simulation will be stopped when its time reaches \a how_long, - * when a watch point is reached, or when no more task can be executed. + * 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 + * 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. * \see SD_task_schedule(), SD_task_watch() */ -SD_task_t *SD_simulate(double how_long) +xbt_dynar_t SD_simulate(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; - SD_task_t *res = NULL; xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL); - unsigned int iter; + unsigned int iter, depcnt; static int first_time = 1; SD_CHECK_INIT_DONE(); - INFO0("Starting simulation..."); + if (first_time) { + VERB0("Starting simulation..."); - if (first_time) { surf_presolve(); /* Takes traces into account */ first_time = 0; } - if (how_long > 0) { - surf_timer_model->extension.timer.set(surf_get_clock() + how_long, - NULL, NULL); - } sd_global->watch_point_reached = 0; - /* explore the ready tasks */ - xbt_swag_foreach_safe(task, task_safe, sd_global->ready_task_set) { - INFO1("Executing task '%s'", SD_task_get_name(task)); - if (__SD_task_try_to_run(task) && !xbt_dynar_member(changed_tasks, &task)) + /* explore the runnable tasks */ + xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) { + VERB1("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); } @@ -228,13 +265,11 @@ SD_task_t *SD_simulate(double how_long) !sd_global->watch_point_reached) { surf_model_t model = NULL; /* dumb variables */ - void *fun = NULL; - void *arg = NULL; DEBUG1("Total time: %f", total_time); - elapsed_time = surf_solve(); + elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0); DEBUG1("surf_solve() returns %f", elapsed_time); if (elapsed_time > 0.0) total_time += elapsed_time; @@ -243,7 +278,11 @@ SD_task_t *SD_simulate(double how_long) xbt_dynar_foreach(model_list, iter, model) { while ((action = xbt_swag_extract(model->states.done_action_set))) { task = action->data; - INFO1("Task '%s' done", SD_task_get_name(task)); + task->start_time = + surf_workstation_model-> + action_get_start_time(task->surf_action); + task->finish_time = surf_get_clock(); + VERB1("Task '%s' done", SD_task_get_name(task)); DEBUG0("Calling __SD_task_just_done"); __SD_task_just_done(task); DEBUG1("__SD_task_just_done called on task '%s'", @@ -254,14 +293,39 @@ SD_task_t *SD_simulate(double how_long) xbt_dynar_push(changed_tasks, &task); /* remove the dependencies after this task */ - while (xbt_dynar_length(task->tasks_after) > 0) { - xbt_dynar_get_cpy(task->tasks_after, 0, &dependency); + xbt_dynar_foreach(task->tasks_after, depcnt, dependency) { dst = dependency->dst; - SD_task_dependency_remove(task, dst); + if (dst->unsatisfied_dependencies > 0) + dst->unsatisfied_dependencies--; + if (dst->is_not_ready > 0) + dst->is_not_ready--; + + if (!(dst->unsatisfied_dependencies)) { + if (__SD_task_is_scheduled(dst)) + __SD_task_set_state(dst, SD_RUNNABLE); + else + __SD_task_set_state(dst, SD_SCHEDULABLE); + } - /* is dst ready now? */ - if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) { - INFO1("Executing task '%s'", SD_task_get_name(dst)); + if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) { + SD_dependency_t comm_dep; + SD_task_t comm_dst; + xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep); + comm_dst = comm_dep->dst; + if (__SD_task_is_not_scheduled(comm_dst) && + comm_dst->is_not_ready > 0) { + comm_dst->is_not_ready--; + + if (!(comm_dst->is_not_ready)) { + __SD_task_set_state(comm_dst, SD_SCHEDULABLE); + } + } + } + + /* is dst runnable now? */ + if (__SD_task_is_runnable(dst) + && !sd_global->watch_point_reached) { + VERB1("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); @@ -272,7 +336,11 @@ SD_task_t *SD_simulate(double how_long) /* let's see which tasks have just failed */ while ((action = xbt_swag_extract(model->states.failed_action_set))) { task = action->data; - INFO1("Task '%s' failed", SD_task_get_name(task)); + task->start_time = + surf_workstation_model-> + action_get_start_time(task->surf_action); + task->finish_time = surf_get_clock(); + VERB1("Task '%s' failed", SD_task_get_name(task)); __SD_task_set_state(task, SD_FAILED); surf_workstation_model->action_unref(action); task->surf_action = NULL; @@ -281,24 +349,28 @@ SD_task_t *SD_simulate(double how_long) xbt_dynar_push(changed_tasks, &task); } } - - while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) { - } } - res = xbt_new0(SD_task_t, (xbt_dynar_length(changed_tasks) + 1)); - - xbt_dynar_foreach(changed_tasks, iter, task) { - res[iter] = task; + if (!sd_global->watch_point_reached && how_long<0){ + if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){ + WARN0("Simulation is finished but some tasks are still not done"); + xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){ + WARN1("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task)); + } + xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){ + WARN1("%s is in SD_SCHEDULABLE state", SD_task_get_name(task)); + } + xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){ + WARN1("%s is in SD_SCHEDULED state", SD_task_get_name(task)); + } + } } - xbt_dynar_free(&changed_tasks); - INFO0("Simulation finished"); 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 res; + return changed_tasks; } /** @@ -323,6 +395,9 @@ double SD_get_clock(void) */ void SD_exit(void) { +#ifdef HAVE_TRACING + TRACE_surf_release(); +#endif if (SD_INITIALISED()) { DEBUG0("Destroying workstation and link dictionaries..."); xbt_dict_free(&sd_global->workstations); @@ -340,8 +415,9 @@ void SD_exit(void) DEBUG0("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->ready_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); @@ -350,6 +426,14 @@ void SD_exit(void) xbt_free(sd_global); sd_global = NULL; +#ifdef HAVE_TRACING + TRACE_end(); +#endif +#ifdef HAVE_JEDULE + jedule_sd_dump(); + jedule_sd_cleanup(); +#endif + DEBUG0("Exiting Surf..."); surf_exit(); } else { @@ -357,3 +441,24 @@ void SD_exit(void) /* 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; +}