*/
#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/mc/mc_forward.hpp"
#include "xbt/ex.h"
#include <functional>
template<class R, class... T>
inline static R simcall(Simcall call, T const&... t)
{
- smx_actor_t self = SIMIX_process_self();
+ auto self = simgrid::kernel::actor::ActorImpl::self();
simgrid::simix::marshal(&self->simcall_, call, t...);
if (not simgrid::kernel::EngineImpl::get_instance()->is_maestro(self)) {
XBT_DEBUG("Yield process '%s' on simcall %s", self->get_cname(), SIMIX_simcall_name(self->simcall_));
inline static void simcall_BODY_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, unsigned char* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate)
{
if (false) /* Go to that function to follow the code flow through the simcall barrier */
- simcall_HANDLER_comm_recv(&SIMIX_process_self()->simcall_, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate);
+ simcall_HANDLER_comm_recv(&simgrid::kernel::actor::ActorImpl::self()->simcall_, receiver, mbox, dst_buff,
+ dst_buff_size, match_fun, copy_data_fun, data, timeout, rate);
return simcall<void, smx_actor_t, smx_mailbox_t, unsigned char*, size_t*, simix_match_func_t, simix_copy_data_func_t, void*, double, double>(Simcall::COMM_RECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate);
}
inline static boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_BODY_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, unsigned char* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate)
{
if (false) /* Go to that function to follow the code flow through the simcall barrier */
- simcall_HANDLER_comm_irecv(&SIMIX_process_self()->simcall_, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate);
+ simcall_HANDLER_comm_irecv(&simgrid::kernel::actor::ActorImpl::self()->simcall_, receiver, mbox, dst_buff,
+ dst_buff_size, match_fun, copy_data_fun, data, rate);
return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>, smx_actor_t, smx_mailbox_t, unsigned char*, size_t*, simix_match_func_t, simix_copy_data_func_t, void*, double>(Simcall::COMM_IRECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate);
}
inline static void simcall_BODY_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, unsigned char* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout)
{
if (false) /* Go to that function to follow the code flow through the simcall barrier */
- simcall_HANDLER_comm_send(&SIMIX_process_self()->simcall_, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout);
+ simcall_HANDLER_comm_send(&simgrid::kernel::actor::ActorImpl::self()->simcall_, sender, mbox, task_size, rate,
+ src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout);
return simcall<void, smx_actor_t, smx_mailbox_t, double, double, unsigned char*, size_t, simix_match_func_t, simix_copy_data_func_t, void*, double>(Simcall::COMM_SEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout);
}
inline static boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_BODY_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, unsigned char* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, bool detached)
{
if (false) /* Go to that function to follow the code flow through the simcall barrier */
- simcall_HANDLER_comm_isend(&SIMIX_process_self()->simcall_, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached);
+ simcall_HANDLER_comm_isend(&simgrid::kernel::actor::ActorImpl::self()->simcall_, sender, mbox, task_size, rate,
+ src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached);
return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>, smx_actor_t, smx_mailbox_t, double, double, unsigned char*, size_t, simix_match_func_t, simix_clean_func_t, simix_copy_data_func_t, void*, bool>(Simcall::COMM_ISEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached);
}
inline static bool simcall_BODY_comm_test(simgrid::kernel::activity::CommImpl* comm)
{
if (false) /* Go to that function to follow the code flow through the simcall barrier */
- simcall_HANDLER_comm_test(&SIMIX_process_self()->simcall_, comm);
+ simcall_HANDLER_comm_test(&simgrid::kernel::actor::ActorImpl::self()->simcall_, comm);
return simcall<bool, simgrid::kernel::activity::CommImpl*>(Simcall::COMM_TEST, comm);
}
inline static ssize_t simcall_BODY_comm_testany(simgrid::kernel::activity::CommImpl** comms, size_t count)
{
if (false) /* Go to that function to follow the code flow through the simcall barrier */
- simcall_HANDLER_comm_testany(&SIMIX_process_self()->simcall_, comms, count);
+ simcall_HANDLER_comm_testany(&simgrid::kernel::actor::ActorImpl::self()->simcall_, comms, count);
return simcall<ssize_t, simgrid::kernel::activity::CommImpl**, size_t>(Simcall::COMM_TESTANY, comms, count);
}
inline static ssize_t simcall_BODY_comm_waitany(simgrid::kernel::activity::CommImpl** comms, size_t count, double timeout)
{
if (false) /* Go to that function to follow the code flow through the simcall barrier */
- simcall_HANDLER_comm_waitany(&SIMIX_process_self()->simcall_, comms, count, timeout);
+ simcall_HANDLER_comm_waitany(&simgrid::kernel::actor::ActorImpl::self()->simcall_, comms, count, timeout);
return simcall<ssize_t, simgrid::kernel::activity::CommImpl**, size_t, double>(Simcall::COMM_WAITANY, comms, count, timeout);
}
inline static void simcall_BODY_comm_wait(simgrid::kernel::activity::CommImpl* comm, double timeout)
{
if (false) /* Go to that function to follow the code flow through the simcall barrier */
- simcall_HANDLER_comm_wait(&SIMIX_process_self()->simcall_, comm, timeout);
+ simcall_HANDLER_comm_wait(&simgrid::kernel::actor::ActorImpl::self()->simcall_, comm, timeout);
return simcall<void, simgrid::kernel::activity::CommImpl*, double>(Simcall::COMM_WAIT, comm, timeout);
}
#include <xbt/sysdep.h>
#include <simgrid/kernel/future.hpp>
-#include <simgrid/simix.h>
-#include <simgrid/simix.hpp>
#include <xbt/promise.hpp>
+#include "src/kernel/actor/ActorImpl.hpp"
+
namespace simgrid {
namespace simix {
using T = decltype(code().get());
xbt_assert(not SIMIX_is_maestro(), "Cannot execute blocking call in kernel mode");
- smx_actor_t self = SIMIX_process_self();
- simgrid::xbt::Result<T> result;
+ auto self = kernel::actor::ActorImpl::self();
+ xbt::Result<T> result;
simcall_run_blocking(
[&result, self, &code] {
try {
auto future = code();
- future.then_([&result, self](std::shared_ptr<simgrid::kernel::FutureState<T>> value) {
- simgrid::xbt::set_promise(result, simgrid::kernel::Future<T>(std::move(value)));
- simgrid::simix::unblock(self);
+ future.then_([&result, self](std::shared_ptr<kernel::FutureState<T>> value) {
+ xbt::set_promise(result, kernel::Future<T>(std::move(value)));
+ unblock(self);
});
} catch (...) {
result.set_exception(std::current_exception());
- simgrid::simix::unblock(self);
+ unblock(self);
}
},
nullptr);
{
if (not valid())
throw std::future_error(std::future_errc::no_state);
- smx_actor_t self = SIMIX_process_self();
- simgrid::xbt::Result<T> result;
+ auto self = kernel::actor::ActorImpl::self();
+ xbt::Result<T> result;
simcall_run_blocking(
[this, &result, self] {
try {
// When the kernel future is ready...
- this->future_.then_([&result, self](std::shared_ptr<simgrid::kernel::FutureState<T>> value) {
+ this->future_.then_([&result, self](std::shared_ptr<kernel::FutureState<T>> value) {
// ... wake up the process with the result of the kernel future.
- simgrid::xbt::set_promise(result, simgrid::kernel::Future<T>(std::move(value)));
- simgrid::simix::unblock(self);
+ xbt::set_promise(result, kernel::Future<T>(std::move(value)));
+ unblock(self);
});
} catch (...) {
result.set_exception(std::current_exception());
- simgrid::simix::unblock(self);
+ unblock(self);
}
},
nullptr);
return;
// The future is not ready. We have to delegate to the SimGrid kernel:
std::exception_ptr exception;
- smx_actor_t self = SIMIX_process_self();
+ auto self = kernel::actor::ActorImpl::self();
simcall_run_blocking(
[this, &exception, self] {
try {
// When the kernel future is ready...
- this->future_.then_([this, self](std::shared_ptr<simgrid::kernel::FutureState<T>> value) {
+ this->future_.then_([this, self](std::shared_ptr<kernel::FutureState<T>> value) {
// ...store it the simix kernel and wake up.
- this->future_ = simgrid::kernel::Future<T>(std::move(value));
- simgrid::simix::unblock(self);
+ this->future_ = kernel::Future<T>(std::move(value));
+ unblock(self);
});
} catch (...) {
exception = std::current_exception();
- simgrid::simix::unblock(self);
+ unblock(self);
}
},
nullptr);
private:
// We wrap an event-based kernel future:
- simgrid::kernel::Future<T> future_;
+ kernel::Future<T> future_;
};
/** Start some asynchronous work
using T = decltype(code().get());
// Execute the code in the kernel and get the kernel future:
- simgrid::kernel::Future<T> future = simgrid::kernel::actor::simcall(std::move(code));
+ kernel::Future<T> future = kernel::actor::simcall(std::move(code));
// Wrap the kernel future in an actor future:
- return simgrid::simix::Future<T>(std::move(future));
-}
-}
+ return Future<T>(std::move(future));
}
+} // namespace simix
+} // namespace simgrid
#endif
