namespace simgrid {
namespace simix {
-simgrid::config::Flag<double> cfg_verbose_exit{
- "debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
-}
+config::Flag<double> cfg_verbose_exit{"debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
+} // namespace simix
} // namespace simgrid
+
XBT_ATTRIB_NORETURN static void inthandler(int)
{
if (simgrid::simix::cfg_verbose_exit) {
namespace simgrid {
namespace simix {
-Timer* Timer::set(double date, simgrid::xbt::Task<void()>&& callback)
+Timer* Timer::set(double date, xbt::Task<void()>&& callback)
{
Timer* timer = new Timer(date, std::move(callback));
timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
/** @brief cancels a timer that was added earlier */
void Timer::remove()
{
- simgrid::simix::simix_timers.erase(handle_);
+ simix_timers.erase(handle_);
delete this;
}
void Global::empty_trash()
{
while (not actors_to_destroy.empty()) {
- smx_actor_t actor = &actors_to_destroy.front();
+ 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);
actors_to_run.clear();
}
-simgrid::config::Flag<double> cfg_breakpoint{
+config::Flag<double> cfg_breakpoint{
"debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
-}
-}
+} // namespace simix
+} // namespace simgrid
static simgrid::simix::ActorCode maestro_code;
void SIMIX_set_maestro(void (*code)(void*), void* data)
SIMIX_context_mod_init();
// Either create a new context with maestro or create
- // a context object with the current context mestro):
+ // a context object with the current context maestro):
simgrid::kernel::actor::create_maestro(maestro_code);
/* Prepare to display some more info when dying on Ctrl-C pressing */
}
#if HAVE_SMPI
- if (SIMIX_process_count()>0){
+ if (simix_global->process_list.size() > 0) {
if(smpi_process()->initialized()){
xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
}else{
/* Kill all processes (but maestro) */
simix_global->maestro_process->kill_all();
- simix_global->context_factory->run_all();
+ simix_global->run_all_actors();
simix_global->empty_trash();
/* Exit the SIMIX network module */
* That would thus be a pure waste of time.
*/
- for (smx_actor_t const& process : simix_global->actors_that_ran) {
- if (process->simcall.call_ != SIMCALL_NONE) {
- process->simcall_handle(0);
+ for (auto const& actor : simix_global->actors_that_ran) {
+ if (actor->simcall.call_ != SIMCALL_NONE) {
+ actor->simcall_handle(0);
}
}
simgrid::s4u::Engine::on_simulation_end();
}
-double SIMIX_timer_next()
+double SIMIX_timer_next() // XBT_ATTRIB_DEPRECATED_v329
{
return simgrid::simix::Timer::next();
}
-smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
+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));
}
-smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task<void()>&& callback) // deprecated
-{
- return simgrid::simix::Timer::set(date, std::move(callback));
-}
-
/** @brief cancels a timer that was added earlier */
-void SIMIX_timer_remove(smx_timer_t timer) {
+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) {
+double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329
+{
return timer ? timer->get_date() : 0;
}
/* List the process and their state */
XBT_INFO("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
for (auto const& kv : simix_global->process_list) {
- smx_actor_t actor = kv.second;
+ simgrid::kernel::actor::ActorImpl* actor = kv.second;
if (actor->waiting_synchro) {
int SIMIX_is_maestro()
{
- smx_actor_t self = SIMIX_process_self();
- return simix_global == nullptr /*SimDag*/ || self == nullptr || self == simix_global->maestro_process;
+ if (simix_global == nullptr) // SimDag
+ return true;
+ simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
+ return self == nullptr || self == simix_global->maestro_process;
}