#include "xbt/functional.hpp"
#include "xbt/log.h"
#include "xbt/sysdep.h"
+#include "xbt/utility.hpp"
#include "simgrid/s4u/Host.hpp"
#include "mc/mc.h"
-#include "smx_private.h"
+#include "smx_private.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
-#include "src/mc/mc_replay.h"
+#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/Client.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/surf_interface.hpp"
XBT_DEBUG("%p should not be run anymore",process);
simix_global->process_list.erase(process->pid);
- if (process->host)
- xbt_swag_remove(process, process->host->extension<simgrid::simix::Host>()->process_list);
- xbt_swag_insert(process, simix_global->process_to_destroy);
+ if (process->host && process->host_process_list_hook.is_linked())
+ simgrid::xbt::intrusive_erase(process->host->extension<simgrid::simix::Host>()->process_list, *process);
+ if (not process->smx_destroy_list_hook.is_linked()) {
+#if SIMGRID_HAVE_MC
+ xbt_dynar_push_as(simix_global->dead_actors_vector, smx_actor_t, process);
+#endif
+ simix_global->process_to_destroy.push_back(*process);
+ }
process->context->iwannadie = 0;
xbt_os_mutex_release(simix_global->mutex);
*/
void SIMIX_process_empty_trash()
{
- smx_actor_t process = static_cast<smx_actor_t>(xbt_swag_extract(simix_global->process_to_destroy));
-
- while (process) {
+ while (not simix_global->process_to_destroy.empty()) {
+ smx_actor_t process = &simix_global->process_to_destroy.front();
+ simix_global->process_to_destroy.pop_front();
XBT_DEBUG("Getting rid of %p",process);
intrusive_ptr_release(process);
- process = static_cast<smx_actor_t>(xbt_swag_extract(simix_global->process_to_destroy));
}
+#if SIMGRID_HAVE_MC
+ xbt_dynar_reset(simix_global->dead_actors_vector);
+#endif
}
namespace simgrid {
simgrid::s4u::Actor* ActorImpl::restart()
{
- XBT_DEBUG("Restarting process %s on %s", cname(), host->getCname());
+ XBT_DEBUG("Restarting process %s on %s", getCname(), host->getCname());
// retrieve the arguments of the old process
// FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
return nullptr;
} else {
- return SIMIX_execution_start(this, "suspend", 0.0, 1.0, 0.0);
+ return SIMIX_execution_start("suspend", 0.0, 1.0, 0.0, this->host);
}
}
host->extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
/* Add the process to its host process list */
- xbt_swag_insert(process, host->extension<simgrid::simix::Host>()->process_list);
+ host->extension<simgrid::simix::Host>()->process_list.push_back(*process);
XBT_DEBUG("Start context '%s'", process->name.c_str());
/* Now insert it in the global process list and in the process to run list */
simix_global->process_list[process->pid] = process;
- XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->getCname());
+ XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname());
simix_global->process_to_run.push_back(process);
intrusive_ptr_add_ref(process);
/* Tracing the process creation */
- TRACE_msg_process_create(process->cname(), process->pid, process->host);
+ TRACE_msg_process_create(process->getName(), process->pid, process->host);
return process;
}
process->setProperty(kv.first, kv.second);
/* Add the process to it's host process list */
- xbt_swag_insert(process, host->extension<simgrid::simix::Host>()->process_list);
+ host->extension<simgrid::simix::Host>()->process_list.push_back(*process);
/* Now insert it in the global process list and in the process to run list */
simix_global->process_list[process->pid] = process;
- XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->getCname());
+ XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname());
simix_global->process_to_run.push_back(process);
/* Tracing the process creation */
- TRACE_msg_process_create(process->cname(), process->pid, process->host);
+ TRACE_msg_process_create(process->getName(), process->pid, process->host);
auto context = dynamic_cast<simgrid::kernel::context::AttachContext*>(process->context);
if (not context)
*/
void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) {
- XBT_DEBUG("Killing process %s@%s", process->cname(), process->host->getCname());
+ if (process->finished) {
+ XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", process->getCname(),
+ process->host->getCname());
+ return;
+ }
+
+ XBT_DEBUG("Killing process %s@%s", process->getCname(), process->host->getCname());
process->context->iwannadie = 1;
process->blocked = 0;
boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(process->waiting_synchro);
if (exec != nullptr) {
- /* Nothing to do */
+ if (exec->surfAction_) {
+ exec->surfAction_->cancel();
+ exec->surfAction_->unref();
+ exec->surfAction_ = nullptr;
+ }
} else if (comm != nullptr) {
process->comms.remove(process->waiting_synchro);
comm->cancel();
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(process->waiting_synchro);
- if (exec != nullptr && exec->surf_exec)
- exec->surf_exec->cancel();
+ if (exec != nullptr && exec->surfAction_)
+ exec->surfAction_->cancel();
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(process->waiting_synchro);
if (reset_pid > 0)
simix_process_maxpid = reset_pid;
-
- SIMIX_context_runall();
-
- SIMIX_process_empty_trash();
}
void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest)
{
xbt_assert((process != nullptr), "Invalid parameters");
- xbt_swag_remove(process, process->host->extension<simgrid::simix::Host>()->process_list);
+ simgrid::xbt::intrusive_erase(process->host->extension<simgrid::simix::Host>()->process_list, *process);
process->host = dest;
- xbt_swag_insert(process, dest->extension<simgrid::simix::Host>()->process_list);
+ dest->extension<simgrid::simix::Host>()->process_list.push_back(*process);
}
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process)
simcall->issuer->waiting_synchro = sync;
}
-static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_actor_t process, smx_activity_t sleep_act)
-{
- simgrid::kernel::activity::SleepImpl* sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(sleep_act.get());
- if (sleep->surf_sleep) {
- sleep->surf_sleep->cancel();
-
- while (not sleep->simcalls.empty()) {
- smx_simcall_t simcall = sleep->simcalls.front();
- sleep->simcalls.pop_front();
- simcall_process_sleep__set__result(simcall, SIMIX_DONE);
- simcall->issuer->waiting_synchro = nullptr;
- if (simcall->issuer->suspended) {
- XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
- simcall->issuer->suspended = 0;
- simcall_HANDLER_process_suspend(simcall, simcall->issuer);
- } else {
- SIMIX_simcall_answer(simcall);
- }
- }
- sleep->surf_sleep->unref();
- sleep->surf_sleep = nullptr;
- }
- intrusive_ptr_release(process);
- intrusive_ptr_release(sleep_act.get());
- return 0;
-}
-
smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout)
{
smx_activity_t res = issuer->sleep(timeout);
intrusive_ptr_add_ref(res.get());
- intrusive_ptr_add_ref(process);
SIMIX_process_on_exit(process,
[](void*, void* arg) {
- auto argp = static_cast<std::pair<smx_actor_t, smx_activity_t>*>(arg);
- int res = simgrid::simix::kernelImmediate(
- [&] { return SIMIX_process_join_finish(SMX_EXIT_SUCCESS, argp->first, argp->second); });
- delete argp;
- return res;
+ auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
+ if (sleep->surf_sleep)
+ sleep->surf_sleep->finish(simgrid::surf::Action::State::done);
+ intrusive_ptr_release(sleep);
+ return 0;
},
- new std::pair<smx_actor_t, smx_activity_t>(process, res));
+ res.get());
return res;
}
*/
void SIMIX_process_yield(smx_actor_t self)
{
- XBT_DEBUG("Yield actor '%s'", self->cname());
+ XBT_DEBUG("Yield actor '%s'", self->getCname());
/* Go into sleep and return control to maestro */
self->context->suspend();
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()) {
- SIMIX_host_add_auto_restart_process(self->host, self->cname(), self->code, self->userdata,
+ SIMIX_host_add_auto_restart_process(self->host, self->getCname(), self->code, self->userdata,
SIMIX_timer_get_date(self->kill_timer), self->getProperties(),
self->auto_restart);
}
- XBT_DEBUG("Process %s@%s is dead", self->cname(), self->host->getCname());
+ XBT_DEBUG("Process %s@%s is dead", self->getCname(), self->host->getCname());
self->context->stop();
}
smx_process_exit_status_t exit_status = (process->context->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
while (not process->on_exit.empty()) {
s_smx_process_exit_fun_t exit_fun = process->on_exit.back();
- (exit_fun.fun)((void*)exit_status, exit_fun.arg);
process->on_exit.pop_back();
+ (exit_fun.fun)((void*)exit_status, exit_fun.arg);
}
}
