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
deal with dependencies for Io too
[simgrid.git]
/
src
/
kernel
/
activity
/
MutexImpl.hpp
diff --git
a/src/kernel/activity/MutexImpl.hpp
b/src/kernel/activity/MutexImpl.hpp
index
f372ea7
..
ba85ad0
100644
(file)
--- a/
src/kernel/activity/MutexImpl.hpp
+++ b/
src/kernel/activity/MutexImpl.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2012-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-20
20
. 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. */
@@
-18,6
+18,9
@@
class XBT_PUBLIC MutexImpl {
std::atomic_int_fast32_t refcount_{1};
s4u::Mutex piface_;
bool locked_ = false;
std::atomic_int_fast32_t refcount_{1};
s4u::Mutex piface_;
bool locked_ = false;
+ actor::ActorImpl* owner_ = nullptr;
+ // List of sleeping actors:
+ actor::SynchroList sleeping_;
public:
MutexImpl() : piface_(this) {}
public:
MutexImpl() : piface_(this) {}
@@
-32,9
+35,8
@@
public:
MutexImpl* ref();
void unref();
MutexImpl* ref();
void unref();
- actor::ActorImpl* owner_ = nullptr;
- // List of sleeping actors:
- actor::SynchroList sleeping_;
+ void remove_sleeping_actor(actor::ActorImpl& actor) { xbt::intrusive_erase(sleeping_, actor); }
+ actor::ActorImpl* get_owner() const { return owner_; }
// boost::intrusive_ptr<Mutex> support:
friend void intrusive_ptr_add_ref(MutexImpl* mutex)
// boost::intrusive_ptr<Mutex> support:
friend void intrusive_ptr_add_ref(MutexImpl* mutex)