X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..f051157d903a7e3680081ec4d5fc9d83600847f5:/include/simgrid/s4u/Mutex.hpp diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp index c0de117b8a..8418ca9a44 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-2022. 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. */ @@ -14,7 +14,7 @@ namespace 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,22 +29,25 @@ namespace s4u { * @endrst */ class XBT_PUBLIC Mutex { +#ifndef DOXYGEN friend ConditionVariable; friend kernel::activity::MutexImpl; + friend 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 +public: /** Constructs a new mutex */ static MutexPtr create(); void lock();