Merge s4u wait_any

[simgrid.git] / src / simix / smx_synchro_private.h

diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index 21e76b4..f312483 100644 (file)
--- a/src/simix/smx_synchro_private.h
+++ b/src/simix/smx_synchro_private.h
@@ -9,6 +9,9 @@
 
 #include <atomic>
 
+#include <simgrid/s4u/mutex.hpp>
+#include <simgrid/s4u/conditionVariable.hpp>
+
 #include "xbt/base.h"
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
@@ -36,26 +39,36 @@ public:
   // boost::intrusive_ptr<Mutex> support:
   friend void intrusive_ptr_add_ref(Mutex* mutex)
   {
+    // Atomic operation! Do not split in two instructions!
     auto previous = (mutex->refcount_)++;
     xbt_assert(previous != 0);
     (void) previous;
   }
   friend void intrusive_ptr_release(Mutex* mutex)
   {
+    // Atomic operation! Do not split in two instructions!
     auto count = --(mutex->refcount_);
     if (count == 0)
       delete mutex;
   }
+
+  simgrid::s4u::Mutex& mutex() { return mutex_; }
+
 private:
   std::atomic_int_fast32_t refcount_ { 1 };
+  simgrid::s4u::Mutex mutex_;
 };
 
 }
 }
 
 typedef struct s_smx_cond {
-  smx_mutex_t mutex;
-  xbt_swag_t sleeping;          /* list of sleeping process */
+  s_smx_cond() : cond_(this) {}
+
+  std::atomic_int_fast32_t refcount_ { 1 };
+  smx_mutex_t mutex = nullptr;
+  xbt_swag_t sleeping = nullptr;  /* list of sleeping process */
+  simgrid::s4u::ConditionVariable cond_;
 } s_smx_cond_t;
 
 typedef struct s_smx_sem {
@@ -71,10 +84,11 @@ XBT_PRIVATE void SIMIX_synchro_finish(smx_synchro_t synchro);
 XBT_PRIVATE smx_cond_t SIMIX_cond_init(void);
 XBT_PRIVATE void SIMIX_cond_broadcast(smx_cond_t cond);
 XBT_PRIVATE void SIMIX_cond_signal(smx_cond_t cond);
+XBT_PRIVATE void intrusive_ptr_add_ref(s_smx_cond_t *cond);
+XBT_PRIVATE void intrusive_ptr_release(s_smx_cond_t *cond);
 
 XBT_PRIVATE XBT_PRIVATE smx_sem_t SIMIX_sem_init(unsigned int value);
 XBT_PRIVATE void SIMIX_sem_release(smx_sem_t sem);
 XBT_PRIVATE int SIMIX_sem_would_block(smx_sem_t sem);
 XBT_PRIVATE int SIMIX_sem_get_capacity(smx_sem_t sem);
-
 #endif