X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3d3a7566e185248c9706e2d853d2df38bd5aba8..49a75a876cd9b9284722a63f1b3a02d1283630e1:/src/simix/smx_synchro.cpp

diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp
index 11c471673a..153d7a7d6e 100644
--- a/src/simix/smx_synchro.cpp
+++ b/src/simix/smx_synchro.cpp
@@ -5,27 +5,14 @@
 
 #include "src/kernel/activity/ConditionVariableImpl.hpp"
 #include "src/kernel/activity/MutexImpl.hpp"
-#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/SemaphoreImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 #include "src/simix/smx_synchro_private.hpp"
-#include "src/surf/cpu_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
 
 /***************************** Raw synchronization *********************************/
 
-smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
-{
-  XBT_IN("(%p, %f)",smx_host,timeout);
-
-  simgrid::kernel::activity::RawImplPtr sync =
-      simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl());
-  sync->surf_action_ = smx_host->pimpl_cpu->sleep(timeout);
-  sync->surf_action_->set_data(sync.get());
-  XBT_OUT();
-  return sync;
-}
-
 void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
 {
   XBT_IN("(%p, %p)",process,simcall);
@@ -36,20 +23,20 @@ void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
       break;
 
     case SIMCALL_COND_WAIT:
-      simgrid::xbt::intrusive_erase(simcall_cond_wait__get__cond(simcall)->sleeping, *process);
+      simgrid::xbt::intrusive_erase(simcall_cond_wait__get__cond(simcall)->sleeping_, *process);
       break;
 
     case SIMCALL_COND_WAIT_TIMEOUT:
-      simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping, *process);
+      simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping_, *process);
       simcall_cond_wait_timeout__set__result(simcall, 1); // signal a timeout
       break;
 
     case SIMCALL_SEM_ACQUIRE:
-      simgrid::xbt::intrusive_erase(simcall_sem_acquire__get__sem(simcall)->sleeping, *process);
+      simgrid::xbt::intrusive_erase(simcall_sem_acquire__get__sem(simcall)->sleeping_, *process);
       break;
 
     case SIMCALL_SEM_ACQUIRE_TIMEOUT:
-      simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping, *process);
+      simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping_, *process);
       simcall_sem_acquire_timeout__set__result(simcall, 1); // signal a timeout
       break;
 
@@ -58,121 +45,3 @@ void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
   }
   XBT_OUT();
 }
-
-void SIMIX_synchro_finish(smx_activity_t synchro)
-{
-  XBT_IN("(%p)", synchro.get());
-  smx_simcall_t simcall = synchro->simcalls_.front();
-  synchro->simcalls_.pop_front();
-
-  if (synchro->state_ != SIMIX_SRC_TIMEOUT) {
-    if (synchro->state_ == SIMIX_FAILED)
-      simcall->issuer->context_->iwannadie = true;
-    else
-      THROW_IMPOSSIBLE;
-  }
-
-  SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
-  simcall->issuer->waiting_synchro = nullptr;
-  SIMIX_simcall_answer(simcall);
-  XBT_OUT();
-}
-
-/******************************** Semaphores **********************************/
-/** @brief Initialize a semaphore */
-smx_sem_t SIMIX_sem_init(unsigned int value)
-{
-  XBT_IN("(%u)",value);
-  smx_sem_t sem = new s_smx_sem_t;
-  sem->value = value;
-  XBT_OUT();
-  return sem;
-}
-
-/** @brief Destroys a semaphore */
-void SIMIX_sem_destroy(smx_sem_t sem)
-{
-  XBT_IN("(%p)",sem);
-  XBT_DEBUG("Destroy semaphore %p", sem);
-  if (sem != nullptr) {
-    xbt_assert(sem->sleeping.empty(), "Cannot destroy semaphore since someone is still using it");
-    delete sem;
-  }
-  XBT_OUT();
-}
-
-/** @brief release the semaphore
- *
- * Unlock a process waiting on the semaphore.
- * If no one was blocked, the semaphore capacity is increased by 1.
- */
-void SIMIX_sem_release(smx_sem_t sem)
-{
-  XBT_IN("(%p)",sem);
-  XBT_DEBUG("Sem release semaphore %p", sem);
-  if (not sem->sleeping.empty()) {
-    auto& proc = sem->sleeping.front();
-    sem->sleeping.pop_front();
-    proc.waiting_synchro = nullptr;
-    SIMIX_simcall_answer(&proc.simcall);
-  } else {
-    sem->value++;
-  }
-  XBT_OUT();
-}
-
-/** @brief Returns true if acquiring this semaphore would block */
-int SIMIX_sem_would_block(smx_sem_t sem)
-{
-  XBT_IN("(%p)",sem);
-  XBT_OUT();
-  return (sem->value <= 0);
-}
-
-/** @brief Returns the current capacity of the semaphore */
-int SIMIX_sem_get_capacity(smx_sem_t sem)
-{
-  XBT_IN("(%p)",sem);
-  XBT_OUT();
-  return sem->value;
-}
-
-static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer,
-                            smx_simcall_t simcall)
-{
-  XBT_IN("(%p, %f, %p, %p)",sem,timeout,issuer,simcall);
-  smx_activity_t synchro = nullptr;
-
-  XBT_DEBUG("Wait semaphore %p (timeout:%f)", sem, timeout);
-  if (sem->value <= 0) {
-    synchro = SIMIX_synchro_wait(issuer->host_, timeout);
-    synchro->simcalls_.push_front(simcall);
-    issuer->waiting_synchro = synchro;
-    sem->sleeping.push_back(*issuer);
-  } else {
-    sem->value--;
-    SIMIX_simcall_answer(simcall);
-  }
-  XBT_OUT();
-}
-
-/**
- * @brief Handles a sem acquire simcall without timeout.
- */
-void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
-{
-  XBT_IN("(%p)",simcall);
-  _SIMIX_sem_wait(sem, -1, simcall->issuer, simcall);
-  XBT_OUT();
-}
-
-/**
- * @brief Handles a sem acquire simcall with timeout.
- */
-void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
-{
-  XBT_IN("(%p)",simcall);
-  simcall_sem_acquire_timeout__set__result(simcall, 0); // default result, will be set to 1 on timeout
-  _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
-  XBT_OUT();
-}