namespace kernel {
namespace activity {
-void SemaphoreImpl::acquire(smx_actor_t issuer, double timeout)
+void SemaphoreImpl::acquire(actor::ActorImpl* issuer, double timeout)
{
RawImplPtr synchro = nullptr;
XBT_DEBUG("Wait semaphore %p (timeout:%f)", this, timeout);
if (value_ <= 0) {
- synchro = RawImplPtr(new RawImpl())->start(issuer->get_host(), timeout);
+ synchro = RawImplPtr(new RawImpl());
+ (*synchro).set_host(issuer->get_host()).set_timeout(timeout).start();
synchro->simcalls_.push_front(&issuer->simcall);
issuer->waiting_synchro = synchro;
sleeping_.push_back(*issuer);
} else {
value_--;
- SIMIX_simcall_answer(&issuer->simcall);
+ issuer->simcall_answer();
}
}
void SemaphoreImpl::release()
auto& actor = sleeping_.front();
sleeping_.pop_front();
actor.waiting_synchro = nullptr;
- SIMIX_simcall_answer(&actor.simcall);
+ actor.simcall_answer();
} else {
value_++;
}