X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ed26c1bad5a748ee8a9601b60cfd1bd3e6cc161..705d7f1d9bb048c715a17cd5e726dbdbbd6b6d71:/src/simix/smx_synchro.cpp

diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp
index ff7f7e75d4..2fca1552f8 100644
--- a/src/simix/smx_synchro.cpp
+++ b/src/simix/smx_synchro.cpp
@@ -1,64 +1,63 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
+/* Copyright (c) 2007-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "smx_private.hpp"
+#include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "smx_private.h"
-#include "xbt/log.h"
+#include <xbt/ex.hpp>
+#include <xbt/log.h>
+#include <xbt/utility.hpp>
 
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/kernel/activity/SynchroRaw.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
-                                "SIMIX Synchronization (mutex, semaphores and conditions)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
 
-static smx_synchro_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout);
-static void SIMIX_synchro_finish(smx_synchro_t synchro);
 static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
-                             smx_process_t issuer, smx_simcall_t simcall);
-static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer,
+                             smx_actor_t issuer, smx_simcall_t simcall);
+static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer,
                             smx_simcall_t simcall);
 
 /***************************** Raw synchronization *********************************/
 
-static smx_synchro_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
+smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
 {
   XBT_IN("(%p, %f)",smx_host,timeout);
 
-  smx_synchro_t sync;
-  sync = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator);
-  sync->type = SIMIX_SYNC_SYNCHRO;
-  sync->name = xbt_strdup("synchro");
-  sync->synchro.sleep = surf_host_sleep(smx_host, timeout);
-
-  sync->synchro.sleep->setData(sync);
+  simgrid::kernel::activity::RawImplPtr sync =
+      simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl());
+  sync->sleep                          = smx_host->pimpl_cpu->sleep(timeout);
+  sync->sleep->setData(sync.get());
   XBT_OUT();
   return sync;
 }
 
-void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall)
+void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
 {
   XBT_IN("(%p, %p)",process,simcall);
   switch (simcall->call) {
 
     case SIMCALL_MUTEX_LOCK:
-      xbt_swag_remove(process, simcall_mutex_lock__get__mutex(simcall)->sleeping);
+      simgrid::xbt::intrusive_erase(simcall_mutex_lock__get__mutex(simcall)->sleeping, *process);
       break;
 
     case SIMCALL_COND_WAIT:
-      xbt_swag_remove(process, simcall_cond_wait__get__cond(simcall)->sleeping);
+      simgrid::xbt::intrusive_erase(simcall_cond_wait__get__cond(simcall)->sleeping, *process);
       break;
 
     case SIMCALL_COND_WAIT_TIMEOUT:
-      xbt_swag_remove(process, simcall_cond_wait_timeout__get__cond(simcall)->sleeping);
+      simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping, *process);
       break;
 
     case SIMCALL_SEM_ACQUIRE:
-      xbt_swag_remove(process, simcall_sem_acquire__get__sem(simcall)->sleeping);
+      simgrid::xbt::intrusive_erase(simcall_sem_acquire__get__sem(simcall)->sleeping, *process);
       break;
 
     case SIMCALL_SEM_ACQUIRE_TIMEOUT:
-      xbt_swag_remove(process, simcall_sem_acquire_timeout__get__sem(simcall)->sleeping);
+      simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping, *process);
       break;
 
     default:
@@ -67,34 +66,11 @@ void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall)
   XBT_OUT();
 }
 
-void SIMIX_synchro_destroy(smx_synchro_t synchro)
+void SIMIX_synchro_finish(smx_activity_t synchro)
 {
-  XBT_IN("(%p)",synchro);
-  XBT_DEBUG("Destroying synchro %p", synchro);
-  xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
-  synchro->synchro.sleep->unref();
-  xbt_free(synchro->name);
-  xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
-  XBT_OUT();
-}
-
-void SIMIX_post_synchro(smx_synchro_t synchro)
-{
-  XBT_IN("(%p)",synchro);
-  xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
-  if (synchro->synchro.sleep->getState() == SURF_ACTION_FAILED)
-    synchro->state = SIMIX_FAILED;
-  else if(synchro->synchro.sleep->getState() == SURF_ACTION_DONE)
-    synchro->state = SIMIX_SRC_TIMEOUT;
-
-  SIMIX_synchro_finish(synchro);  
-  XBT_OUT();
-}
-
-static void SIMIX_synchro_finish(smx_synchro_t synchro)
-{
-  XBT_IN("(%p)",synchro);
-  smx_simcall_t simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls);
+  XBT_IN("(%p)", synchro.get());
+  smx_simcall_t simcall = synchro->simcalls.front();
+  synchro->simcalls.pop_front();
 
   switch (synchro->state) {
 
@@ -104,7 +80,6 @@ static void SIMIX_synchro_finish(smx_synchro_t synchro)
 
     case SIMIX_FAILED:
         simcall->issuer->context->iwannadie = 1;
-//      SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
       break;
 
     default:
@@ -113,138 +88,10 @@ static void SIMIX_synchro_finish(smx_synchro_t synchro)
   }
 
   SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
