X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcb0b0f21b4416e7cae17a50d9534bb46f81946c..d0694c51e5ea965a0c5851c58b58af7c70a62af3:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 4603d880d7..091650ec02 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -1,15 +1,16 @@ -/* 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 @@ -21,20 +22,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (proc /******************************** 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) { - simgrid::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 = (simgrid::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 = (simgrid::MsgActorExt*)smx_actor->data; + msg_actor = (simgrid::msg::ActorExt*)smx_actor->data; simcall_process_set_data(smx_actor, nullptr); } @@ -53,7 +54,7 @@ smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::functiongetImpl(); } /** \ingroup m_process_management @@ -120,7 +121,8 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun { std::function function; if (code) - function = simgrid::xbt::wrapMain(code, argc, const_cast(argv)); + function = simgrid::xbt::wrapMain(code, argc, static_cast(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]); @@ -128,23 +130,27 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun return res; } +SG_END_DECL() + msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function 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"); - simgrid::MsgActorExt* msgExt = new simgrid::MsgActorExt(data); + simgrid::msg::ActorExt* msgExt = new simgrid::msg::ActorExt(data); - msg_process_t process = simcall_process_create(name, std::move(code), msgExt, host, properties); + 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; } simcall_process_on_exit(process, (int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process); - return 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 @@ -157,12 +163,12 @@ msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, 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 simgrid::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()` @@ -183,7 +189,7 @@ void MSG_process_detach() */ void MSG_process_kill(msg_process_t process) { - simcall_process_kill(process); + simcall_process_kill(process->getImpl()); } /** @@ -193,7 +199,7 @@ void MSG_process_kill(msg_process_t process) * \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; } @@ -206,7 +212,7 @@ msg_error_t MSG_process_join(msg_process_t process, double timeout){ 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; } @@ -226,7 +232,7 @@ void* MSG_process_get_data(msg_process_t process) xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!"); /* get from SIMIX the MSG process data, and then the user data */ - simgrid::MsgActorExt* msgExt = (simgrid::MsgActorExt*)process->data; + simgrid::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->getImpl()->data; if (msgExt) return msgExt->data; else @@ -242,7 +248,7 @@ msg_error_t MSG_process_set_data(msg_process_t process, void *data) { xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!"); - static_cast(process->data)->data = data; + static_cast(process->getImpl()->data)->data = data; return MSG_OK; } @@ -263,9 +269,9 @@ XBT_PUBLIC(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup) { 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; } } @@ -279,7 +285,7 @@ msg_host_t MSG_process_get_host(msg_process_t process) */ 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 */ @@ -301,7 +307,7 @@ int MSG_process_get_number() */ 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; } @@ -314,9 +320,9 @@ int MSG_process_get_PID(msg_process_t process) { /* 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 @@ -327,7 +333,7 @@ int MSG_process_get_PID(msg_process_t process) */ int MSG_process_get_PPID(msg_process_t process) { - return process->ppid; + return process->getImpl()->ppid; } /** \ingroup m_process_management @@ -337,7 +343,7 @@ int MSG_process_get_PPID(msg_process_t process) */ const char *MSG_process_get_name(msg_process_t process) { - return process->name.c_str(); + return process->cname(); } /** \ingroup m_process_management @@ -360,7 +366,7 @@ const char *MSG_process_get_property_value(msg_process_t process, const char *na 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 @@ -370,7 +376,8 @@ xbt_dict_t MSG_process_get_properties(msg_process_t process) */ 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 @@ -390,7 +397,7 @@ int MSG_process_self_PPID() */ msg_process_t MSG_process_self() { - return SIMIX_process_self(); + return SIMIX_process_self()->ciface(); } /** \ingroup m_process_management @@ -403,7 +410,7 @@ 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); + simcall_process_suspend(process->getImpl()); return MSG_OK; } @@ -417,7 +424,7 @@ 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); - simcall_process_resume(process); + simcall_process_resume(process->getImpl()); return MSG_OK; } @@ -428,12 +435,11 @@ msg_error_t MSG_process_resume(msg_process_t process) */ 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 @@ -442,7 +448,7 @@ smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { * 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 @@ -450,12 +456,39 @@ void MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void *data) { * 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()