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
Update copyright lines for 2022.
[simgrid.git]
/
src
/
kernel
/
activity
/
MutexImpl.cpp
diff --git
a/src/kernel/activity/MutexImpl.cpp
b/src/kernel/activity/MutexImpl.cpp
index
fddb9e2
..
660d77c
100644
(file)
--- a/
src/kernel/activity/MutexImpl.cpp
+++ b/
src/kernel/activity/MutexImpl.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
2
. 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. */
@@
-16,7
+16,7
@@
#define MC_CHECK_NO_DPOR() (void)0
#endif
#define MC_CHECK_NO_DPOR() (void)0
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
simix_mutex, simix
_synchro, "Mutex kernel-space implementation");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
ker_mutex, ker
_synchro, "Mutex kernel-space implementation");
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
@@
-26,13
+26,11
@@
void MutexImpl::lock(actor::ActorImpl* issuer)
{
XBT_IN("(%p; %p)", this, issuer);
MC_CHECK_NO_DPOR();
{
XBT_IN("(%p; %p)", this, issuer);
MC_CHECK_NO_DPOR();
- /* FIXME: check where to validate the arguments */
- RawImplPtr synchro = nullptr;
if (locked_) {
/* FIXME: check if the host is active ? */
/* Somebody using the mutex, use a synchronization to get host failures */
if (locked_) {
/* FIXME: check if the host is active ? */
/* Somebody using the mutex, use a synchronization to get host failures */
-
synchro = RawImplPtr
(new RawImpl([this, issuer]() { this->remove_sleeping_actor(*issuer); }));
+
RawImplPtr synchro
(new RawImpl([this, issuer]() { this->remove_sleeping_actor(*issuer); }));
(*synchro).set_host(issuer->get_host()).start();
synchro->register_simcall(&issuer->simcall_);
sleeping_.push_back(*issuer);
(*synchro).set_host(issuer->get_host()).start();
synchro->register_simcall(&issuer->simcall_);
sleeping_.push_back(*issuer);
@@
-45,9
+43,9
@@
void MutexImpl::lock(actor::ActorImpl* issuer)
XBT_OUT();
}
XBT_OUT();
}
-/** Tries to lock the mutex for a
process
+/** Tries to lock the mutex for a
actor
*
*
- * @param issuer the
process
that tries to acquire the mutex
+ * @param issuer the
actor
that tries to acquire the mutex
* @return whether we managed to lock the mutex
*/
bool MutexImpl::try_lock(actor::ActorImpl* issuer)
* @return whether we managed to lock the mutex
*/
bool MutexImpl::try_lock(actor::ActorImpl* issuer)
@@
-65,11
+63,11
@@
bool MutexImpl::try_lock(actor::ActorImpl* issuer)
return true;
}
return true;
}
-/** Unlock a mutex for a
process
+/** Unlock a mutex for a
actor
*
*
- * Unlocks the mutex and gives it to a
process
waiting for it.
+ * Unlocks the mutex and gives it to a
actor
waiting for it.
* If the unlocker is not the owner of the mutex nothing happens.
* If the unlocker is not the owner of the mutex nothing happens.
- * If there are no
process
waiting, it sets the mutex as free.
+ * If there are no
actor
waiting, it sets the mutex as free.
*/
void MutexImpl::unlock(actor::ActorImpl* issuer)
{
*/
void MutexImpl::unlock(actor::ActorImpl* issuer)
{