X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5bacb2f99189b15a7c740a26b395e7886c41f7e..d0ffc37686edcc803601f76ab51fdfed5fc2f241:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 915cb50254..59273864c4 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-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -95,8 +95,27 @@ void SD_init(int *argc, char **argv) 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("workstation/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 +133,37 @@ void SD_application_reinit(void) s_SD_task_t task; - XBT_DEBUG("Recreating the swags..."); + SD_task_t done_task, next_done_task; + + 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 +178,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 @@ -172,10 +210,11 @@ void SD_create_environment(const char *platform_file) 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 */ + /* now let's create the SD wrappers for workstations, storages 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); @@ -186,6 +225,12 @@ void SD_create_environment(const char *platform_file) __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 @@ -267,11 +312,10 @@ xbt_swag_t SD_simulate_swag(double how_long) { /* 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); + while ((action = xbt_swag_extract(surf_model_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"); @@ -335,15 +379,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 = xbt_swag_extract(surf_model_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); @@ -419,35 +461,15 @@ void SD_exit(void) TRACE_end(); #endif - XBT_DEBUG("Exiting Surf..."); - surf_exit(); - xbt_free(sd_global); sd_global = NULL; #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(); }