X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1865e94dfee342781e137d9e7e2aa1e423ac0169..e98ff738e16a6e5a18426c8686407511f4c0c8a4:/include/simgrid/s4u/Mutex.hpp?ds=sidebyside diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp index f97eae8f03..7791cd7e23 100644 --- a/include/simgrid/s4u/Mutex.hpp +++ b/include/simgrid/s4u/Mutex.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2021. 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,8 +9,7 @@ #include #include -namespace simgrid { -namespace s4u { +namespace simgrid::s4u { /** @brief A classical mutex, but blocking in the simulation world. * @@ -29,8 +28,11 @@ 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 */ @@ -38,20 +40,20 @@ class XBT_PUBLIC Mutex { friend XBT_PUBLIC void intrusive_ptr_release(const Mutex* mutex); explicit Mutex(kernel::activity::MutexImpl* mutex) : pimpl_(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 public: - /** Constructs a new mutex */ + /** \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 */