/* 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 "msg_private.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
+#include "src/simix/smx_private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
-SG_BEGIN_DECL()
+extern "C" {
/** @addtogroup m_process_management
*
simcall_process_set_data(smx_actor, nullptr);
}
- TRACE_msg_process_destroy(smx_actor->name.c_str(), smx_actor->pid);
+ TRACE_msg_process_destroy(smx_actor->name, smx_actor->pid);
// free the data if a function was provided
if (msg_actor && msg_actor->data && msg_global->process_data_cleanup) {
msg_global->process_data_cleanup(msg_actor->data);
/* 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,
- std::map<std::string, std::string>* properties, smx_actor_t parent_process)
+ std::map<std::string, std::string>* properties,
+ smx_actor_t /*parent_process*/)
{
msg_process_t p = MSG_process_create_from_stdfunc(name, std::move(code), data, host, properties);
return p == nullptr ? nullptr : p->getImpl();
xbt_free(argv);
return res;
}
-
-SG_END_DECL()
+}
msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function<void()> code, void* data, msg_host_t host,
std::map<std::string, std::string>* properties)
return process->ciface();
}
-SG_BEGIN_DECL()
+extern "C" {
/* Become a process in the simulation
*
* \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->getImpl(), timeout);
+ process->join(timeout);
return MSG_OK;
}
msg_global->process_data_cleanup = data_cleanup;
}
-/** \ingroup m_process_management
- * \brief Return the location on which a process is running.
- * \param process a process (nullptr means the current one)
- * \return the msg_host_t corresponding to the location on which \a process is running.
- */
msg_host_t MSG_process_get_host(msg_process_t process)
{
if (process == nullptr) {
return SIMIX_process_self()->host;
} else {
- return process->getImpl()->host;
+ return process->getHost();
}
}
/** @brief returns a list of all currently existing processes */
xbt_dynar_t MSG_processes_as_dynar() {
xbt_dynar_t res = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
- for (auto kv : simix_global->process_list) {
+ for (auto const& kv : simix_global->process_list) {
smx_actor_t actor = kv.second;
xbt_dynar_push(res, &actor);
}
*/
msg_error_t MSG_process_set_kill_time(msg_process_t process, double kill_time)
{
- simcall_process_set_kill_time(process->getImpl(), kill_time);
+ process->setKillTime(kill_time);
return MSG_OK;
}
* and the exceptions, so it would be called back again and again */
if (process == nullptr || process->getImpl() == nullptr)
return 0;
- return process->getImpl()->pid;
+ return process->getPid();
}
/** \ingroup m_process_management
*/
int MSG_process_get_PPID(msg_process_t process)
{
- return process->getImpl()->ppid;
+ return process->getPpid();
}
/** \ingroup m_process_management
{
xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
- std::map<std::string, std::string>* props =
- simgrid::simix::kernelImmediate([process] { return process->getImpl()->getProperties(); });
+ std::map<std::string, std::string>* props = process->getProperties();
if (props == nullptr)
return nullptr;
- for (auto elm : *props) {
+ for (auto const& elm : *props) {
xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr);
}
return as_dict;
msg_error_t MSG_process_suspend(msg_process_t process)
{
xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
-
- TRACE_msg_process_suspend(process);
- simcall_process_suspend(process->getImpl());
+ process->suspend();
return MSG_OK;
}
msg_error_t MSG_process_resume(msg_process_t process)
{
xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
-
- TRACE_msg_process_resume(process);
process->resume();
return MSG_OK;
}
*/
XBT_PUBLIC(void) MSG_process_daemonize(msg_process_t process)
{
- simgrid::simix::kernelImmediate([process]() { process->getImpl()->daemonize(); });
+ process->daemonize();
}
/** @ingroup m_process_management
{
intrusive_ptr_release(process);
}
-
-SG_END_DECL()
+}