X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95..61ab0b23d55ea10365ba11d22b8c11b39cbf16e9:/src/simix/smx_synchro_private.hpp

diff --git a/src/simix/smx_synchro_private.hpp b/src/simix/smx_synchro_private.hpp
index 734998207d..22a765a38f 100644
--- a/src/simix/smx_synchro_private.hpp
+++ b/src/simix/smx_synchro_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-2018. 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. */
@@ -7,76 +7,19 @@
 #define SIMIX_SYNCHRO_PRIVATE_H
 
 #include "simgrid/s4u/ConditionVariable.hpp"
-#include "xbt/swag.h"
+#include "src/simix/ActorImpl.hpp"
+#include <boost/intrusive/list.hpp>
 
-namespace simgrid {
-namespace simix {
-
-class XBT_PUBLIC() MutexImpl {
-public:
-  MutexImpl();
-  ~MutexImpl();
-  MutexImpl(MutexImpl const&) = delete;
-  MutexImpl& operator=(MutexImpl 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(MutexImpl* mutex)
-  {
-    // Atomic operation! Do not split in two instructions!
-    XBT_ATTRIB_UNUSED auto previous = (mutex->refcount_)++;
-    xbt_assert(previous != 0);
-  }
-  friend void intrusive_ptr_release(MutexImpl* 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_;
-};
-}
-}
-
-struct s_smx_cond_t {
-  s_smx_cond_t() : 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_;
-};
+smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout);
 
 struct s_smx_sem_t {
   unsigned int value;
-  xbt_swag_t sleeping; /* list of sleeping process */
+  simgrid::kernel::actor::SynchroList sleeping; /* list of sleeping processes */
 };
 
-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);