-/* Copyright (c) 2007-2020. 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. */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
-void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro, double timeout)
-{
- synchro->wait_for(simcall->issuer_, timeout);
-}
-
void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execs[],
size_t count, double timeout)
{
simcall->timeout_cb_ = nullptr;
} else {
simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() {
+ simcall->timeout_cb_ = nullptr;
for (size_t i = 0; i < count; i++) {
// Remove the first occurrence of simcall:
auto* exec = execs[i];
namespace kernel {
namespace activity {
+ExecImpl::ExecImpl()
+{
+ actor::ActorImpl* self = actor::ActorImpl::self();
+ if (self) {
+ actor_ = self;
+ self->activities_.emplace_back(this);
+ }
+}
+
ExecImpl& ExecImpl::set_host(s4u::Host* host)
{
hosts_.assign(1, host);
clean_action();
timeout_detector_.reset();
+ if (actor_) {
+ actor_->activities_.remove(this);
+ actor_ = nullptr;
+ }
/* Answer all simcalls associated with the synchro */
finish();
}
* list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the
* simcall */
- if (simcall->call_ == SIMCALL_NONE) // FIXME: maybe a better way to handle this case
+ if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case
continue; // if process handling comm is killed
- if (simcall->call_ == SIMCALL_EXECUTION_WAITANY_FOR) {
+ if (simcall->call_ == simix::Simcall::EXECUTION_WAITANY_FOR) {
simgrid::kernel::activity::ExecImpl** execs = simcall_execution_waitany_for__get__execs(simcall);
size_t count = simcall_execution_waitany_for__get__count(simcall);
xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast<int>(state_));
}
- simcall->issuer_->waiting_synchro = nullptr;
+ simcall->issuer_->waiting_synchro_ = nullptr;
/* Fail the process if the host is down */
if (simcall->issuer_->get_host()->is_on())
simcall->issuer_->simcall_answer();