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
Merge branch 'master' into disk
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Mutex.hpp
diff --git
a/include/simgrid/s4u/Mutex.hpp
b/include/simgrid/s4u/Mutex.hpp
index
4c8b920
..
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. */
@@
-27,17
+27,17
@@
namespace s4u {
*
*/
class XBT_PUBLIC Mutex {
*
*/
class XBT_PUBLIC Mutex {
- friend simgrid::s4u::ConditionVariable;
- friend simgrid::kernel::activity::MutexImpl;
-
- simgrid::kernel::activity::MutexImpl* pimpl_;
- explicit Mutex(simgrid::kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
+ friend ConditionVariable;
+ 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:
+ 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;
@@
-46,16
+46,12
@@
public:
/** Constructs a new mutex */
static MutexPtr create();
/** Constructs a new mutex */
static MutexPtr create();
-
void lock();
void unlock();
bool try_lock();
void lock();
void unlock();
bool try_lock();
-
- // deprecated
- /** @deprecated Mutex::create() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static MutexPtr createMutex() { return create(); }
};
};
-}} // namespace simgrid::s4u
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_MUTEX_HPP */
#endif /* SIMGRID_S4U_MUTEX_HPP */