-/* 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. */
/* 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 */
locked_ = true;
owner_ = issuer;
- SIMIX_simcall_answer(&issuer->simcall);
+ issuer->simcall_answer();
}
XBT_OUT();
}
owner_->get_cname(), owner_->get_pid());
if (not sleeping_.empty()) {
- /*process to wake up */
- actor::ActorImpl* p = &sleeping_.front();
+ /* Give the ownership to the first waiting actor */
+ owner_ = &sleeping_.front();
sleeping_.pop_front();
- p->waiting_synchro = nullptr;
- owner_ = p;
- SIMIX_simcall_answer(&p->simcall);
+ owner_->waiting_synchro_ = nullptr;
+ owner_->simcall_answer();
} else {
/* nobody to wake up */
locked_ = false;
void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
{
- mutex->lock(simcall->issuer);
+ mutex->lock(simcall->issuer_);
}
int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex)
{
- return mutex->try_lock(simcall->issuer);
+ return mutex->try_lock(simcall->issuer_);
}
void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex)
{
- mutex->unlock(simcall->issuer);
+ mutex->unlock(simcall->issuer_);
}