X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1865e94dfee342781e137d9e7e2aa1e423ac0169..1c3328f8047e2e5602ed3cd87044ce274e9ff978:/src/simix/popping_bodies.cpp diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index 6e818e8aa9..6948f46442 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -32,8 +32,7 @@ inline static R simcall(Simcall call, T const&... t) smx_actor_t self = SIMIX_process_self(); simgrid::simix::marshal(&self->simcall_, call, t...); if (self != simix_global->maestro_) { - XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall_.call_), - (int)self->simcall_.call_); + XBT_DEBUG("Yield process '%s' on simcall %s", self->get_cname(), SIMIX_simcall_name(self->simcall_)); self->yield(); } else { self->simcall_handle(0); @@ -41,13 +40,6 @@ inline static R simcall(Simcall call, T const&... t) return simgrid::simix::unmarshal(self->simcall_.result_); } -inline static int simcall_BODY_execution_waitany_for(simgrid::kernel::activity::ExecImpl** execs, size_t count, double timeout) -{ - if (false) /* Go to that function to follow the code flow through the simcall barrier */ - simcall_HANDLER_execution_waitany_for(&SIMIX_process_self()->simcall_, execs, count, timeout); - return simcall(Simcall::EXECUTION_WAITANY_FOR, execs, count, timeout); -} - 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 */ @@ -104,20 +96,6 @@ inline static void simcall_BODY_comm_wait(simgrid::kernel::activity::CommImpl* c return simcall(Simcall::COMM_WAIT, comm, timeout); } -inline static int simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) -{ - if (false) /* Go to that function to follow the code flow through the simcall barrier */ - simcall_HANDLER_cond_wait_timeout(&SIMIX_process_self()->simcall_, cond, mutex, timeout); - return simcall(Simcall::COND_WAIT_TIMEOUT, cond, mutex, timeout); -} - -inline static int simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeout) -{ - if (false) /* Go to that function to follow the code flow through the simcall barrier */ - simcall_HANDLER_sem_acquire_timeout(&SIMIX_process_self()->simcall_, sem, timeout); - return simcall(Simcall::SEM_ACQUIRE_TIMEOUT, sem, 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 */