std::unique_ptr<simgrid::simix::Global> simix_global;
-void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr;
-
namespace simgrid {
namespace simix {
config::Flag<bool> cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true};
surf_init(argc, argv); /* Initialize SURF structures */
- simix_global->maestro_ = nullptr;
SIMIX_context_mod_init();
// Either create a new context with maestro or create
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.");
#endif
/* Kill all processes (but maestro) */
- simix_global->maestro_->kill_all();
+ simix_global->get_maestro()->kill_all();
engine->run_all_actors();
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();
*
* @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
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
-{
- simgrid::kernel::EngineImpl::get_instance()->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);
}