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 depencencies
[simgrid.git]
/
src
/
s4u
/
s4u_Mutex.cpp
diff --git
a/src/s4u/s4u_Mutex.cpp
b/src/s4u/s4u_Mutex.cpp
index
95658bb
..
ce2b60c
100644
(file)
--- a/
src/s4u/s4u_Mutex.cpp
+++ b/
src/s4u/s4u_Mutex.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-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. */
@@
-44,18
+44,18
@@
bool Mutex::try_lock()
*/
MutexPtr Mutex::create()
{
*/
MutexPtr Mutex::create()
{
- kernel::activity::MutexImpl* mutex =
simix
::simcall([] { return new kernel::activity::MutexImpl(); });
+ kernel::activity::MutexImpl* mutex =
kernel::actor
::simcall([] { return new kernel::activity::MutexImpl(); });
return MutexPtr(&mutex->mutex(), false);
}
/* refcounting of the intrusive_ptr is delegated to the implementation object */
return MutexPtr(&mutex->mutex(), false);
}
/* refcounting of the intrusive_ptr is delegated to the implementation object */
-void intrusive_ptr_add_ref(Mutex* mutex)
+void intrusive_ptr_add_ref(
const
Mutex* mutex)
{
xbt_assert(mutex);
if (mutex->pimpl_)
mutex->pimpl_->ref();
}
{
xbt_assert(mutex);
if (mutex->pimpl_)
mutex->pimpl_->ref();
}
-void intrusive_ptr_release(Mutex* mutex)
+void intrusive_ptr_release(
const
Mutex* mutex)
{
xbt_assert(mutex);
if (mutex->pimpl_)
{
xbt_assert(mutex);
if (mutex->pimpl_)
@@
-69,7
+69,7
@@
void intrusive_ptr_release(Mutex* mutex)
sg_mutex_t sg_mutex_init()
{
simgrid::kernel::activity::MutexImpl* mutex =
sg_mutex_t sg_mutex_init()
{
simgrid::kernel::activity::MutexImpl* mutex =
- simgrid::
simix
::simcall([] { return new simgrid::kernel::activity::MutexImpl(); });
+ simgrid::
kernel::actor
::simcall([] { return new simgrid::kernel::activity::MutexImpl(); });
return new simgrid::s4u::Mutex(mutex);
}
return new simgrid::s4u::Mutex(mutex);
}
@@
-89,7
+89,7
@@
int sg_mutex_try_lock(sg_mutex_t mutex)
return mutex->try_lock();
}
return mutex->try_lock();
}
-void sg_mutex_destroy(sg_mutex_t mutex)
+void sg_mutex_destroy(
const_
sg_mutex_t mutex)
{
delete mutex;
}
{
delete mutex;
}