X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92d87d991948c97b02c5a4aec11e9fbc429ce4c6..3157f525692738e7d8c57543ce66ad9424973558:/src/simix/popping_bodies.cpp?ds=sidebyside diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index 4b4a0843d0..a8f1fdf7fd 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -4,7 +4,7 @@ /* DO NOT EVER CHANGE THIS FILE */ /* */ /* change simcalls specification in src/simix/simcalls.in */ -/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved. */ /**********************************************************************/ /* @@ -14,8 +14,8 @@ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :) */ -#include "smx_private.hpp" #include "src/kernel/EngineImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/mc/mc_forward.hpp" #include "xbt/ex.h" #include @@ -30,7 +30,7 @@ using simgrid::simix::Simcall; template 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_)); @@ -41,62 +41,13 @@ inline static R simcall(Simcall call, T const&... t) return simgrid::simix::unmarshal(self->simcall_.result_); } -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); - return simcall(Simcall::COMM_RECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); -} - -inline static boost::intrusive_ptr 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); - return simcall, 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); - return simcall(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 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); - return simcall, 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); - return simcall(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); - return simcall(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(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); - return simcall(Simcall::COMM_WAIT, comm, timeout); -} - inline static void simcall_BODY_run_kernel(std::function const* code) { if (false) /* Go to that function to follow the code flow through the simcall barrier */