X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..82fafbab5f8ce1530037fd245d678e917119caa0:/src/kernel/activity/MutexImpl.cpp

diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp
index 9274c47766..5569f8af10 100644
--- a/src/kernel/activity/MutexImpl.cpp
+++ b/src/kernel/activity/MutexImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. 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. */
@@ -23,8 +23,8 @@ void MutexImpl::lock(actor::ActorImpl* issuer)
     /* Somebody using the mutex, use a synchronization to get host failures */
     synchro = RawImplPtr(new RawImpl());
     (*synchro).set_host(issuer->get_host()).start();
-    synchro->simcalls_.push_back(&issuer->simcall);
-    issuer->waiting_synchro = synchro;
+    synchro->simcalls_.push_back(&issuer->simcall_);
+    issuer->waiting_synchro_ = synchro;
     sleeping_.push_back(*issuer);
   } else {
     /* mutex free */
@@ -71,7 +71,7 @@ void MutexImpl::unlock(actor::ActorImpl* issuer)
     /* Give the ownership to the first waiting actor */
     owner_ = &sleeping_.front();
     sleeping_.pop_front();
-    owner_->waiting_synchro = nullptr;
+    owner_->waiting_synchro_ = nullptr;
     owner_->simcall_answer();
   } else {
     /* nobody to wake up */
@@ -103,13 +103,3 @@ void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
 {
   mutex->lock(simcall->issuer_);
 }
-
-int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex)
-{
-  return mutex->try_lock(simcall->issuer_);
-}
-
-void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex)
-{
-  mutex->unlock(simcall->issuer_);
-}