#ifndef SIMGRID_S4U_MUTEX_HPP
#define SIMGRID_S4U_MUTEX_HPP
-#include <mutex>
-#include <utility>
-
-#include <boost/intrusive_ptr.hpp>
-
-#include <simgrid/simix.h>
-#include <xbt/base.h>
+#include <simgrid/forward.h>
+#include <xbt/asserts.h>
namespace simgrid {
namespace s4u {
-class ConditionVariable;
-
/** @brief A classical mutex, but blocking in the simulation world
* @ingroup s4u_api
*
*
*/
class XBT_PUBLIC Mutex {
- friend ConditionVariable;
+ friend simgrid::s4u::ConditionVariable;
friend simgrid::kernel::activity::MutexImpl;
- simgrid::kernel::activity::MutexImpl* mutex_;
- explicit Mutex(simgrid::kernel::activity::MutexImpl * mutex) : mutex_(mutex) {}
- /* refcounting of the intrusive_ptr is delegated to the implementation object */
- friend void intrusive_ptr_add_ref(Mutex* mutex)
- {
- xbt_assert(mutex);
- SIMIX_mutex_ref(mutex->mutex_);
- }
- friend void intrusive_ptr_release(Mutex* mutex)
- {
- xbt_assert(mutex);
- SIMIX_mutex_unref(mutex->mutex_);
- }
-public:
- using Ptr = boost::intrusive_ptr<Mutex>;
+ simgrid::kernel::activity::MutexImpl* pimpl_;
+ explicit Mutex(simgrid::kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
+ /* refcounting */
+ friend XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* mutex);
+ friend XBT_PUBLIC void intrusive_ptr_release(Mutex* mutex);
+
+public:
// No copy:
/** You cannot create a new mutex by copying an existing one. Use MutexPtr instead */
Mutex(Mutex const&) = delete;
Mutex& operator=(Mutex const&) = delete;
/** Constructs a new mutex */
- static Ptr createMutex();
+ static MutexPtr create();
void lock();
void unlock();
bool try_lock();
-};
-using MutexPtr = Mutex::Ptr;
+ // deprecated
+ /** @deprecated Mutex::create() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static MutexPtr createMutex() { return create(); }
+};
}} // namespace simgrid::s4u
