X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/705d7f1d9bb048c715a17cd5e726dbdbbd6b6d71..d4be32492fcb56ad33f704c7e602b5efa48ed9d0:/src/kernel/activity/MutexImpl.hpp

diff --git a/src/kernel/activity/MutexImpl.hpp b/src/kernel/activity/MutexImpl.hpp
index 1274e793ef..3abf068229 100644
--- a/src/kernel/activity/MutexImpl.hpp
+++ b/src/kernel/activity/MutexImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-2019. 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,28 +7,34 @@
 #define SIMIX_MUTEXIMPL_HPP
 
 #include "simgrid/s4u/ConditionVariable.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 #include <boost/intrusive/list.hpp>
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-class XBT_PUBLIC() MutexImpl {
+class XBT_PUBLIC MutexImpl {
+  std::atomic_int_fast32_t refcount_{1};
+  s4u::Mutex piface_;
+  bool locked_ = false;
+
 public:
-  MutexImpl();
-  ~MutexImpl();
+  MutexImpl() : piface_(this) {}
   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);
+  void lock(actor::ActorImpl* issuer);
+  bool try_lock(actor::ActorImpl* issuer);
+  void unlock(actor::ActorImpl* issuer);
+  bool is_locked() { return locked_; }
+
+  MutexImpl* ref();
+  void unref();
 
-  bool locked       = false;
-  smx_actor_t owner = nullptr;
-  // List of sleeping processes:
-  simgrid::simix::SynchroList sleeping;
+  actor::ActorImpl* owner_ = nullptr;
+  // List of sleeping actors:
+  actor::SynchroList sleeping_;
 
   // boost::intrusive_ptr<Mutex> support:
   friend void intrusive_ptr_add_ref(MutexImpl* mutex)
@@ -36,17 +42,14 @@ public:
     XBT_ATTRIB_UNUSED auto previous = mutex->refcount_.fetch_add(1);
     xbt_assert(previous != 0);
   }
+
   friend void intrusive_ptr_release(MutexImpl* mutex)
   {
     if (mutex->refcount_.fetch_sub(1) == 1)
       delete mutex;
   }
 
-  simgrid::s4u::Mutex& mutex() { return mutex_; }
-
-private:
-  std::atomic_int_fast32_t refcount_{1};
-  simgrid::s4u::Mutex mutex_;
+  s4u::Mutex& mutex() { return piface_; }
 };
 }
 }