*
* @param execution The execution synchro
*/
-e_smx_state_t simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution, double timeout)
+simgrid::kernel::activity::State simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution,
+ double timeout) // XBT_ATTRIB_DEPRECATED_v330
{
- return (e_smx_state_t)simcall_BODY_execution_wait(static_cast<simgrid::kernel::activity::ExecImpl*>(execution),
- timeout);
+ simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
+ simgrid::kernel::actor::simcall_blocking<void>(
+ [execution, issuer, timeout] { execution->wait_for(issuer, timeout); });
+ return simgrid::kernel::activity::State::DONE;
+}
+
+simgrid::kernel::activity::State simcall_execution_wait(const simgrid::kernel::activity::ActivityImplPtr& execution,
+ double timeout) // XBT_ATTRIB_DEPRECATED_v330
+{
+ simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
+ simgrid::kernel::actor::simcall_blocking<void>(
+ [execution, issuer, timeout] { execution->wait_for(issuer, timeout); });
+ return simgrid::kernel::activity::State::DONE;
+}
+
+bool simcall_execution_test(simgrid::kernel::activity::ActivityImpl* execution) // XBT_ATTRIB_DEPRECATED_v330
+{
+ return simgrid::kernel::actor::simcall([execution] { return execution->test(); });
}
-bool simcall_execution_test(simgrid::kernel::activity::ActivityImpl* execution)
+bool simcall_execution_test(const simgrid::kernel::activity::ActivityImplPtr& execution) // XBT_ATTRIB_DEPRECATED_v330
{
- return simcall_BODY_execution_test(static_cast<simgrid::kernel::activity::ExecImpl*>(execution));
+ return simgrid::kernel::actor::simcall([execution] { return execution->test(); });
}
unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, double timeout)
process->iface()->suspend();
}
-e_smx_state_t simcall_process_sleep(double duration) // XBT_DEPRECATED_v329
+simgrid::kernel::activity::State simcall_process_sleep(double duration) // XBT_ATTRIB_DEPRECATED_v329
{
simgrid::kernel::actor::ActorImpl::self()->sleep(duration);
return simgrid::kernel::activity::State::DONE;
/* the model-checker wants two separate simcalls */
simgrid::kernel::activity::ActivityImplPtr comm =
nullptr; /* MC needs the comm to be set to nullptr during the simcall */
- comm = simcall_comm_isend(sender, mbox, task_size, rate,
- src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0);
+ comm = simcall_comm_isend(sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun,
+ data, false);
simcall_comm_wait(comm.get(), timeout);
comm = nullptr;
}
unsigned int simcall_comm_waitany(simgrid::kernel::activity::ActivityImplPtr comms[], size_t count,
double timeout) // XBT_ATTRIB_DEPRECATED_v330
{
- std::unique_ptr<simgrid::kernel::activity::CommImpl* []> rcomms(new simgrid::kernel::activity::CommImpl*[count]);
+ auto rcomms = std::make_unique<simgrid::kernel::activity::CommImpl*[]>(count);
std::transform(comms, comms + count, rcomms.get(), [](const simgrid::kernel::activity::ActivityImplPtr& comm) {
return static_cast<simgrid::kernel::activity::CommImpl*>(comm.get());
});
{
if (count == 0)
return -1;
- std::unique_ptr<simgrid::kernel::activity::CommImpl* []> rcomms(new simgrid::kernel::activity::CommImpl*[count]);
+ auto rcomms = std::make_unique<simgrid::kernel::activity::CommImpl*[]>(count);
std::transform(comms, comms + count, rcomms.get(), [](const simgrid::kernel::activity::ActivityImplPtr& comm) {
return static_cast<simgrid::kernel::activity::CommImpl*>(comm.get());
});
return simcall_BODY_sem_acquire_timeout(sem, timeout);
}
-e_smx_state_t simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io, double timeout)
+simgrid::kernel::activity::State simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io,
+ double timeout) // XBT_ATTRIB_DEPRECATED_v330
+{
+ simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
+ simgrid::kernel::actor::simcall_blocking<void>([io, issuer, timeout] { io->wait_for(issuer, timeout); });
+ return simgrid::kernel::activity::State::DONE;
+}
+
+simgrid::kernel::activity::State simcall_io_wait(const simgrid::kernel::activity::ActivityImplPtr& io,
+ double timeout) // XBT_ATTRIB_DEPRECATED_v330
+{
+ simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
+ simgrid::kernel::actor::simcall_blocking<void>([io, issuer, timeout] { io->wait_for(issuer, timeout); });
+ return simgrid::kernel::activity::State::DONE;
+}
+
+bool simcall_io_test(simgrid::kernel::activity::ActivityImpl* io) // XBT_ATTRIB_DEPRECATED_v330
{
- return (e_smx_state_t)simcall_BODY_io_wait(static_cast<simgrid::kernel::activity::IoImpl*>(io), timeout);
+ return simgrid::kernel::actor::simcall([io] { return io->test(); });
}
-bool simcall_io_test(simgrid::kernel::activity::ActivityImpl* io)
+bool simcall_io_test(const simgrid::kernel::activity::ActivityImplPtr& io) // XBT_ATTRIB_DEPRECATD_v330
{
- return simcall_BODY_io_test(static_cast<simgrid::kernel::activity::IoImpl*>(io));
+ return simgrid::kernel::actor::simcall([io] { return io->test(); });
}
void simcall_run_kernel(std::function<void()> const& code, simgrid::mc::SimcallInspector* t)
{
- simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t;
+ simgrid::kernel::actor::ActorImpl::self()->simcall_.inspector_ = t;
simcall_BODY_run_kernel(&code);
}
void simcall_run_blocking(std::function<void()> const& code, simgrid::mc::SimcallInspector* t = nullptr)
{
- simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t;
+ simgrid::kernel::actor::ActorImpl::self()->simcall_.inspector_ = t;
simcall_BODY_run_blocking(&code);
}