/* 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. */
-#include <exception>
-#include <functional>
-#include <map>
-#include <string>
-#include <utility>
-
-#include <boost/range/algorithm.hpp>
-
-#include "xbt/ex.hpp"
-#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.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"
-#include "src/msg/msg_private.hpp"
+#include "src/simix/smx_host_private.hpp"
+#include "src/simix/smx_io_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "xbt/ex.hpp"
#ifdef HAVE_SMPI
#include "src/smpi/include/private.hpp"
#endif
+#include <boost/range/algorithm.hpp>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
unsigned long simix_process_maxpid = 0;
maestro = new simgrid::kernel::actor::ActorImpl();
maestro->pid = simix_process_maxpid++;
maestro->name = "";
- maestro->userdata = nullptr;
+ maestro->setUserData(nullptr);
if (not code) {
maestro->context = SIMIX_context_new(std::function<void()>(), nullptr, maestro);
process->pid = simix_process_maxpid++;
process->name = simgrid::xbt::string(name);
process->host = host;
- process->userdata = data;
+ process->setUserData(data);
process->simcall.issuer = process;
if (parent_process != 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::onCreation(tmp);
+ simgrid::s4u::Actor::on_creation(tmp);
return process;
}
process->pid = simix_process_maxpid++;
process->name = std::string(name);
process->host = host;
- process->userdata = data;
+ process->setUserData(data);
process->simcall.issuer = process;
if (parent_process != nullptr) {
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;
}
}
-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
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->get_cname(), self->code, self->userdata,
+ SIMIX_host_add_auto_restart_process(self->host, self->get_cname(), self->code, self->getUserData(),
SIMIX_timer_get_date(self->kill_timer), self->getProperties(),
self->auto_restart);
}
}
void SIMIX_process_on_exit_runall(smx_actor_t process) {
- simgrid::s4u::Actor::onDestruction(process->iface());
+ simgrid::s4u::Actor::on_destruction(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();
* \param code the main function of the process
* \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can
* be nullptr.
- * It can be retrieved with the function \ref simcall_process_get_data.
+ * It can be retrieved with the method ActorImpl::getUserData().
* \param host where the new agent is executed.
- * \param kill_time time when the process is killed
* \param argc first argument passed to \a code
* \param argv second argument passed to \a code
* \param properties the properties of the process
- * \param auto_restart either it is autorestarting or not.
*/
smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc,
char** argv, std::map<std::string, std::string>* properties)