A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix https://framagit.org/simgrid/simgrid/issues/29
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Mutex.hpp
diff --git
a/include/simgrid/s4u/Mutex.hpp
b/include/simgrid/s4u/Mutex.hpp
index
b30de03
..
05f4912
100644
(file)
--- a/
include/simgrid/s4u/Mutex.hpp
+++ b/
include/simgrid/s4u/Mutex.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
9
. 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. */
/* 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. */
@@
-12,8
+12,6
@@
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-class ConditionVariable;
-
/** @brief A classical mutex, but blocking in the simulation world
* @ingroup s4u_api
*
/** @brief A classical mutex, but blocking in the simulation world
* @ingroup s4u_api
*
@@
-25,22
+23,21
@@
class ConditionVariable;
* <a href="http://en.cppreference.com/w/cpp/thread/mutex>std::mutex</a>.
*
* As for any S4U object, Mutexes are using the @ref s4u_raii "RAII idiom" for memory management.
* <a href="http://en.cppreference.com/w/cpp/thread/mutex>std::mutex</a>.
*
* As for any S4U object, Mutexes are using the @ref s4u_raii "RAII idiom" for memory management.
- * Use create
Mutex() to get a ::MutexPtr to a newly created mutex and only manipulate
::MutexPtr.
+ * Use create
() to get a simgrid::s4u::MutexPtr to a newly created mutex and only manipulate simgrid::s4u
::MutexPtr.
*
*/
class XBT_PUBLIC Mutex {
friend ConditionVariable;
*
*/
class XBT_PUBLIC Mutex {
friend ConditionVariable;
- friend simgrid::kernel::activity::MutexImpl;
- simgrid::kernel::activity::MutexImpl* pimpl_;
- explicit Mutex(simgrid::kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
+ friend kernel::activity::MutexImpl;
+ kernel::activity::MutexImpl* const pimpl_;
/* refcounting */
friend XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* mutex);
friend XBT_PUBLIC void intrusive_ptr_release(Mutex* mutex);
public:
/* refcounting */
friend XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* mutex);
friend XBT_PUBLIC void intrusive_ptr_release(Mutex* mutex);
public:
- using Ptr = boost::intrusive_ptr<Mutex>;
-
+ explicit Mutex(kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
+ ~Mutex();
// No copy:
/** You cannot create a new mutex by copying an existing one. Use MutexPtr instead */
Mutex(Mutex const&) = delete;
// No copy:
/** You cannot create a new mutex by copying an existing one. Use MutexPtr instead */
Mutex(Mutex const&) = delete;
@@
-48,18
+45,13
@@
public:
Mutex& operator=(Mutex const&) = delete;
/** Constructs a new mutex */
Mutex& operator=(Mutex const&) = delete;
/** Constructs a new mutex */
- static Ptr create();
-
+ static MutexPtr create();
void lock();
void unlock();
bool try_lock();
void lock();
void unlock();
bool try_lock();
-
- // deprecated
- XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static Ptr createMutex() { return create(); }
};
};
-using MutexPtr = Mutex::Ptr;
-
-}} // namespace simgrid::s4u
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_MUTEX_HPP */
#endif /* SIMGRID_S4U_MUTEX_HPP */