X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0d1912b2262e2aaf06b39115de5f846e2a86efe..b22d6b4f77d1ae6f88279b887de6b7451d1e6626:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 9281df081e..3256da84cd 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -11,11 +11,6 @@ #include "simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/kernel/activity/IoImpl.hpp" -#include "src/kernel/activity/MailboxImpl.hpp" -#include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_record.hpp" #include "src/mc/mc_replay.hpp" #include "src/simix/smx_private.hpp" @@ -34,8 +29,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX std::unique_ptr simix_global; -void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr; - namespace simgrid { namespace simix { config::Flag cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true}; @@ -43,7 +36,7 @@ config::Flag cfg_verbose_exit{"debug/verbose-exit", "Display the actor sta xbt_dynar_t simix_global_get_actors_addr() { #if SIMGRID_HAVE_MC - return simix_global->actors_vector; + return kernel::EngineImpl::get_instance()->get_actors_vector(); #else xbt_die("This function is intended to be used when compiling with MC"); #endif @@ -51,7 +44,7 @@ xbt_dynar_t simix_global_get_actors_addr() xbt_dynar_t simix_global_get_dead_actors_addr() { #if SIMGRID_HAVE_MC - return simix_global->dead_actors_vector; + return kernel::EngineImpl::get_instance()->get_dead_actors_vector(); #else xbt_die("This function is intended to be used when compiling with MC"); #endif @@ -65,7 +58,7 @@ XBT_ATTRIB_NORETURN static void inthandler(int) if (simgrid::simix::cfg_verbose_exit) { XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option " "'debug/verbose-exit')."); - simix_global->display_all_actor_status(); + simgrid::kernel::EngineImpl::get_instance()->display_all_actor_status(); } else { XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'debug/verbose-exit' is set to false."); } @@ -145,63 +138,6 @@ static void install_segvhandler() #endif /* _WIN32 */ -/********************************* SIMIX **************************************/ -namespace simgrid { -namespace simix { - -void Global::empty_trash() -{ - while (not actors_to_destroy.empty()) { - kernel::actor::ActorImpl* actor = &actors_to_destroy.front(); - actors_to_destroy.pop_front(); - XBT_DEBUG("Getting rid of %s (refcount: %d)", actor->get_cname(), actor->get_refcount()); - intrusive_ptr_release(actor); - } -#if SIMGRID_HAVE_MC - xbt_dynar_reset(dead_actors_vector); -#endif -} - -void Global::display_all_actor_status() const -{ - XBT_INFO("%zu actors are still running, waiting for something.", process_list.size()); - /* List the actors and their state */ - XBT_INFO("Legend of the following listing: \"Actor (@): \""); - for (auto const& kv : process_list) { - kernel::actor::ActorImpl* actor = kv.second; - - if (actor->waiting_synchro_) { - const char* synchro_description = "unknown"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) - synchro_description = "execution"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) - synchro_description = "communication"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) - synchro_description = "sleeping"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) - synchro_description = "synchronization"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) - synchro_description = "I/O"; - - XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %#zx (%s) in state %d to finish", actor->get_pid(), - actor->get_cname(), actor->get_host()->get_cname(), synchro_description, - (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_)); - } - } -} - -} // namespace simix -} // namespace simgrid - static simgrid::kernel::actor::ActorCode maestro_code; void SIMIX_set_maestro(void (*code)(void*), void* data) { @@ -228,7 +164,6 @@ void SIMIX_global_init(int* argc, char** argv) surf_init(argc, argv); /* Initialize SURF structures */ - simix_global->maestro_ = nullptr; SIMIX_context_mod_init(); // Either create a new context with maestro or create @@ -264,7 +199,7 @@ void SIMIX_clean() smx_cleaned = true; XBT_DEBUG("SIMIX_clean called. Simulation's over."); auto* engine = simgrid::kernel::EngineImpl::get_instance(); - if (engine->has_actors_to_run() && SIMIX_get_clock() <= 0.0) { + if (engine->has_actors_to_run() && simgrid::s4u::Engine::get_clock() <= 0.0) { XBT_CRITICAL(" "); XBT_CRITICAL("The time is still 0, and you still have processes ready to run."); XBT_CRITICAL("It seems that you forgot to run the simulation that you setup."); @@ -272,7 +207,7 @@ void SIMIX_clean() } #if HAVE_SMPI - if (not simix_global->process_list.empty()) { + if (not engine->get_actor_list().empty()) { if (smpi_process()->initialized()) { xbt_die("Process exited without calling MPI_Finalize - Killing simulation"); } else { @@ -283,32 +218,15 @@ void SIMIX_clean() #endif /* Kill all processes (but maestro) */ - simix_global->maestro_->kill_all(); + simix_global->get_maestro()->kill_all(); engine->run_all_actors(); - simix_global->empty_trash(); - - /* Exit the SIMIX network module */ - SIMIX_mailbox_exit(); - - 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_destroy.clear(); - simix_global->process_list.clear(); - -#if SIMGRID_HAVE_MC - xbt_dynar_free(&simix_global->actors_vector); - xbt_dynar_free(&simix_global->dead_actors_vector); -#endif + engine->empty_trash(); /* Let's free maestro now */ - delete simix_global->maestro_; - simix_global->maestro_ = nullptr; + simix_global->destroy_maestro(); /* Finish context module and SURF */ - SIMIX_context_mod_exit(); + simix_global->destroy_context_factory(); surf_exit(); @@ -321,13 +239,9 @@ void SIMIX_clean() * * @return Return the clock. */ -double SIMIX_get_clock() +double SIMIX_get_clock() // XBT_ATTRIB_DEPRECATED_v332 { - if (MC_is_active() || MC_record_replay_is_active()) { - return MC_process_clock_get(SIMIX_process_self()); - } else { - return surf_get_clock(); - } + return simgrid::s4u::Engine::get_clock(); } void SIMIX_run() // XBT_ATTRIB_DEPRECATED_v332 @@ -335,37 +249,10 @@ void SIMIX_run() // XBT_ATTRIB_DEPRECATED_v332 simgrid::kernel::EngineImpl::get_instance()->run(); } -double SIMIX_timer_next() // XBT_ATTRIB_DEPRECATED_v329 -{ - 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::kernel::timer::Timer::set(date, std::bind(callback, arg)); -} - -/** @brief cancels a timer that was added earlier */ -void SIMIX_timer_remove(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 -{ - timer->remove(); -} - -/** @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->get_date() : 0.0; -} - -void SIMIX_display_process_status() // XBT_ATTRIB_DEPRECATED_v329 -{ - simix_global->display_all_actor_status(); -} - int SIMIX_is_maestro() { if (simix_global == nullptr) // SimDag return true; const simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self(); - return self == nullptr || self == simix_global->maestro_; + return self == nullptr || simix_global->is_maestro(self); }