-  simcall->issuer->waiting_synchro = NULL;
-  SIMIX_synchro_destroy(synchro);
+  simcall->issuer->waiting_synchro = nullptr;
   SIMIX_simcall_answer(simcall);
   XBT_OUT();
 }
-/*********************************** Mutex ************************************/
-
-smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall){
-  return SIMIX_mutex_init();
-}
-/**
- * \brief Initialize a mutex.
- *
- * Allocs and creates the data for the mutex.
- * \return A mutex
- */
-smx_mutex_t SIMIX_mutex_init(void)
-{
-  XBT_IN("()");
-  s_smx_process_t p;            /* useful to initialize sleeping swag */
-
-  smx_mutex_t mutex = xbt_new0(s_smx_mutex_t, 1);
-  mutex->locked = 0;
-  mutex->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
-  XBT_OUT();
-  return mutex;
-}
-
-/**
- * \brief Handles a mutex lock simcall.
- * \param simcall the simcall
- */
-void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
-{
-  XBT_IN("(%p)",simcall);
-  /* FIXME: check where to validate the arguments */
-  smx_synchro_t synchro = NULL;
-  smx_process_t process = simcall->issuer;
-
-  if (mutex->locked) {
-    /* FIXME: check if the host is active ? */
-    /* Somebody using the mutex, use a synchronization to get host failures */
-    synchro = SIMIX_synchro_wait(process->host, -1);
-    xbt_fifo_push(synchro->simcalls, simcall);
-    simcall->issuer->waiting_synchro = synchro;
-    xbt_swag_insert(simcall->issuer, mutex->sleeping);   
-  } else {
-    /* mutex free */
-    mutex->locked = 1;
-    mutex->owner = simcall->issuer;
-    SIMIX_simcall_answer(simcall);
-  }
-  XBT_OUT();
-}
-
-int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex){
-  return SIMIX_mutex_trylock(mutex, simcall->issuer);
-}
-/**
- * \brief Tries to lock a mutex.
- *
- * Tries to lock a mutex, return 1 if the mutex is unlocked, else 0.
- * This function does not block and wait for the mutex to be unlocked.
- * \param mutex The mutex
- * \param issuer The process that tries to acquire the mutex
- * \return 1 - mutex free, 0 - mutex used
- */
-int SIMIX_mutex_trylock(smx_mutex_t mutex, smx_process_t issuer)
-{
-  XBT_IN("(%p, %p)",mutex,issuer);
-  if (mutex->locked){
-    XBT_OUT();
-    return 0;
-  }
-
-  mutex->locked = 1;
-  mutex->owner = issuer;
-  XBT_OUT();
-  return 1;
-}
-
-void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex){
-   SIMIX_mutex_unlock(mutex, simcall->issuer);
-}
-/**
- * \brief Unlocks a mutex.
- *
- * Unlocks the mutex and gives it to a process waiting for it. 
- * If the unlocker is not the owner of the mutex nothing happens.
- * If there are no process waiting, it sets the mutex as free.
- * \param mutex The mutex
- * \param issuer The process trying to unlock the mutex
- */
-void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer)
-{
-  XBT_IN("(%p, %p)",mutex,issuer);
-
-  /* If the mutex is not owned by the issuer, that's not good */
-  if (issuer != mutex->owner)
-	  THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%d), not by you.",
-			  SIMIX_process_get_name(mutex->owner),SIMIX_process_get_PID(mutex->owner));
-
-  if (xbt_swag_size(mutex->sleeping) > 0) {
-    /*process to wake up */
-    smx_process_t p = (smx_process_t) xbt_swag_extract(mutex->sleeping);
-    SIMIX_synchro_destroy(p->waiting_synchro);
-    p->waiting_synchro = NULL;
-    mutex->owner = p;
-    SIMIX_simcall_answer(&p->simcall);
-  } else {
-    /* nobody to wake up */
-    mutex->locked = 0;
-    mutex->owner = NULL;
-  }
-  XBT_OUT();
-}
-
-/**
- * \brief Destroys a mutex.
- *
- * Destroys and frees the mutex's memory. 
- * \param mutex A mutex
- */
-void SIMIX_mutex_destroy(smx_mutex_t mutex)
-{
-  XBT_IN("(%p)",mutex);
-  if (mutex){
-    xbt_swag_free(mutex->sleeping);
-    xbt_free(mutex);
-  }
-  XBT_OUT();
-}
 
 /********************************* Condition **********************************/
 
