-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. 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. */
}
namespace simgrid {
+
namespace simix {
ActorImpl::~ActorImpl()
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);
}
}
if (parent_process != nullptr) {
process->ppid = parent_process->pid;
-/* SMPI process have their own data segment and each other inherit from their father */
-#if HAVE_SMPI
- if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) {
- if (parent_process->pid != 0) {
- process->segment_index = parent_process->segment_index;
- } else {
- process->segment_index = process->pid - 1;
- }
- }
-#endif
}
process->code = code;
if (host->extension<simgrid::simix::Host>() == nullptr)
host->extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
- /* Add the process to its host process list */
+ /* Add the process to its host's process list */
host->extension<simgrid::simix::Host>()->process_list.push_back(*process);
XBT_DEBUG("Start context '%s'", process->name.c_str());
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->getName(), process->pid, process->host);
+ /* 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::onCreation(tmp);
+
return process;
}
if (parent_process != nullptr) {
process->ppid = parent_process->pid;
- /* SMPI process have their own data segment and each other inherit from their father */
-#if HAVE_SMPI
- if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) {
- if (parent_process->pid != 0) {
- process->segment_index = parent_process->segment_index;
- } else {
- process->segment_index = process->pid - 1;
- }
- }
-#endif
}
/* Process data for auto-restart */
simix_global->process_list[process->pid] = process;
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->getName(), process->pid, process->host);
auto process = context->process();
simix_global->cleanup_process_function(process);
context->attach_stop();
- delete process;
}
/**
simix_process_maxpid = reset_pid;
}
-void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest)
+void SIMIX_process_change_host(smx_actor_t actor, sg_host_t dest)
{
- xbt_assert((process != nullptr), "Invalid parameters");
- simgrid::xbt::intrusive_erase(process->host->extension<simgrid::simix::Host>()->process_list, *process);
- process->host = dest;
- dest->extension<simgrid::simix::Host>()->process_list.push_back(*process);
+ xbt_assert((actor != nullptr), "Invalid parameters");
+ simgrid::xbt::intrusive_erase(actor->host->extension<simgrid::simix::Host>()->process_list, *actor);
+ actor->host = dest;
+ dest->extension<simgrid::simix::Host>()->process_list.push_back(*actor);
}
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process)
return process->name.c_str();
}
-smx_actor_t SIMIX_process_get_by_name(const char* name)
-{
- for (auto const& kv : simix_global->process_list)
- if (kv.second->name == name)
- return kv.second;
- return nullptr;
-}
-
void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout)
{
if (process->finished) {
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", self->name.c_str());
- if (self->new_host) {
- SIMIX_process_change_host(self, self->new_host);
- self->new_host = nullptr;
- }
-
if (self->context->iwannadie){
XBT_DEBUG("I wanna die!");
self->finished = true;
std::rethrow_exception(std::move(exception));
}
- if(SMPI_switch_data_segment && self->segment_index != -1){
- SMPI_switch_data_segment(self->segment_index);
+ if(SMPI_switch_data_segment){
+ SMPI_switch_data_segment(self->pid);
}
}
-/* callback: termination */
-void SIMIX_process_exception_terminate(xbt_ex_t * e)
-{
- xbt_ex_display(e);
- xbt_abort();
-}
-
/** @brief Returns the list of processes to run. */
const std::vector<smx_actor_t>& simgrid::simix::process_get_runnable()
{
}
void SIMIX_process_on_exit_runall(smx_actor_t process) {
+ simgrid::s4u::Actor::onDestruction(process->iface());
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();