-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2017. 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. */
#include "msg_private.h"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "src/simix/ActorImpl.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
+SG_BEGIN_DECL()
+
/** @addtogroup m_process_management
*
* Processes (#msg_process_t) are independent agents that can do stuff on their own. They are in charge of executing
/******************************** Process ************************************/
/**
- * \brief Cleans the MSG data of a process.
- * \param smx_proc a SIMIX process
+ * \brief Cleans the MSG data of an actor
+ * \param smx_actor a SIMIX actor
*/
void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor)
{
- MsgActorExt* msg_actor;
+ simgrid::msg::ActorExt* msg_actor;
// get the MSG process from the SIMIX process
if (smx_actor == SIMIX_process_self()) {
/* avoid a SIMIX request if this function is called by the process itself */
- msg_actor = (MsgActorExt*)SIMIX_process_self_get_data();
+ msg_actor = (simgrid::msg::ActorExt*)SIMIX_process_self_get_data();
SIMIX_process_self_set_data(nullptr);
} else {
- msg_actor = (MsgActorExt*)smx_actor->data;
+ msg_actor = (simgrid::msg::ActorExt*)smx_actor->data;
simcall_process_set_data(smx_actor, nullptr);
}
msg_global->process_data_cleanup(msg_actor->data);
}
- // free the MSG process
- xbt_free(msg_actor);
+ delete msg_actor;
SIMIX_process_cleanup(smx_actor);
}
/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data, sg_host_t host,
- xbt_dict_t properties, int auto_restart, smx_actor_t parent_process)
+ xbt_dict_t properties, smx_actor_t parent_process)
{
- msg_process_t p = MSG_process_create_with_environment(name, std::move(code), data, host, properties);
- if (p) {
- MSG_process_auto_restart_set(p,auto_restart);
- }
- return p;
+ msg_process_t p = MSG_process_create_from_stdfunc(name, std::move(code), data, host, properties);
+ return p == nullptr ? nullptr : p->getImpl();
}
/** \ingroup m_process_management
{
std::function<void()> function;
if (code)
- function = simgrid::xbt::wrapMain(code, argc, const_cast<const char*const*>(argv));
- msg_process_t res = MSG_process_create_with_environment(name,
- std::move(function), data, host, properties);
+ function = simgrid::xbt::wrapMain(code, argc, static_cast<const char* const*>(argv));
+
+ msg_process_t res = MSG_process_create_from_stdfunc(name, std::move(function), data, host, properties);
for (int i = 0; i != argc; ++i)
xbt_free(argv[i]);
xbt_free(argv);
return res;
}
-msg_process_t MSG_process_create_with_environment(
- const char *name, std::function<void()> code, void *data,
- msg_host_t host, xbt_dict_t properties)
+SG_END_DECL()
+
+msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function<void()> code, void* data, msg_host_t host,
+ xbt_dict_t properties)
{
xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr");
- MsgActorExt* msgExt = new MsgActorExt(data);
+ simgrid::msg::ActorExt* msgExt = new simgrid::msg::ActorExt(data);
- /* Let's create the process: SIMIX may decide to start it right now,
- * even before returning the flow control to us */
- msg_process_t process = simcall_process_create(name, std::move(code), msgExt, host, properties, 0);
+ smx_actor_t process = simcall_process_create(name, std::move(code), msgExt, host, properties);
- if (!process) { /* Undo everything */
+ if (not process) { /* Undo everything */
delete msgExt;
return nullptr;
}
- else {
- simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
- }
- return process;
+
+ simcall_process_on_exit(process, (int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process);
+ return process->ciface();
}
+SG_BEGIN_DECL()
+
/* Become a process in the simulation
*
* Currently this can only be called by the main thread (once) and only work with some thread factories
xbt_assert(host != nullptr, "Invalid parameters: host and code params must not be nullptr");
/* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */
- msg_process_t process = SIMIX_process_attach(name, new MsgActorExt(data), host->cname(), properties, nullptr);
- if (!process)
+ smx_actor_t process =
+ SIMIX_process_attach(name, new simgrid::msg::ActorExt(data), host->cname(), properties, nullptr);
+ if (not process)
xbt_die("Could not attach");
simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
- return process;
+ return process->ciface();
}
/** Detach a process attached with `MSG_process_attach()`
*/
void MSG_process_kill(msg_process_t process)
{
- simcall_process_kill(process);
+ simcall_process_kill(process->getImpl());
}
/**
* \param timeout wait until the process is over, or the timeout occurs
*/
msg_error_t MSG_process_join(msg_process_t process, double timeout){
- simcall_process_join(process, timeout);
+ simcall_process_join(process->getImpl(), timeout);
return MSG_OK;
}
msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
{
TRACE_msg_process_change_host(process, MSG_process_get_host(process), host);
- simcall_process_set_host(process, host);
+ simcall_process_set_host(process->getImpl(), host);
return MSG_OK;
}
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
/* get from SIMIX the MSG process data, and then the user data */
- MsgActorExt* msgExt = (MsgActorExt*)process->data;
+ simgrid::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->getImpl()->data;
if (msgExt)
return msgExt->data;
else
{
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
- MsgActorExt* msgExt = (MsgActorExt*)process->data;
- msgExt->data = data;
+ static_cast<simgrid::msg::ActorExt*>(process->getImpl()->data)->data = data;
return MSG_OK;
}
msg_host_t MSG_process_get_host(msg_process_t process)
{
if (process == nullptr) {
- return MSG_process_self()->host;
+ return SIMIX_process_self()->host;
} else {
- return process->host;
+ return process->getImpl()->host;
}
}
*/
msg_process_t MSG_process_from_PID(int PID)
{
- return SIMIX_process_from_PID(PID);
+ return SIMIX_process_from_PID(PID)->ciface();
}
/** @brief returns a list of all currently existing processes */
*/
msg_error_t MSG_process_set_kill_time(msg_process_t process, double kill_time)
{
- simcall_process_set_kill_time(process,kill_time);
+ simcall_process_set_kill_time(process->getImpl(), kill_time);
return MSG_OK;
}
{
/* Do not raise an exception here: this function is called by the logs
* and the exceptions, so it would be called back again and again */
- if (process == nullptr)
+ if (process == nullptr || process->getImpl() == nullptr)
return 0;
- return process->pid;
+ return process->getImpl()->pid;
}
/** \ingroup m_process_management
*/
int MSG_process_get_PPID(msg_process_t process)
{
- return process->ppid;
+ return process->getImpl()->ppid;
}
/** \ingroup m_process_management
*/
const char *MSG_process_get_name(msg_process_t process)
{
- return process->name.c_str();
+ return process->cname();
}
/** \ingroup m_process_management
xbt_dict_t MSG_process_get_properties(msg_process_t process)
{
xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
- return simcall_process_get_properties(process);
+ return simcall_process_get_properties(process->getImpl());
}
/** \ingroup m_process_management
*/
int MSG_process_self_PID()
{
- return MSG_process_get_PID(MSG_process_self());
+ smx_actor_t self = SIMIX_process_self();
+ return self == nullptr ? 0 : self->pid;
}
/** \ingroup m_process_management
return MSG_process_get_PPID(MSG_process_self());
}
+/** \ingroup m_process_management
+ * \brief Return the name of the current process.
+ */
+const char* MSG_process_self_name()
+{
+ return SIMIX_process_self_get_name();
+}
+
/** \ingroup m_process_management
* \brief Return the current process.
*
*/
msg_process_t MSG_process_self()
{
- return SIMIX_process_self();
+ return SIMIX_process_self()->ciface();
}
/** \ingroup m_process_management
xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
TRACE_msg_process_suspend(process);
- simcall_process_suspend(process);
+ simcall_process_suspend(process->getImpl());
return MSG_OK;
}
xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
TRACE_msg_process_resume(process);
- simcall_process_resume(process);
+ simcall_process_resume(process->getImpl());
return MSG_OK;
}
*/
int MSG_process_is_suspended(msg_process_t process)
{
- xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
- return simcall_process_is_suspended(process);
+ return simcall_process_is_suspended(process->getImpl());
}
smx_context_t MSG_process_get_smx_ctx(msg_process_t process) {
- return SIMIX_process_get_context(process);
+ return SIMIX_process_get_context(process->getImpl());
}
/**
* \ingroup m_process_management
* You should use them to free the data used by your process.
*/
void MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void *data) {
- simcall_process_on_exit(MSG_process_self(),fun,data);
+ simcall_process_on_exit(SIMIX_process_self(), fun, data);
}
/**
* \ingroup m_process_management
* If the flag is set to 1, the process will be automatically restarted when its host comes back up.
*/
XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_restart) {
- simcall_process_auto_restart_set(process,auto_restart);
+ simcall_process_auto_restart_set(process->getImpl(), auto_restart);
}
-/*
+/**
* \ingroup m_process_management
* \brief Restarts a process from the beginning.
*/
XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process) {
- return simcall_process_restart(process);
+ return simcall_process_restart(process->getImpl())->ciface();
}
+
+/** @ingroup m_process_management
+ * @brief This process will be terminated automatically when the last non-daemon process finishes
+ */
+XBT_PUBLIC(void) MSG_process_daemonize(msg_process_t process)
+{
+ simgrid::simix::kernelImmediate([process]() {
+ process->getImpl()->daemonize();
+ });
+}
+
+/** @ingroup m_process_management
+ * @brief Take an extra reference on that process to prevent it to be garbage-collected
+ */
+XBT_PUBLIC(void) MSG_process_ref(msg_process_t process)
+{
+ intrusive_ptr_add_ref(process);
+}
+/** @ingroup m_process_management
+ * @brief Release a reference on that process so that it can get be garbage-collected
+ */
+XBT_PUBLIC(void) MSG_process_unref(msg_process_t process)
+{
+ intrusive_ptr_release(process);
+}
+
+SG_END_DECL()
