X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7e5d6700babea882557fae8ff23cddf01791f66..03847b386b2035bec76237eab400aeaf07466496:/src/simix/smx_synchro.cpp

diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp
index 3817b1744a..0db61fd5f3 100644
--- a/src/simix/smx_synchro.cpp
+++ b/src/simix/smx_synchro.cpp
@@ -7,9 +7,10 @@
 
 #include "src/surf/surf_interface.hpp"
 #include "smx_private.h"
-#include "xbt/log.h"
+#include <xbt/ex.hpp>
+#include <xbt/log.h>
 
-#include "src/simix/SynchroRaw.hpp"
+#include "src/kernel/activity/SynchroRaw.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
                                 "SIMIX Synchronization (mutex, semaphores and conditions)");
@@ -26,7 +27,7 @@ static smx_synchro_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
 {
   XBT_IN("(%p, %f)",smx_host,timeout);
 
-  simgrid::simix::Raw *sync = new simgrid::simix::Raw();
+  simgrid::kernel::activity::Raw *sync = new simgrid::kernel::activity::Raw();
   sync->sleep = surf_host_sleep(smx_host, timeout);
   sync->sleep->setData(sync);
   XBT_OUT();
@@ -97,7 +98,7 @@ void SIMIX_synchro_finish(smx_synchro_t synchro)
 namespace simgrid {
 namespace simix {
 
-Mutex::Mutex()
+Mutex::Mutex() : mutex_(this)
 {
   XBT_IN("(%p)", this);
   // Useful to initialize sleeping swag:
@@ -167,7 +168,7 @@ void Mutex::unlock(smx_process_t issuer)
   /* If the mutex is not owned by the issuer, that's not good */
   if (issuer != this->owner)
     THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%d), not by you.",
-        SIMIX_process_get_name(this->owner),SIMIX_process_get_PID(this->owner));
+        this->owner->name.c_str(),SIMIX_process_get_PID(this->owner));
 
   if (xbt_swag_size(this->sleeping) > 0) {
     /*process to wake up */
@@ -237,11 +238,9 @@ smx_cond_t SIMIX_cond_init(void)
 {
   XBT_IN("()");
   simgrid::simix::Process p;
-  smx_cond_t cond = xbt_new0(s_smx_cond_t, 1);
+  smx_cond_t cond = new s_smx_cond();
   cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
-  cond->mutex = nullptr;
   cond->refcount_ = 1;
-  intrusive_ptr_add_ref(cond);
   XBT_OUT();
   return cond;
 }
@@ -352,12 +351,13 @@ void SIMIX_cond_broadcast(smx_cond_t cond)
   XBT_OUT();
 }
 
-/**
- * \brief Destroys a condition.
- *
- * Destroys and frees the condition's memory. 
- * \param cond A condition
- */
+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);
@@ -382,9 +382,8 @@ void intrusive_ptr_release(s_smx_cond_t *cond)
   if (count == 0) {
     xbt_assert(xbt_swag_size(cond->sleeping) == 0,
                 "Cannot destroy conditional since someone is still using it");
-
     xbt_swag_free(cond->sleeping);
-    xbt_free(cond);
+    delete cond;
   }
 }