@@ -255,13 +102,11 @@ void SIMIX_mutex_destroy(smx_mutex_t mutex)
  * It have to be called before the use of the condition.
  * \return A condition
  */
-smx_cond_t SIMIX_cond_init(void)
+smx_cond_t SIMIX_cond_init()
 {
   XBT_IN("()");
-  s_smx_process_t p;
-  smx_cond_t cond = xbt_new0(s_smx_cond_t, 1);
-  cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
-  cond->mutex = NULL;
+  smx_cond_t cond = new s_smx_cond_t();
+  cond->refcount_ = 1;
   XBT_OUT();
   return cond;
 }
@@ -273,7 +118,7 @@ smx_cond_t SIMIX_cond_init(void)
 void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
 {
   XBT_IN("(%p)",simcall);
-  smx_process_t issuer = simcall->issuer;
+  smx_actor_t issuer = simcall->issuer;
 
   _SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
   XBT_OUT();
@@ -284,10 +129,10 @@ void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex
  * \param simcall the simcall
  */
 void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
-		                 smx_mutex_t mutex, double timeout)
+                     smx_mutex_t mutex, double timeout)
 {
   XBT_IN("(%p)",simcall);
-  smx_process_t issuer = simcall->issuer;
+  smx_actor_t issuer = simcall->issuer;
 
   _SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
   XBT_OUT();
@@ -295,53 +140,51 @@ void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
 
 
 static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
-                             smx_process_t issuer, smx_simcall_t simcall)
+                             smx_actor_t issuer, smx_simcall_t simcall)
 {
   XBT_IN("(%p, %p, %f, %p,%p)",cond,mutex,timeout,issuer,simcall);
-  smx_synchro_t synchro = NULL;
+  smx_activity_t synchro = nullptr;
 
   XBT_DEBUG("Wait condition %p", cond);
 
   /* If there is a mutex unlock it */
   /* FIXME: what happens if the issuer is not the owner of the mutex? */
-  if (mutex != NULL) {
+  if (mutex != nullptr) {
     cond->mutex = mutex;
-    SIMIX_mutex_unlock(mutex, issuer);
+    mutex->unlock(issuer);
   }
 
   synchro = SIMIX_synchro_wait(issuer->host, timeout);
-  xbt_fifo_unshift(synchro->simcalls, simcall);
+  synchro->simcalls.push_front(simcall);
   issuer->waiting_synchro = synchro;
-  xbt_swag_insert(simcall->issuer, cond->sleeping);   
+  cond->sleeping.push_back(*simcall->issuer);
   XBT_OUT();
 }
 
 /**
  * \brief Signalizes a condition.
  *
- * Signalizes a condition and wakes up a sleeping process. 
+ * Signalizes a condition and wakes up a sleeping process.
  * If there are no process sleeping, no action is done.
  * \param cond A condition
  */
 void SIMIX_cond_signal(smx_cond_t cond)
 {
   XBT_IN("(%p)",cond);
-  smx_process_t proc = NULL;
-  smx_mutex_t mutex = NULL;
-  smx_simcall_t simcall = NULL;
-
   XBT_DEBUG("Signal condition %p", cond);
 
-  /* If there are processes waiting for the condition choose one and try 
+  /* If there are processes waiting for the condition choose one and try
      to make it acquire the mutex */
-  if ((proc = (smx_process_t) xbt_swag_extract(cond->sleeping))) {
+  if (not cond->sleeping.empty()) {
+    auto& proc = cond->sleeping.front();
+    cond->sleeping.pop_front();
 
     /* Destroy waiter's synchronization */
-    SIMIX_synchro_destroy(proc->waiting_synchro);
-    proc->waiting_synchro = NULL;
+    proc.waiting_synchro = nullptr;
 
     /* Now transform the cond wait simcall into a mutex lock one */
-    simcall = &proc->simcall;
+    smx_simcall_t simcall = &proc.simcall;
+    smx_mutex_t mutex;
     if(simcall->call == SIMCALL_COND_WAIT)
       mutex = simcall_cond_wait__get__mutex(simcall);
     else
@@ -366,43 +209,50 @@ void SIMIX_cond_broadcast(smx_cond_t cond)
   XBT_DEBUG("Broadcast condition %p", cond);
 
   /* Signal the condition until nobody is waiting on it */
-  while (xbt_swag_size(cond->sleeping)) {
+  while (not cond->sleeping.empty()) {
     SIMIX_cond_signal(cond);
   }
   XBT_OUT();
 }
 
-/**
- * \brief Destroys a condition.
- *
- * Destroys and frees the condition's memory. 
- * \param cond A condition
- */
-void SIMIX_cond_destroy(smx_cond_t cond)
+smx_cond_t SIMIX_cond_ref(smx_cond_t cond)
+{
+  if (cond != nullptr)
+    intrusive_ptr_add_ref(cond);
+  return cond;
+}
+
+void SIMIX_cond_unref(smx_cond_t cond)
 {
   XBT_IN("(%p)",cond);
   XBT_DEBUG("Destroy condition %p", cond);
+  if (cond != nullptr) {
+    intrusive_ptr_release(cond);
+  }
+  XBT_OUT();
+}
+
 
-  if (cond != NULL) {
-    xbt_assert(xbt_swag_size(cond->sleeping) == 0,
-                "Cannot destroy conditional since someone is still using it");
+void intrusive_ptr_add_ref(s_smx_cond_t *cond)
+{
+  auto previous = cond->refcount_.fetch_add(1);
+  xbt_assert(previous != 0);
+}
 
-    xbt_swag_free(cond->sleeping);
-    xbt_free(cond);
+void intrusive_ptr_release(s_smx_cond_t *cond)
+{
+  if (cond->refcount_.fetch_sub(1) == 1) {
+    xbt_assert(cond->sleeping.empty(), "Cannot destroy conditional since someone is still using it");
+    delete cond;
   }
-  XBT_OUT();
 }
 
 /******************************** Semaphores **********************************/
-#define SMX_SEM_NOLIMIT 99999
 /** @brief Initialize a semaphore */
 smx_sem_t SIMIX_sem_init(unsigned int value)
 {
   XBT_IN("(%u)",value);
-  s_smx_process_t p;
-
-  smx_sem_t sem = xbt_new0(s_smx_sem_t, 1);
-  sem->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
+  smx_sem_t sem = new s_smx_sem_t;
   sem->value = value;
   XBT_OUT();
   return sem;
@@ -413,18 +263,13 @@ void SIMIX_sem_destroy(smx_sem_t sem)
 {
   XBT_IN("(%p)",sem);
   XBT_DEBUG("Destroy semaphore %p", sem);
-  if (sem != NULL) {
-    xbt_assert(xbt_swag_size(sem->sleeping) == 0,
-                "Cannot destroy semaphore since someone is still using it");
-    xbt_swag_free(sem->sleeping);
-    xbt_free(sem);
+  if (sem != nullptr) {
+    xbt_assert(sem->sleeping.empty(), "Cannot destroy semaphore since someone is still using it");
+    delete sem;
   }
   XBT_OUT();
 }
 
-void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem){
-  SIMIX_sem_release(sem);
-}
 /** @brief release the semaphore
  *
  * Unlock a process waiting on the semaphore.
@@ -433,14 +278,13 @@ void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem){
 void SIMIX_sem_release(smx_sem_t sem)
 {
   XBT_IN("(%p)",sem);
-  smx_process_t proc;
-
   XBT_DEBUG("Sem release semaphore %p", sem);
-  if ((proc = (smx_process_t) xbt_swag_extract(sem->sleeping))) {
-    SIMIX_synchro_destroy(proc->waiting_synchro);
-    proc->waiting_synchro = NULL;
-    SIMIX_simcall_answer(&proc->simcall);
-  } else if (sem->value < SMX_SEM_NOLIMIT) {
+  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();
@@ -454,9 +298,6 @@ int SIMIX_sem_would_block(smx_sem_t sem)
   return (sem->value <= 0);
 }
 
-int simcall_HANDLER_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem){
-  return SIMIX_sem_get_capacity(sem);
-}
 /** @brief Returns the current capacity of the semaphore */
 int SIMIX_sem_get_capacity(smx_sem_t sem)
 {
@@ -465,18 +306,18 @@ int SIMIX_sem_get_capacity(smx_sem_t sem)
   return sem->value;
 }
 
-static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer,
+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_synchro_t synchro = NULL;
+  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);
-    xbt_fifo_unshift(synchro->simcalls, simcall);
+    synchro->simcalls.push_front(simcall);
     issuer->waiting_synchro = synchro;
-    xbt_swag_insert(issuer, sem->sleeping);
+    sem->sleeping.push_back(*issuer);
   } else {
     sem->value--;
     SIMIX_simcall_answer(simcall);
@@ -502,9 +343,6 @@ void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
 void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
 {
   XBT_IN("(%p)",simcall);
-  _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);  
+  _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
   XBT_OUT();
 }
-int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t sem) {
-  return SIMIX_sem_would_block(sem);
-}