Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
kill useless code
authorMartin Quinson <martin.quinson@loria.fr>
Wed, 11 May 2016 17:23:31 +0000 (19:23 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Wed, 11 May 2016 17:23:31 +0000 (19:23 +0200)
src/simix/smx_host.cpp
src/simix/smx_host_private.h
src/simix/smx_process.cpp

index 2fc7eb4..bfc4f20 100644 (file)
@@ -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;
index a96e5de..eb8b7e6 100644 (file)
@@ -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);
index ef55883..223cba7 100644 (file)
@@ -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 */
 }