xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!");
xbt_assert(std::isfinite(priority), "priority is not finite!");
- return simcall_BODY_execution_start(name, flops_amount, priority, bound, host);
+ return simgrid::simix::simcall([name, flops_amount, priority, bound, host] {
+ return SIMIX_execution_start(name, flops_amount, priority, bound, host);
+ });
}
/**
xbt_assert(std::isfinite(rate), "rate is not finite!");
- return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout);
+ return simgrid::simix::simcall([name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout] {
+ return SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout);
+ });
}
/**
{
simgrid::kernel::activity::ExecImplPtr exec =
boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(execution);
- if (not exec->surfAction_)
+ if (exec->surf_action_ == nullptr) // FIXME: One test fails if I remove this, but I don't get why...
return;
- simgrid::simix::kernelImmediate([exec] {
- XBT_DEBUG("Cancel synchro %p", exec.get());
- if (exec->surfAction_)
- exec->surfAction_->cancel();
- });
+ simgrid::simix::simcall([exec] { exec->cancel(); });
}
/**
{
/* checking for infinite values */
xbt_assert(std::isfinite(priority), "priority is not finite!");
- simgrid::simix::kernelImmediate([execution, priority] {
+ simgrid::simix::simcall([execution, priority] {
simgrid::kernel::activity::ExecImplPtr exec =
boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(execution);
- if (exec->surfAction_)
- exec->surfAction_->set_priority(priority);
+ exec->set_priority(priority);
});
}
*/
void simcall_execution_set_bound(smx_activity_t execution, double bound)
{
- simgrid::simix::kernelImmediate([execution, bound] {
+ simgrid::simix::simcall([execution, bound] {
simgrid::kernel::activity::ExecImplPtr exec =
boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(execution);
- if (exec->surfAction_)
- exec->surfAction_->set_bound(bound);
+ exec->set_bound(bound);
});
}
return (e_smx_state_t)simcall_BODY_execution_test(execution);
}
-/**
- * \ingroup simix_process_management
- * \brief Kills all SIMIX processes.
- */
-void simcall_process_killall()
-{
- simcall_BODY_process_killall();
-}
-
void simcall_process_join(smx_actor_t process, double timeout)
{
simcall_BODY_process_join(process, timeout);
*/
void simcall_process_set_data(smx_actor_t process, void *data)
{
- simgrid::simix::kernelImmediate([process, data] { process->setUserData(data); });
+ simgrid::simix::simcall([process, data] { process->setUserData(data); });
}
/**
});
}
-/**
- * \ingroup simix_process_management
- * \brief Add an on_exit function
- * Add an on_exit function which will be executed when the process exits/is killed.
- */
-XBT_PUBLIC void simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data)
-{
- simcall_BODY_process_on_exit(process, fun, data);
-}
-
/**
* \ingroup simix_process_management
* \brief Creates a new sleep SIMIX synchro.
*/
void simcall_comm_cancel(smx_activity_t synchro)
{
- simgrid::simix::kernelImmediate([synchro] {
+ simgrid::simix::simcall([synchro] {
simgrid::kernel::activity::CommImplPtr comm =
boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
comm->cancel();
if (category == nullptr) {
return;
}
- simcall_BODY_set_category(synchro, category);
+ simgrid::simix::simcall([synchro, category] { SIMIX_set_category(synchro, category); });
}
/**
fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization
xbt_abort();
}
- return simgrid::simix::kernelImmediate([] { return new simgrid::kernel::activity::MutexImpl(); });
+ return simgrid::simix::simcall([] { return new simgrid::kernel::activity::MutexImpl(); });
}
/**
*/
smx_cond_t simcall_cond_init()
{
- return simcall_BODY_cond_init();
+ return simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
}
/**
* \ingroup simix_synchro_management
*
*/
-void simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout)
+int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout)
{
xbt_assert(std::isfinite(timeout), "timeout is not finite!");
- simcall_BODY_cond_wait_timeout(cond, mutex, timeout);
+ return simcall_BODY_cond_wait_timeout(cond, mutex, timeout);
}
/**
* \ingroup simix_synchro_management
*
*/
-void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
+int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
{
xbt_assert(std::isfinite(timeout), "timeout is not finite!");
- simcall_BODY_sem_acquire_timeout(sem, timeout);
+ return simcall_BODY_sem_acquire_timeout(sem, timeout);
}
sg_size_t simcall_storage_read(surf_storage_t st, sg_size_t size)