X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d07e7725e5403b21d0cfab0a8fea8a1f30fcc8bf..af3b41997d9ed2ef3f15ae2bfe43b5f83ce77d90:/src/simdag/sd_global.cpp diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index bb652b3dce..e29ad4ba95 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -4,21 +4,145 @@ /* 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 "instr/instr_interface.h" #include "simgrid/sg_config.h" #include "simgrid/host.h" -#include "src/simdag/simdag_private.h" #include "src/surf/surf_interface.hpp" #include "simgrid/s4u/engine.hpp" - -#if HAVE_JEDULE -#include "simgrid/jedule/jedule_sd_binding.h" -#endif +#include "simdag_private.hpp" XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)"); -SD_global_t sd_global = nullptr; +simgrid::sd::Global *sd_global = nullptr; + +namespace simgrid{ +namespace sd{ +Global::Global(){ + watch_point_reached = false; + initial_tasks = new std::set(); + runnable_tasks = new std::set(); + completed_tasks = new std::set(); + return_set = new std::set(); +} + +Global::~Global(){ + delete initial_tasks; + delete runnable_tasks; + delete completed_tasks; + delete return_set; +} + +std::set* simulate(double how_long){ + XBT_VERB("Run simulation for %f seconds", how_long); + + sd_global->watch_point_reached = false; + sd_global->return_set->clear(); + + /* explore the runnable tasks */ + while(!sd_global->runnable_tasks->empty()) + SD_task_run(*(sd_global->runnable_tasks->begin())); + + double elapsed_time = 0.0; + double total_time = 0.0; + /* main loop */ + while (elapsed_time >= 0 && (how_long < 0 || 0.00001 < (how_long -total_time)) && !sd_global->watch_point_reached) { + surf_model_t model = nullptr; + + XBT_DEBUG("Total time: %f", total_time); + + 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; + + /* let's see which tasks are done */ + unsigned int iter; + xbt_dynar_foreach(all_existing_models, iter, model) { + surf_action_t action = surf_model_extract_done_action_set(model); + while (action != nullptr) { + SD_task_t task = static_cast(action->getData()); + XBT_VERB("Task '%s' done", SD_task_get_name(task)); + SD_task_set_state(task, SD_DONE); + + /* the state has changed. Add it only if it's the first change */ + if (sd_global->return_set->find(task) == sd_global->return_set->end()) + sd_global->return_set->insert(task); + + /* remove the dependencies after this task */ + for (auto succ : *task->successors) { + succ->predecessors->erase(task); + succ->inputs->erase(task); + XBT_DEBUG("Release dependency on %s: %zu remain(s). Becomes schedulable if %zu=0", SD_task_get_name(succ), + succ->predecessors->size()+succ->inputs->size(), succ->predecessors->size()); + + if (SD_task_get_state(succ) == SD_NOT_SCHEDULED && succ->predecessors->empty()) + SD_task_set_state(succ, SD_SCHEDULABLE); + + if (SD_task_get_state(succ) == SD_SCHEDULED && succ->predecessors->empty() && succ->inputs->empty()) + SD_task_set_state(succ, SD_RUNNABLE); + + if (SD_task_get_state(succ) == SD_RUNNABLE && !sd_global->watch_point_reached) + SD_task_run(succ); + } + task->successors->clear(); + + for (auto output : *task->outputs) { + output->start_time = task->finish_time; + output->predecessors->erase(task); + if (SD_task_get_state(output) == SD_SCHEDULED) + SD_task_set_state(output, SD_RUNNABLE); + else + SD_task_set_state(output, SD_SCHEDULABLE); + + SD_task_t comm_dst = *(output->successors->begin()); + if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->predecessors->empty()){ + XBT_DEBUG("%s is a transfer, %s may be ready now if %zu=0", + SD_task_get_name(output), SD_task_get_name(comm_dst), comm_dst->predecessors->size()); + SD_task_set_state(comm_dst, SD_SCHEDULABLE); + } + if (SD_task_get_state(output) == SD_RUNNABLE && !sd_global->watch_point_reached) + SD_task_run(output); + } + task->outputs->clear(); + action = surf_model_extract_done_action_set(model); + } + + /* let's see which tasks have just failed */ + action = surf_model_extract_failed_action_set(model); + while (action != nullptr) { + SD_task_t task = static_cast(action->getData()); + XBT_VERB("Task '%s' failed", SD_task_get_name(task)); + SD_task_set_state(task, SD_FAILED); + sd_global->return_set->insert(task); + action = surf_model_extract_failed_action_set(model); + } + } + } + + if (!sd_global->watch_point_reached && how_long < 0 && !sd_global->initial_tasks->empty()) { + XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks->size()); + for (auto t : *sd_global->initial_tasks) + XBT_WARN("%s is in %s state", SD_task_get_name(t), __get_state_name(SD_task_get_state(t))); + } + + XBT_DEBUG("elapsed_time = %f, total_time = %f, watch_point_reached = %d", + elapsed_time, total_time, sd_global->watch_point_reached); + XBT_DEBUG("current time = %f", surf_get_clock()); + + return sd_global->return_set; +} +} +} + +/** + * \brief helper for pretty printing of task state + * \param state the state of a task + * \return the equivalent as a readable string + */ +const char *__get_state_name(e_SD_task_state_t state){ + std::string state_names[7] = { "not scheduled", "schedulable", "scheduled", "runnable","running", "done", "failed" }; + return state_names[static_cast(log2(static_cast(state)))].data(); +} /** * \brief Initializes SD internal data @@ -31,19 +155,9 @@ SD_global_t sd_global = nullptr; */ void SD_init(int *argc, char **argv) { - TRACE_global_init(argc, argv); - xbt_assert(sd_global == nullptr, "SD_init() already called"); - sd_global = xbt_new(s_SD_global_t, 1); - 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->initial_tasks = new std::set(); - sd_global->executable_tasks = new std::set(); - sd_global->completed_tasks = new std::set(); - sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), nullptr); + sd_global = new simgrid::sd::Global(); surf_init(argc, argv); @@ -92,7 +206,7 @@ void SD_create_environment(const char *platform_file) { simgrid::s4u::Engine::instance()->loadPlatform(platform_file); - XBT_DEBUG("Workstation number: %zu, link number: %d", sg_host_count(), sg_link_count()); + XBT_DEBUG("Host number: %zu, link number: %d", sg_host_count(), sg_link_count()); #if HAVE_JEDULE jedule_setup_platform(); #endif @@ -116,137 +230,11 @@ void SD_create_environment(const char *platform_file) */ xbt_dynar_t SD_simulate(double how_long) { - /* we stop the simulation when total_time >= how_long */ - double total_time = 0.0; - SD_task_t task, dst; - SD_dependency_t dependency; - surf_action_t action; - unsigned int iter, depcnt; - - XBT_VERB("Run simulation for %f seconds", how_long); - sd_global->watch_point_reached = 0; - - xbt_dynar_reset(sd_global->return_set); - - /* explore the runnable tasks */ - std::set::iterator it=sd_global->executable_tasks->begin(); - while(it != sd_global->executable_tasks->end()){ - task = *it; - it++; - XBT_VERB("Executing task '%s'", SD_task_get_name(task)); - SD_task_run(task); - xbt_dynar_push(sd_global->return_set, &task); - } - - /* main loop */ - double elapsed_time = 0.0; - while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) && - !sd_global->watch_point_reached) { - surf_model_t model = nullptr; - - XBT_DEBUG("Total time: %f", total_time); - - 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; - - /* let's see which tasks are done */ - xbt_dynar_foreach(all_existing_models, iter, model) { - while ((action = surf_model_extract_done_action_set(model))) { - task = static_cast(action->getData()); - task->start_time = task->surf_action->getStartTime(); - - task->finish_time = surf_get_clock(); - XBT_VERB("Task '%s' done", SD_task_get_name(task)); - SD_task_set_state(task, SD_DONE); - task->surf_action->unref(); - task->surf_action = nullptr; - - /* the state has changed. Add it only if it's the first change */ - if (xbt_dynar_member(sd_global->return_set, &task) == 0) { - xbt_dynar_push(sd_global->return_set, &task); - } - - /* remove the dependencies after this task */ - xbt_dynar_foreach(task->tasks_after, depcnt, dependency) { - dst = dependency->dst; - dst->unsatisfied_dependencies--; - 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 == 0) { - if (SD_task_get_state(dst) == SD_SCHEDULED) - SD_task_set_state(dst, SD_RUNNABLE); - else - SD_task_set_state(dst, SD_SCHEDULABLE); - } - - if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && dst->is_not_ready == 0) { - 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; - xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep); - comm_dst = comm_dep->dst; - if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && 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 == 0) { - SD_task_set_state(comm_dst, SD_SCHEDULABLE); - } - } - } - - /* is dst runnable now? */ - if (SD_task_get_state(dst) == SD_RUNNABLE && !sd_global->watch_point_reached) { - XBT_VERB("Executing task '%s'", SD_task_get_name(dst)); - SD_task_run(dst); - xbt_dynar_push(sd_global->return_set, &dst); - } - } - } - - /* let's see which tasks have just failed */ - while ((action = surf_model_extract_failed_action_set(model))) { - task = static_cast(action->getData()); - task->start_time = task->surf_action->getStartTime(); - task->finish_time = surf_get_clock(); - XBT_VERB("Task '%s' failed", SD_task_get_name(task)); - SD_task_set_state(task, SD_FAILED); - action->unref(); - task->surf_action = nullptr; - - xbt_dynar_push(sd_global->return_set, &task); - } - } - } - - if (!sd_global->watch_point_reached && how_long<0 && !sd_global->initial_tasks->empty()) { - XBT_WARN("Simulation is finished but %zu tasks are still not done", - sd_global->initial_tasks->size()); - static const char* state_names[] = - { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "SD_RUNNING", "SD_DONE","SD_FAILED" }; - for (std::set::iterator it=sd_global->initial_tasks->begin(); - it!=sd_global->initial_tasks->end(); ++it){ - task = *it; - XBT_WARN("%s is in %s state", SD_task_get_name(task), state_names[SD_task_get_state(task)]); - } - } - - XBT_DEBUG("elapsed_time = %f, total_time = %f, watch_point_reached = %d", - elapsed_time, total_time, sd_global->watch_point_reached); - XBT_DEBUG("current time = %f", surf_get_clock()); - - return sd_global->return_set; + std::set *changed_tasks = simgrid::sd::simulate(how_long); + xbt_dynar_t changed_tasks_dynar = xbt_dynar_new(sizeof(SD_task_t), nullptr); + for (auto task: *changed_tasks) + xbt_dynar_push(changed_tasks_dynar, &task); + return changed_tasks_dynar; } /** @brief Returns the current clock, in seconds */ @@ -256,25 +244,14 @@ double SD_get_clock() { /** * \brief Destroys all SD internal data - * * 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() { - TRACE_surf_resource_utilization_release(); - #if HAVE_JEDULE jedule_sd_cleanup(); jedule_sd_exit(); #endif - - xbt_mallocator_free(sd_global->task_mallocator); - delete sd_global->initial_tasks; - delete sd_global->executable_tasks; - delete sd_global->completed_tasks; - xbt_dynar_free_container(&(sd_global->return_set)); - xbt_free(sd_global); - sd_global = nullptr; + delete sd_global; }