X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..6ee0c147e010bf1d2da12813b60593e805e49f3b:/include/simgrid/s4u/Mutex.hpp diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp index 8cf22d61ea..7791cd7e23 100644 --- a/include/simgrid/s4u/Mutex.hpp +++ b/include/simgrid/s4u/Mutex.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2023. 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. */ @@ -9,12 +9,11 @@ #include #include -namespace simgrid { -namespace s4u { +namespace simgrid::s4u { /** @brief A classical mutex, but blocking in the simulation world. * - * @rst + * @beginrst * It is strictly impossible to use a real mutex, such as * `std::mutex `_ * or `pthread_mutex_t `_, @@ -29,30 +28,32 @@ namespace s4u { * @endrst */ class XBT_PUBLIC Mutex { +#ifndef DOXYGEN friend ConditionVariable; friend kernel::activity::MutexImpl; + friend XBT_PUBLIC void kernel::activity::intrusive_ptr_release(kernel::activity::MutexImpl* mutex); +#endif kernel::activity::MutexImpl* const pimpl_; /* refcounting */ friend XBT_PUBLIC void intrusive_ptr_add_ref(const Mutex* mutex); friend XBT_PUBLIC void intrusive_ptr_release(const Mutex* mutex); -public: explicit Mutex(kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {} - ~Mutex(); + ~Mutex() = default; #ifndef DOXYGEN Mutex(Mutex const&) = delete; // No copy constructor; Use MutexPtr instead Mutex& operator=(Mutex const&) = delete; // No direct assignment either. Use MutexPtr instead #endif - /** Constructs a new mutex */ +public: + /** \static Constructs a new mutex */ static MutexPtr create(); void lock(); void unlock(); bool try_lock(); }; -} // namespace s4u -} // namespace simgrid +} // namespace simgrid::s4u #endif /* SIMGRID_S4U_MUTEX_HPP */