if (comm->src_proc == process) {
XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(),
if (comm->src_proc == process) {
XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(),
- comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc);
+ comm->detached, (int)comm->state_, comm->src_proc, comm->dst_proc);
- XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state,
+ XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_,
comm->src_proc, comm->dst_proc);
comm->dst_proc = nullptr;
comm->src_proc, comm->dst_proc);
comm->dst_proc = nullptr;
XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname());
simix_global->process_to_run.push_back(process);
intrusive_ptr_add_ref(process);
XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname());
simix_global->process_to_run.push_back(process);
intrusive_ptr_add_ref(process);
/* The onCreation() signal must be delayed until there, where the pid and everything is set */
simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes
simgrid::s4u::Actor::on_creation(tmp);
/* The onCreation() signal must be delayed until there, where the pid and everything is set */
simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes
simgrid::s4u::Actor::on_creation(tmp);
auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(process->context);
if (not context)
xbt_die("Not a suitable context");
context->attach_start();
auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(process->context);
if (not context)
xbt_die("Not a suitable context");
context->attach_start();
- if (exec->surfAction_) {
- exec->surfAction_->cancel();
- exec->surfAction_->unref();
- exec->surfAction_ = nullptr;
+ if (exec->surf_action_) {
+ exec->surf_action_->cancel();
+ exec->surf_action_->unref();
+ exec->surf_action_ = nullptr;
}
} else if (comm != nullptr) {
process->comms.remove(process->waiting_synchro);
comm->cancel();
// Remove first occurrence of &process->simcall:
}
} else if (comm != nullptr) {
process->comms.remove(process->waiting_synchro);
comm->cancel();
// Remove first occurrence of &process->simcall:
- auto i = boost::range::find(process->waiting_synchro->simcalls, &process->simcall);
- if (i != process->waiting_synchro->simcalls.end())
- process->waiting_synchro->simcalls.remove(&process->simcall);
+ auto i = boost::range::find(process->waiting_synchro->simcalls_, &process->simcall);
+ if (i != process->waiting_synchro->simcalls_.end())
+ process->waiting_synchro->simcalls_.remove(&process->simcall);
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(process->waiting_synchro);
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(process->waiting_synchro);
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(process->waiting_synchro);
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(process->waiting_synchro);
- return simgrid::simix::kernelImmediate([name, code, data, host, properties, self] {
+ return simgrid::simix::simcall([name, code, data, host, properties, self] {
return SIMIX_process_create(name, std::move(code), data, host, properties, self);
});
}
return SIMIX_process_create(name, std::move(code), data, host, properties, self);
});
}