X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2aaadd437ac30adad539d969164098b50cd2338..b94ef9f53ddfc2ac1f56fee3e5b1962da78cafe9:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index ca6d7bf0a5..618ee85353 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "mc/mc.h" +#include "simgrid/kernel/Timer.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "src/smpi/include/smpi_actor.hpp" @@ -39,7 +40,7 @@ namespace simgrid { namespace simix { config::Flag cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true}; -void* simix_global_get_actors_addr() +xbt_dynar_t simix_global_get_actors_addr() { #if SIMGRID_HAVE_MC return simix_global->actors_vector; @@ -47,7 +48,7 @@ void* simix_global_get_actors_addr() xbt_die("This function is intended to be used when compiling with MC"); #endif } -void* simix_global_get_dead_actors_addr() +xbt_dynar_t simix_global_get_dead_actors_addr() { #if SIMGRID_HAVE_MC return simix_global->dead_actors_vector; @@ -148,20 +149,6 @@ static void install_segvhandler() namespace simgrid { namespace simix { -Timer* Timer::set(double date, xbt::Task&& callback) -{ - auto* timer = new Timer(date, std::move(callback)); - timer->handle_ = simix_timers().emplace(std::make_pair(date, timer)); - return timer; -} - -/** @brief cancels a timer that was added earlier */ -void Timer::remove() -{ - simix_timers().erase(handle_); - delete this; -} - /** Execute all the tasks that are queued, e.g. `.then()` callbacks of futures. */ bool Global::execute_tasks() { @@ -263,14 +250,12 @@ void Global::display_all_actor_status() const (xbt_log_no_loc ? (size_t)0xDEADBEEF : (size_t)actor->waiting_synchro_.get()), actor->waiting_synchro_->get_cname(), (int)actor->waiting_synchro_->state_); } else { - XBT_INFO("Actor %ld (%s@%s) simcall %s", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname(), SIMIX_simcall_name(actor->simcall_.call_)); - + XBT_INFO("Actor %ld (%s@%s) simcall %s", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname(), + SIMIX_simcall_name(actor->simcall_)); } } } -config::Flag cfg_breakpoint{"debug/breakpoint", - "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; } // namespace simix } // namespace simgrid @@ -359,9 +344,9 @@ void SIMIX_clean() /* Exit the SIMIX network module */ SIMIX_mailbox_exit(); - while (not simgrid::simix::simix_timers().empty()) { - delete simgrid::simix::simix_timers().top().second; - simgrid::simix::simix_timers().pop(); + while (not simgrid::kernel::timer::kernel_timers().empty()) { + delete simgrid::kernel::timer::kernel_timers().top().second; + simgrid::kernel::timer::kernel_timers().pop(); } /* Free the remaining data structures */ simix_global->actors_to_run.clear(); @@ -401,193 +386,19 @@ double SIMIX_get_clock() } } -/** Handle any pending timer. Returns if something was actually run. */ -static bool SIMIX_execute_timers() +void SIMIX_run() // XBT_ATTRIB_DEPRECATED_v332 { - bool result = false; - while (not simgrid::simix::simix_timers().empty() && - SIMIX_get_clock() >= simgrid::simix::simix_timers().top().first) { - result = true; - // FIXME: make the timers being real callbacks (i.e. provide dispatchers that read and expand the args) - smx_timer_t timer = simgrid::simix::simix_timers().top().second; - simgrid::simix::simix_timers().pop(); - timer->callback(); - delete timer; - } - return result; -} - -/** - * @ingroup SIMIX_API - * @brief Run the main simulation loop. - */ -void SIMIX_run() -{ - if (MC_record_replay_is_active()) { - simgrid::mc::replay(MC_record_path()); - return; - } - - double time = 0; - - do { - XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->actors_to_run.size()); - - if (simgrid::simix::cfg_breakpoint >= 0.0 && surf_get_clock() >= simgrid::simix::cfg_breakpoint) { - XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::cfg_breakpoint.get()); - simgrid::simix::cfg_breakpoint = -1.0; -#ifdef SIGTRAP - std::raise(SIGTRAP); -#else - std::raise(SIGABRT); -#endif - } - - simix_global->execute_tasks(); - - while (not simix_global->actors_to_run.empty()) { - XBT_DEBUG("New Sub-Schedule Round; size(queue)=%zu", simix_global->actors_to_run.size()); - - /* Run all processes that are ready to run, possibly in parallel */ - simix_global->run_all_actors(); - - /* answer sequentially and in a fixed arbitrary order all the simcalls that were issued during that sub-round */ - - /* WARNING, the order *must* be fixed or you'll jeopardize the simulation reproducibility (see RR-7653) */ - - /* Here, the order is ok because: - * - * Short proof: only maestro adds stuff to the actors_to_run array, so the execution order of user contexts do - * not impact its order. - * - * Long proof: actors remain sorted through an arbitrary (implicit, complex but fixed) order in all cases. - * - * - if there is no kill during the simulation, actors remain sorted according by their PID. - * Rationale: This can be proved inductively. - * Assume that actors_to_run is sorted at a beginning of one round (it is at round 0: the deployment file - * is parsed linearly). - * Let's show that it is still so at the end of this round. - * - if an actor is added when being created, that's from maestro. It can be either at startup - * time (and then in PID order), or in response to a process_create simcall. Since simcalls are handled - * in arbitrary order (inductive hypothesis), we are fine. - * - If an actor is added because it's getting killed, its subsequent actions shouldn't matter - * - If an actor gets added to actors_to_run because one of their blocking action constituting the meat - * of a simcall terminates, we're still good. Proof: - * - You are added from ActorImpl::simcall_answer() only. When this function is called depends on the - * resource kind (network, cpu, disk, whatever), but the same arguments hold. Let's take communications - * as an example. - * - For communications, this function is called from SIMIX_comm_finish(). - * This function itself don't mess with the order since simcalls are handled in FIFO order. - * The function is called: - * - before the comm starts (invalid parameters, or resource already dead or whatever). - * The order then trivial holds since maestro didn't interrupt its handling of the simcall yet - * - because the communication failed or were canceled after startup. In this case, it's called from - * the function we are in, by the chunk: - * set = model->states.failed_action_set; - * while ((synchro = extract(set))) - * SIMIX_simcall_post((smx_synchro_t) synchro->data); - * This order is also fixed because it depends of the order in which the surf actions were - * added to the system, and only maestro can add stuff this way, through simcalls. - * We thus use the inductive hypothesis once again to conclude that the order in which synchros are - * popped out of the set does not depend on the user code's execution order. - * - because the communication terminated. In this case, synchros are served in the order given by - * set = model->states.done_action_set; - * while ((synchro = extract(set))) - * SIMIX_simcall_post((smx_synchro_t) synchro->data); - * and the argument is very similar to the previous one. - * So, in any case, the orders of calls to CommImpl::finish() do not depend on the order in which user - * actors are executed. - * So, in any cases, the orders of actors within actors_to_run do not depend on the order in which - * user actors were executed previously. - * So, if there is no killing in the simulation, the simulation reproducibility is not jeopardized. - * - If there is some actor killings, the order is changed by this decision that comes from user-land - * But this decision may not have been motivated by a situation that were different because the simulation is - * not reproducible. - * So, even the order change induced by the actor killing is perfectly reproducible. - * - * So science works, bitches [http://xkcd.com/54/]. - * - * We could sort the actors_that_ran array completely so that we can describe the order in which simcalls are - * handled (like "according to the PID of issuer"), but it's not mandatory (order is fixed already even if - * unfriendly). - * That would thus be a pure waste of time. - */ - - for (auto const& actor : simix_global->actors_that_ran) { - if (actor->simcall_.call_ != simgrid::simix::Simcall::NONE) { - actor->simcall_handle(0); - } - } - - simix_global->execute_tasks(); - do { - simix_global->wake_all_waiting_actors(); - } while (simix_global->execute_tasks()); - - /* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */ - if (simix_global->process_list.size() == simix_global->daemons.size()) - for (auto const& dmon : simix_global->daemons) { - XBT_DEBUG("Kill %s", dmon->get_cname()); - simix_global->maestro_->kill(dmon); - } - } - - time = simgrid::simix::Timer::next(); - if (time > -1.0 || not simix_global->process_list.empty()) { - XBT_DEBUG("Calling surf_solve"); - time = surf_solve(time); - XBT_DEBUG("Moving time ahead : %g", time); - } - - /* Notify all the hosts that have failed */ - /* FIXME: iterate through the list of failed host and mark each of them */ - /* as failed. On each host, signal all the running processes with host_fail */ - - // Execute timers and tasks until there isn't anything to be done: - bool again = false; - do { - again = SIMIX_execute_timers(); - if (simix_global->execute_tasks()) - again = true; - simix_global->wake_all_waiting_actors(); - } while (again); - - /* Clean actors to destroy */ - simix_global->empty_trash(); - - XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(), - simix_global->actors_to_run.size()); - - if (time < 0. && simix_global->actors_to_run.empty() && not simix_global->process_list.empty()) { - if (simix_global->process_list.size() <= simix_global->daemons.size()) { - XBT_CRITICAL("Oops! Daemon actors cannot do any blocking activity (communications, synchronization, etc) " - "once the simulation is over. Please fix your on_exit() functions."); - } else { - XBT_CRITICAL("Oops! Deadlock or code not perfectly clean."); - } - simix_global->display_all_actor_status(); - simgrid::s4u::Engine::on_deadlock(); - for (auto const& kv : simix_global->process_list) { - XBT_DEBUG("Kill %s", kv.second->get_cname()); - simix_global->maestro_->kill(kv.second); - } - } - } while (time > -1.0 || not simix_global->actors_to_run.empty()); - - if (not simix_global->process_list.empty()) - THROW_IMPOSSIBLE; - - simgrid::s4u::Engine::on_simulation_end(); + simgrid::kernel::EngineImpl::get_instance()->run(); } double SIMIX_timer_next() // XBT_ATTRIB_DEPRECATED_v329 { - return simgrid::simix::Timer::next(); + return simgrid::kernel::timer::Timer::next(); } smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void* arg) // XBT_ATTRIB_DEPRECATED_v329 { - return simgrid::simix::Timer::set(date, std::bind(callback, arg)); + return simgrid::kernel::timer::Timer::set(date, std::bind(callback, arg)); } /** @brief cancels a timer that was added earlier */ @@ -599,7 +410,7 @@ void SIMIX_timer_remove(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */ double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 { - return timer ? timer->date : 0.0; + return timer ? timer->get_date() : 0.0; } void SIMIX_display_process_status() // XBT_ATTRIB_DEPRECATED_v329