X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6cf3e5a62a7a4a685ddce69bac69d71fe0966a86..cbedb536b5462febbf3ccff143ce5e298a983b87:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 2931aa46a7..5c5539805a 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2006-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,6 +10,7 @@ #include "xbt/dynar.h" #include "surf/surf.h" #include "simgrid/sg_config.h" +#include "simgrid/host.h" #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/str.h" @@ -32,7 +33,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, SD_global_t sd_global = NULL; /** - * \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(). @@ -43,9 +44,7 @@ SD_global_t sd_global = NULL; */ void SD_init(int *argc, char **argv) { -#ifdef HAVE_TRACING TRACE_global_init(argc, argv); -#endif s_SD_task_t task; @@ -81,22 +80,35 @@ void SD_init(int *argc, char **argv) surf_init(argc, argv); - xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model", + xbt_cfg_setdefault_string(_sg_cfg_set, "host/model", "ptask_L07"); -#ifdef HAVE_TRACING - TRACE_start (); -#endif - #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); + SD_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,__SD_storage_destroy); + + if (_sg_cfg_exit_asap) { + SD_exit(); + exit(0); + } } +/** \brief set a configuration variable + * + * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options. + * + * Example: + * SD_config("host/model","default"); + */ +void SD_config(const char *key, const char *value){ + xbt_assert(sd_global,"ERROR: Please call SD_init() before using SD_config()"); + xbt_cfg_set_as_string(_sg_cfg_set, key, value); +} + + /** * \brief Reinits the application part of the simulation (experimental feature) * @@ -114,20 +126,38 @@ void SD_application_reinit(void) s_SD_task_t task; - XBT_DEBUG("Recreating the swags..."); + SD_task_t done_task, next_done_task; + xbt_die("This function is not working since the C++ links and others. Please report the problem if you really need that function."); + + 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)); + 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 = @@ -142,7 +172,9 @@ void SD_application_reinit(void) 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 @@ -151,9 +183,9 @@ void SD_application_reinit(void) /** * \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 @@ -170,22 +202,25 @@ void SD_create_environment(const char *platform_file) { xbt_lib_cursor_t cursor = NULL; char *name = NULL; - void **surf_workstation = NULL; - void **surf_link = NULL; + void **surf_storage = NULL; parse_platform_file(platform_file); - /* now let's create the SD wrappers for workstations and links */ - xbt_lib_foreach(host_lib, cursor, name, surf_workstation){ - if(surf_workstation[SURF_WKS_LEVEL]) - __SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL); + /* now let's create the SD wrappers for workstations, storages and links */ + { + xbt_dict_cursor_t cursor = NULL; + simgrid_Host* host = NULL; + xbt_dict_foreach(host_list, cursor, name, host){ + __SD_workstation_create((const char*)name); + } } - 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_lib_foreach(storage_lib, cursor, name, surf_storage) { + if(surf_storage[SURF_STORAGE_LEVEL]) + __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL); } + XBT_DEBUG("Workstation number: %d, link number: %d", SD_workstation_get_number(), SD_link_get_number()); #ifdef HAVE_JEDULE @@ -199,7 +234,7 @@ 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. @@ -266,12 +301,11 @@ xbt_swag_t SD_simulate_swag(double how_long) { total_time += elapsed_time; /* let's see which tasks are done */ - xbt_dynar_foreach(model_list, iter, model) { - while ((action = xbt_swag_extract(model->states.done_action_set))) { - task = action->data; - task->start_time = - surf_workstation_model-> - action_get_start_time(task->surf_action); + xbt_dynar_foreach(all_existing_models, iter, model) { + while ((action = surf_model_extract_done_action_set(model))) { + task = surf_action_get_data(action); + task->start_time = surf_action_get_start_time(task->surf_action); + task->finish_time = surf_get_clock(); XBT_VERB("Task '%s' done", SD_task_get_name(task)); XBT_DEBUG("Calling __SD_task_just_done"); @@ -290,6 +324,10 @@ xbt_swag_t SD_simulate_swag(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); @@ -297,6 +335,10 @@ xbt_swag_t SD_simulate_swag(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; @@ -306,6 +348,10 @@ xbt_swag_t SD_simulate_swag(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); } @@ -323,15 +369,13 @@ xbt_swag_t SD_simulate_swag(double how_long) { } /* let's see which tasks have just failed */ - while ((action = xbt_swag_extract(model->states.failed_action_set))) { - task = action->data; - task->start_time = - surf_workstation_model-> - action_get_start_time(task->surf_action); + while ((action = surf_model_extract_failed_action_set(model))) { + task = surf_action_get_data(action); + task->start_time = surf_action_get_start_time(task->surf_action); task->finish_time = surf_get_clock(); XBT_VERB("Task '%s' failed", SD_task_get_name(task)); __SD_task_set_state(task, SD_FAILED); - surf_workstation_model->action_unref(action); + surf_action_unref(action); task->surf_action = NULL; xbt_swag_insert(task,sd_global->return_set); @@ -374,16 +418,14 @@ double SD_get_clock(void) { /** * \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_resource_utilization_release(); -#endif xbt_mallocator_free(sd_global->task_mallocator); @@ -403,12 +445,7 @@ void SD_exit(void) xbt_swag_free(sd_global->failed_task_set); xbt_swag_free(sd_global->return_set); -#ifdef HAVE_TRACING TRACE_end(); -#endif - - XBT_DEBUG("Exiting Surf..."); - surf_exit(); xbt_free(sd_global); sd_global = NULL; @@ -416,26 +453,9 @@ void SD_exit(void) #ifdef HAVE_JEDULE jedule_sd_dump(); jedule_sd_cleanup(); + jedule_sd_exit(); #endif -} -/** - * \brief 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(); }