#include "mc/mc.h"
#include "smx_private.hpp"
+#include "src/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
-#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/Client.hpp"
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);
comm->src_proc = nullptr;
} else if (comm->dst_proc == process) {
- 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;
delete this->context;
}
-static int dying_daemon(void* exit_status, void* data)
+static void dying_daemon(int /*exit_status*/, void* data)
{
std::vector<ActorImpl*>* vect = &simix_global->daemons;
/* Don't move the whole content since we don't really care about the order */
std::swap(*it, vect->back());
vect->pop_back();
-
- return 0;
}
+
/** This process will be terminated automatically when the last non-daemon process finishes */
void ActorImpl::daemonize()
{
smx_activity_t ActorImpl::sleep(double duration)
{
- if (host->isOff())
+ if (host->is_off())
THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->get_cname());
simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
XBT_DEBUG("Start process %s on host '%s'", name, host->get_cname());
- if (host->isOff()) {
+ if (host->is_off()) {
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->get_cname());
return nullptr;
}
/* Add properties */
if (properties != nullptr)
for (auto const& kv : *properties)
- process->setProperty(kv.first, kv.second);
+ process->set_property(kv.first, kv.second);
/* Make sure that the process is initialized for simix, in case we are called from the Host::onCreation signal */
if (host->extension<simgrid::simix::Host>() == 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);
- /* Tracing the process creation */
- if (TRACE_actor_is_enabled())
- simgrid::instr::Container::byName(process->host->get_name())->createChild(instr_pid(process->ciface()), "ACTOR");
+
/* 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);
sg_host_t host = sg_host_by_name(hostname);
XBT_DEBUG("Attach process %s on host '%s'", name, hostname);
- if (host->isOff()) {
+ if (host->is_off()) {
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, hostname);
return nullptr;
}
/* Add properties */
if (properties != nullptr)
for (auto const& kv : *properties)
- process->setProperty(kv.first, kv.second);
+ process->set_property(kv.first, kv.second);
/* Add the process to it's host process list */
host->extension<simgrid::simix::Host>()->process_list.push_back(*process);
simix_global->process_to_run.push_back(process);
intrusive_ptr_add_ref(process);
- /* Tracing the process creation */
- if (TRACE_actor_is_enabled())
- simgrid::instr::Container::byName(process->host->get_name())->createChild(instr_pid(process->ciface()), "ACTOR");
auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(process->context);
if (not context)
xbt_die("Not a suitable context");
context->attach_start();
+
+ /* 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);
+
return process;
}
boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(process->waiting_synchro);
if (exec != nullptr) {
- 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:
- 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);
} else if (sleep != nullptr) {
SIMIX_process_sleep_destroy(process->waiting_synchro);
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(process->waiting_synchro);
- if (exec != nullptr && exec->surfAction_)
- exec->surfAction_->cancel();
+ if (exec != nullptr && exec->surf_action_)
+ exec->surf_action_->cancel();
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(process->waiting_synchro);
}
-void simcall_HANDLER_process_killall(smx_simcall_t simcall)
-{
- SIMIX_process_killall(simcall->issuer);
-}
/**
* \brief Kills all running processes.
* \param issuer this one will not be killed
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
} else {
- sync_suspend->simcalls.push_back(simcall);
+ sync_suspend->simcalls_.push_back(simcall);
process->waiting_synchro = sync_suspend;
process->waiting_synchro->suspend();
}
return;
}
smx_activity_t sync = SIMIX_process_join(simcall->issuer, process, timeout);
- sync->simcalls.push_back(simcall);
+ sync->simcalls_.push_back(simcall);
simcall->issuer->waiting_synchro = sync;
}
smx_activity_t res = issuer->sleep(timeout);
intrusive_ptr_add_ref(res.get());
SIMIX_process_on_exit(process,
- [](void*, void* arg) {
+ [](int, void* arg) {
auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
if (sleep->surf_sleep)
- sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::done);
+ sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED);
intrusive_ptr_release(sleep);
- return 0;
},
res.get());
return res;
return;
}
smx_activity_t sync = simcall->issuer->sleep(duration);
- sync->simcalls.push_back(simcall);
+ sync->simcalls_.push_back(simcall);
simcall->issuer->waiting_synchro = sync;
}
/* execute the on_exit functions */
SIMIX_process_on_exit_runall(self);
/* Add the process to the list of process to restart, only if the host is down */
- if (self->auto_restart && self->host->isOff()) {
+ if (self->auto_restart && self->host->is_off()) {
SIMIX_host_add_auto_restart_process(self->host, self->get_cname(), self->code, self->getUserData(),
- SIMIX_timer_get_date(self->kill_timer), self->getProperties(),
+ SIMIX_timer_get_date(self->kill_timer), self->get_properties(),
self->auto_restart);
}
XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host->get_cname());
while (not process->on_exit.empty()) {
s_smx_process_exit_fun_t exit_fun = process->on_exit.back();
process->on_exit.pop_back();
- (exit_fun.fun)((void*)exit_status, exit_fun.arg);
+ (exit_fun.fun)(exit_status, exit_fun.arg);
}
}
-void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data) {
- xbt_assert(process, "current process not found: are you in maestro context ?");
+void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data)
+{
+ SIMIX_process_on_exit(process, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
+}
- s_smx_process_exit_fun_t exit_fun = {fun, data};
+void SIMIX_process_on_exit(smx_actor_t process, std::function<void(int, void*)> fun, void* data)
+{
+ xbt_assert(process, "current process not found: are you in maestro context ?");
- process->on_exit.push_back(exit_fun);
+ process->on_exit.emplace_back(s_smx_process_exit_fun_t{fun, data});
}
/**
if (name == nullptr)
name = "";
smx_actor_t self = SIMIX_process_self();
- 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);
});
}
