#include "mc/mc.h"
#include "smx_private.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
#include "src/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
#include "src/kernel/activity/SynchroRaw.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/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "xbt/ex.hpp"
unsigned long simix_process_maxpid = 0;
/**
- * \brief Returns the current agent.
+ * @brief Returns the current agent.
*
* This functions returns the currently running SIMIX process.
*
- * \return The SIMIX process
+ * @return The SIMIX process
*/
smx_actor_t SIMIX_process_self()
{
}
/**
- * \brief Returns whether a process has pending asynchronous communications.
- * \return true if there are asynchronous communications in this process
+ * @brief Returns whether a process has pending asynchronous communications.
+ * @return true if there are asynchronous communications in this process
*/
int SIMIX_process_has_pending_comms(smx_actor_t process) {
}
/**
- * \brief Moves a process to the list of processes to destroy.
+ * @brief Moves a process to the list of processes to destroy.
*/
void SIMIX_process_cleanup(smx_actor_t process)
{
process->kill_timer = nullptr;
}
- xbt_os_mutex_acquire(simix_global->mutex);
+ simix_global->mutex.lock();
/* cancel non-blocking communications */
while (not process->comms.empty()) {
XBT_DEBUG("%p should not be run anymore",process);
simix_global->process_list.erase(process->pid_);
if (process->host_ && process->host_process_list_hook.is_linked())
- simgrid::xbt::intrusive_erase(process->host_->extension<simgrid::simix::Host>()->process_list, *process);
+ simgrid::xbt::intrusive_erase(process->host_->pimpl_->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);
}
process->context_->iwannadie = 0;
- xbt_os_mutex_release(simix_global->mutex);
+ simix_global->mutex.unlock();
}
/**
XBT_DEBUG("Restarting process %s on %s", get_cname(), host_->get_cname());
// retrieve the arguments of the old process
- // FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
- simgrid::kernel::actor::ProcessArg arg;
- arg.name = name_;
- arg.code = code;
- arg.host = host_;
- arg.kill_time = SIMIX_timer_get_date(kill_timer);
- arg.data = userdata_;
- arg.properties = nullptr;
- arg.auto_restart = auto_restart_;
+ simgrid::kernel::actor::ProcessArg arg = ProcessArg(host_, this);
// kill the old process
SIMIX_process_kill(this, (this == simix_global->maestro_process) ? this : SIMIX_process_self());
// start the new process
ActorImpl* actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host,
arg.properties.get(), nullptr);
- if (arg.kill_time >= 0)
- simcall_process_set_kill_time(actor, arg.kill_time);
- if (arg.auto_restart)
- actor->auto_restart_ = arg.auto_restart;
+ simcall_process_set_kill_time(actor, arg.kill_time);
+ actor->set_auto_restart(arg.auto_restart);
return actor->ciface();
}
}
/**
- * \brief Internal function to create a process.
+ * @brief Internal function to create a process.
*
* This function actually creates the process.
* It may be called when a SIMCALL_PROCESS_CREATE simcall occurs,
* or directly for SIMIX internal purposes. The sure thing is that it's called from maestro context.
*
- * \return the process created
+ * @return the process created
*/
-smx_actor_t SIMIX_process_create(const char* name, simgrid::simix::ActorCode code, void* data, simgrid::s4u::Host* host,
+smx_actor_t SIMIX_process_create(std::string name, simgrid::simix::ActorCode code, void* data, simgrid::s4u::Host* host,
std::unordered_map<std::string, std::string>* properties, smx_actor_t parent_process)
{
- XBT_DEBUG("Start process %s on host '%s'", name, host->get_cname());
+ XBT_DEBUG("Start process %s on host '%s'", name.c_str(), host->get_cname());
if (host->is_off()) {
- XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->get_cname());
+ XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
return nullptr;
}
for (auto const& kv : *properties)
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)
- host->extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
-
/* Add the process to its host's process list */
- host->extension<simgrid::simix::Host>()->process_list.push_back(*process);
+ host->pimpl_->process_list_.push_back(*process);
XBT_DEBUG("Start context '%s'", process->get_cname());
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);
+ host->pimpl_->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;
}
/**
- * \brief Executes the processes from simix_global->process_to_run.
+ * @brief Executes the processes from simix_global->process_to_run.
*
* The processes of simix_global->process_to_run are run (in parallel if
* possible). On exit, simix_global->process_to_run is empty, and
}
/**
- * \brief Internal function to kill a SIMIX process.
+ * @brief Internal function to kill a SIMIX process.
*
* This function may be called when a SIMCALL_PROCESS_KILL simcall occurs,
* or directly for SIMIX internal purposes.
*
- * \param process poor victim
- * \param issuer the process which has sent the PROCESS_KILL. Important to not schedule twice the same process.
+ * @param process poor victim
+ * @param issuer the process which has sent the PROCESS_KILL. Important to not schedule twice the same process.
*/
void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) {
return;
}
- XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(), issuer->host_->get_cname(),
- process->get_cname(), process->host_->get_cname());
+ XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(),
+ (issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), process->get_cname(),
+ process->host_->get_cname());
process->context_->iwannadie = 1;
process->blocked_ = 0;
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);
-
+ if (sleep->surf_sleep)
+ sleep->surf_sleep->cancel();
+ sleep->post();
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(process, &process->simcall);
}
/**
- * \brief Kills all running processes.
- * \param issuer this one will not be killed
+ * @brief Kills all running processes.
+ * @param issuer this one will not be killed
*/
void SIMIX_process_killall(smx_actor_t issuer)
{
void SIMIX_process_change_host(smx_actor_t actor, sg_host_t dest)
{
xbt_assert((actor != nullptr), "Invalid parameters");
- simgrid::xbt::intrusive_erase(actor->host_->extension<simgrid::simix::Host>()->process_list, *actor);
+ simgrid::xbt::intrusive_erase(actor->host_->pimpl_->process_list_, *actor);
actor->host_ = dest;
- dest->extension<simgrid::simix::Host>()->process_list.push_back(*actor);
+ dest->pimpl_->process_list_.push_back(*actor);
}
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process)
}
/**
- * \brief Calling this function makes the process to yield.
+ * @brief Calling this function makes the process to yield.
*
* Only the current process can call this function, giving back the control to maestro.
*
- * \param self the current process
+ * @param self the current process
*/
void SIMIX_process_yield(smx_actor_t self)
{
/** @brief Restart a process, starting it again from the beginning. */
/**
- * \ingroup simix_process_management
- * \brief Creates and runs a new SIMIX process.
+ * @ingroup simix_process_management
+ * @brief Creates and runs a new SIMIX process.
*
* The structure and the corresponding thread are created and put in the list of ready processes.
*
- * \param name a name for the process. It is for user-level information and can be nullptr.
- * \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
+ * @param name a name for the process. It is for user-level information and can be nullptr.
+ * @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 method ActorImpl::getUserData().
- * \param host where the new agent is executed.
- * \param argc first argument passed to \a code
- * \param argv second argument passed to \a code
- * \param properties the properties of the process
+ * @param host where the new agent is executed.
+ * @param argc first argument passed to @a code
+ * @param argv second argument passed to @a code
+ * @param properties the properties of the process
*/
-smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc,
+smx_actor_t simcall_process_create(std::string name, xbt_main_func_t code, void* data, sg_host_t host, int argc,
char** argv, std::unordered_map<std::string, std::string>* properties)
{
- if (name == nullptr)
- name = "";
auto wrapped_code = simgrid::xbt::wrap_main(code, argc, argv);
for (int i = 0; i != argc; ++i)
xbt_free(argv[i]);
return res;
}
-smx_actor_t simcall_process_create(const char* name, simgrid::simix::ActorCode code, void* data, sg_host_t host,
+smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode code, void* data, sg_host_t host,
std::unordered_map<std::string, std::string>* properties)
{
- if (name == nullptr)
- name = "";
smx_actor_t self = SIMIX_process_self();
return simgrid::simix::simcall([name, code, data, host, properties, self] {
return SIMIX_process_create(name, std::move(code), data, host, properties, self);
