X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2fa4c958fad5cd1ff8f7325a933326869936268..6bd36833e0008d85ea07d076a90da2ea1fecc52e:/src/s4u/s4u_Mutex.cpp diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp index 95658bb9fc..ce2b60cf75 100644 --- a/src/s4u/s4u_Mutex.cpp +++ b/src/s4u/s4u_Mutex.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2020. 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. */ @@ -44,18 +44,18 @@ bool Mutex::try_lock() */ 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 */ -void intrusive_ptr_add_ref(Mutex* mutex) +void intrusive_ptr_add_ref(const Mutex* mutex) { 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_) @@ -69,7 +69,7 @@ void intrusive_ptr_release(Mutex* 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); } @@ -89,7 +89,7 @@ int sg_mutex_try_lock(sg_mutex_t mutex) return mutex->try_lock(); } -void sg_mutex_destroy(sg_mutex_t mutex) +void sg_mutex_destroy(const_sg_mutex_t mutex) { delete mutex; }