X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5ad8ca1a68bbaa9152471c8d0eeb99d762f0d86..3c0ec158c879d3ad3891ee9cb05304b8fff0255f:/src/simix/smx_synchro_private.h

diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index f3ec15c14b..a8c4dadac2 100644
--- a/src/simix/smx_synchro_private.h
+++ b/src/simix/smx_synchro_private.h
@@ -1,18 +1,66 @@
+/* Copyright (c) 2012-2016. 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. */
+
 #ifndef _SIMIX_SYNCHRO_PRIVATE_H
 #define _SIMIX_SYNCHRO_PRIVATE_H
 
+#include "simgrid/s4u/conditionVariable.hpp"
 #include "xbt/swag.h"
-#include "xbt/xbt_os_thread.h"
 
-typedef struct s_smx_mutex {
-  unsigned int locked;
-  smx_process_t owner;
-  xbt_swag_t sleeping;          /* list of sleeping process */
-} s_smx_mutex_t;
+namespace simgrid {
+namespace simix {
+
+class XBT_PUBLIC() Mutex {
+public:
+  Mutex();
+  ~Mutex();
+  Mutex(Mutex const&) = delete;
+  Mutex& operator=(Mutex const&) = delete;
+
+  void lock(smx_actor_t issuer);
+  bool try_lock(smx_actor_t issuer);
+  void unlock(smx_actor_t issuer);
+
+  bool locked = false;
+  smx_actor_t owner = nullptr;
+  // List of sleeping processes:
+  xbt_swag_t sleeping = nullptr;
+
+  // 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 {
@@ -20,29 +68,19 @@ typedef struct s_smx_sem {
   xbt_swag_t sleeping;          /* list of sleeping process */
 } s_smx_sem_t;
 
-void SIMIX_post_synchro(smx_action_t action);
-void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall);
-void SIMIX_synchro_destroy(smx_action_t action);
-
-smx_mutex_t SIMIX_mutex_init(void);
-void SIMIX_mutex_destroy(smx_mutex_t mutex);
-void SIMIX_pre_mutex_lock(smx_simcall_t simcall);
-int SIMIX_mutex_trylock(smx_mutex_t mutex, smx_process_t issuer);
-void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer);
-
-smx_cond_t SIMIX_cond_init(void);
-void SIMIX_cond_destroy(smx_cond_t cond);
-void SIMIX_cond_signal(smx_cond_t cond);
-void SIMIX_pre_cond_wait(smx_simcall_t simcall);
-void SIMIX_pre_cond_wait_timeout(smx_simcall_t simcall);
-void SIMIX_cond_broadcast(smx_cond_t cond);
-
-smx_sem_t SIMIX_sem_init(unsigned int value);
-void SIMIX_sem_destroy(smx_sem_t sem);
-void SIMIX_sem_release(smx_sem_t sem);
-int SIMIX_sem_would_block(smx_sem_t sem);
-void SIMIX_pre_sem_acquire(smx_simcall_t simcall);
-void SIMIX_pre_sem_acquire_timeout(smx_simcall_t simcall);
-int SIMIX_sem_get_capacity(smx_sem_t sem);
+XBT_PRIVATE void SIMIX_post_synchro(smx_activity_t synchro);
+XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall);
+XBT_PRIVATE void SIMIX_synchro_destroy(smx_activity_t synchro);
+XBT_PRIVATE void SIMIX_synchro_finish(smx_activity_t synchro);
+
+XBT_PRIVATE smx_cond_t SIMIX_cond_init();
+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