X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/44129f5978ea81e283d0312fe3347e0bd5dea61c..7a3a100990355eb757dc81106b5aac6daed0b8e1:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index e1ee3c74b2..a366f62ecc 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -1,15 +1,16 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. 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 "msg_private.hpp" #include "simgrid/s4u/Host.hpp" #include "src/simix/ActorImpl.hpp" +#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 * @@ -39,7 +40,7 @@ void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor) 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); @@ -51,7 +52,8 @@ void MSG_process_cleanup_from_SIMIX(smx_actor_t 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 code, void* data, sg_host_t host, - xbt_dict_t properties, smx_actor_t parent_process) + std::map* 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(); @@ -123,17 +125,24 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun if (code) 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); + std::map props; + xbt_dict_cursor_t cursor = nullptr; + char* key; + char* value; + xbt_dict_foreach (properties, cursor, key, value) + props[key] = value; + xbt_dict_free(&properties); + + msg_process_t res = MSG_process_create_from_stdfunc(name, std::move(function), data, host, &props); for (int i = 0; i != argc; ++i) xbt_free(argv[i]); xbt_free(argv); 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) + std::map* properties) { xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr"); simgrid::msg::ActorExt* msgExt = new simgrid::msg::ActorExt(data); @@ -149,7 +158,7 @@ msg_process_t MSG_process_create_from_stdfunc(const char* name, std::functionciface(); } -SG_BEGIN_DECL() +extern "C" { /* Become a process in the simulation * @@ -161,10 +170,16 @@ SG_BEGIN_DECL() msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, xbt_dict_t properties) { xbt_assert(host != nullptr, "Invalid parameters: host and code params must not be nullptr"); + std::map props; + xbt_dict_cursor_t cursor = nullptr; + char* key; + char* value; + xbt_dict_foreach (properties, cursor, key, value) + props[key] = value; + xbt_dict_free(&properties); /* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */ - smx_actor_t process = - SIMIX_process_attach(name, new simgrid::msg::ActorExt(data), host->getCname(), properties, nullptr); + smx_actor_t process = SIMIX_process_attach(name, new simgrid::msg::ActorExt(data), host->getCname(), &props, nullptr); if (not process) xbt_die("Could not attach"); simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process); @@ -199,7 +214,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->getImpl(), timeout); + process->join(timeout); return MSG_OK; } @@ -211,7 +226,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); + TRACE_msg_process_change_host(process, host); process->migrate(host); return MSG_OK; } @@ -257,21 +272,17 @@ msg_error_t MSG_process_set_data(msg_process_t process, void *data) * \brief Sets a cleanup function to be called to free the userdata of a process when a process is destroyed. * \param data_cleanup a cleanup function for the userdata of a process, or nullptr to call no function */ -XBT_PUBLIC(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup) { +XBT_PUBLIC void MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup) +{ 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(); } } @@ -290,7 +301,12 @@ msg_process_t MSG_process_from_PID(int PID) /** @brief returns a list of all currently existing processes */ xbt_dynar_t MSG_processes_as_dynar() { - return SIMIX_processes_as_dynar(); + xbt_dynar_t res = xbt_dynar_new(sizeof(smx_actor_t), nullptr); + for (auto const& kv : simix_global->process_list) { + smx_actor_t actor = kv.second; + xbt_dynar_push(res, &actor); + } + return res; } /** @brief Return the current number MSG processes. */ @@ -307,7 +323,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->getImpl(), kill_time); + process->setKillTime(kill_time); return MSG_OK; } @@ -322,7 +338,7 @@ int MSG_process_get_PID(msg_process_t process) * 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 @@ -333,7 +349,7 @@ int MSG_process_get_PID(msg_process_t process) */ int MSG_process_get_PPID(msg_process_t process) { - return process->getImpl()->ppid; + return process->getPpid(); } /** \ingroup m_process_management @@ -355,7 +371,7 @@ const char *MSG_process_get_name(msg_process_t process) */ const char *MSG_process_get_property_value(msg_process_t process, const char *name) { - return (char*) xbt_dict_get_or_null(MSG_process_get_properties(process), name); + return process->getProperty(name); } /** \ingroup m_process_management @@ -366,7 +382,14 @@ 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->getImpl()); + xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); + std::map* props = process->getProperties(); + if (props == nullptr) + return nullptr; + for (auto const& elm : *props) { + xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr); + } + return as_dict; } /** \ingroup m_process_management @@ -416,9 +439,7 @@ msg_process_t MSG_process_self() 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; } @@ -430,8 +451,6 @@ msg_error_t MSG_process_suspend(msg_process_t process) 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; } @@ -463,39 +482,39 @@ void MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void *data) { * \brief Sets the "auto-restart" flag of the process. * 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) { +XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_restart) +{ process->setAutoRestart(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 simgrid::simix::kernelImmediate( - [process]() { return process->getImpl()->restart(process->getImpl())->ciface(); }); +XBT_PUBLIC msg_process_t MSG_process_restart(msg_process_t process) +{ + return process->restart(); } /** @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) +XBT_PUBLIC void MSG_process_daemonize(msg_process_t process) { - simgrid::simix::kernelImmediate([process]() { process->getImpl()->daemonize(); }); + process->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) +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) +XBT_PUBLIC void MSG_process_unref(msg_process_t process) { intrusive_ptr_release(process); } - -SG_END_DECL() +}