From a65b8336dd2a009d8880f167839ee901ebcb2bfb Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 11 May 2016 19:23:31 +0200 Subject: [PATCH] kill useless code --- src/simix/smx_host.cpp | 10 ---------- src/simix/smx_host_private.h | 2 -- src/simix/smx_process.cpp | 5 ++--- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 2fc7eb416c..bfc4f205db 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -384,16 +384,6 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro SIMIX_execution_finish(exec); } -void SIMIX_execution_suspend(smx_synchro_t synchro) -{ - synchro->suspend(); // FIXME: USELESS -} - -void SIMIX_execution_resume(smx_synchro_t synchro) -{ - synchro->resume(); // FIXME: USELESS -} - void SIMIX_execution_finish(simgrid::simix::Exec *exec) { xbt_fifo_item_t item; diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index a96e5de954..eb8b7e64f0 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -50,8 +50,6 @@ XBT_PRIVATE void SIMIX_execution_set_priority(smx_synchro_t synchro, double prio XBT_PRIVATE void SIMIX_execution_set_bound(smx_synchro_t synchro, double bound); XBT_PRIVATE void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask); -XBT_PRIVATE void SIMIX_execution_suspend(smx_synchro_t synchro); -XBT_PRIVATE void SIMIX_execution_resume(smx_synchro_t synchro); XBT_PRIVATE void SIMIX_execution_finish(simgrid::simix::Exec *exec); XBT_PRIVATE void SIMIX_set_category(smx_synchro_t synchro, const char *category); diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp index ef55883fa2..223cba7d46 100644 --- a/src/simix/smx_process.cpp +++ b/src/simix/smx_process.cpp @@ -627,15 +627,14 @@ void SIMIX_process_change_host(smx_process_t process, void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process) { - smx_synchro_t sync_suspend = - SIMIX_process_suspend(process, simcall->issuer); + smx_synchro_t sync_suspend = SIMIX_process_suspend(process, simcall->issuer); if (process != simcall->issuer) { SIMIX_simcall_answer(simcall); } else { xbt_fifo_push(sync_suspend->simcalls, simcall); process->waiting_synchro = sync_suspend; - SIMIX_execution_suspend(process->waiting_synchro); + process->waiting_synchro->suspend(); } /* If we are suspending ourselves, then just do not finish the simcall now */ } -- 2.20.1