X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..1bf033cc925aa31693ef5163ea056fde5b75ff1e:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 465e4cffef..521170a2ef 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -1,16 +1,20 @@ -/* 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.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/instr/instr_private.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)"); -extern "C" { +std::string instr_pid(msg_process_t proc) +{ + return std::string(proc->get_cname()) + "-" + std::to_string(proc->get_pid()); +} /** @addtogroup m_process_management * @@ -36,11 +40,13 @@ void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor) msg_actor = (simgrid::msg::ActorExt*)SIMIX_process_self_get_data(); SIMIX_process_self_set_data(nullptr); } else { - msg_actor = (simgrid::msg::ActorExt*)smx_actor->userdata; + msg_actor = (simgrid::msg::ActorExt*)smx_actor->getUserData(); simcall_process_set_data(smx_actor, nullptr); } - TRACE_msg_process_destroy(smx_actor->name.c_str(), smx_actor->pid); + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::by_name(instr_pid(smx_actor->ciface()))->remove_from_parent(); + // 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); @@ -52,10 +58,11 @@ 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, - std::map* properties, smx_actor_t parent_process) + std::unordered_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(); + return p == nullptr ? nullptr : p->get_impl(); } /** \ingroup m_process_management @@ -122,9 +129,9 @@ 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, static_cast(argv)); + function = simgrid::xbt::wrap_main(code, argc, static_cast(argv)); - std::map props; + std::unordered_map props; xbt_dict_cursor_t cursor = nullptr; char* key; char* value; @@ -138,10 +145,9 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun xbt_free(argv); return res; } -} msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, - std::map* properties) + std::unordered_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); @@ -152,13 +158,10 @@ msg_process_t MSG_process_create_from_stdfunc(const char* name, std::functionciface(); } -extern "C" { - /* Become a process in the simulation * * Currently this can only be called by the main thread (once) and only work with some thread factories @@ -169,7 +172,7 @@ extern "C" { 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; + std::unordered_map props; xbt_dict_cursor_t cursor = nullptr; char* key; char* value; @@ -178,10 +181,11 @@ msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, 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(), &props, nullptr); + smx_actor_t process = + SIMIX_process_attach(name, new simgrid::msg::ActorExt(data), host->get_cname(), &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); + MSG_process_yield(); return process->ciface(); } @@ -196,46 +200,6 @@ void MSG_process_detach() SIMIX_process_detach(); } -/** \ingroup m_process_management - * \param process poor victim - * - * This function simply kills a \a process... scary isn't it ? :) - */ -void MSG_process_kill(msg_process_t process) -{ - process->kill(); -} - -/** -* \brief Wait for the completion of a #msg_process_t. -* -* \param process the process to wait for -* \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); - return MSG_OK; -} - -/** \ingroup m_process_management - * \brief Migrates a process to another location. - * - * This function checks whether \a process and \a host are valid pointers and change the value of the #msg_host_t on - * which \a process is running. - */ -msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host) -{ - TRACE_msg_process_change_host(process, host); - process->migrate(host); - return MSG_OK; -} - -/** Yield the current actor; let the other actors execute first */ -void MSG_process_yield() -{ - simgrid::simix::kernelImmediate([] { /* do nothing*/ }); -} - /** \ingroup m_process_management * \brief Returns the user data of a process. * @@ -246,7 +210,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::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->getImpl()->userdata; + simgrid::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->get_impl()->getUserData(); if (msgExt) return msgExt->data; else @@ -262,7 +226,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->getImpl()->userdata)->data = data; + static_cast(process->get_impl()->getUserData())->data = data; return MSG_OK; } @@ -271,35 +235,9 @@ 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) { - 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) +XBT_PUBLIC void MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup) { - if (process == nullptr) { - return SIMIX_process_self()->host; - } else { - return process->getImpl()->host; - } -} - -/** \ingroup m_process_management - * - * \brief Return a #msg_process_t given its PID. - * - * This function search in the list of all the created msg_process_t for a msg_process_t whose PID is equal to \a PID. - * If no host is found, \c nullptr is returned. - Note that the PID are uniq in the whole simulation, not only on a given host. - */ -msg_process_t MSG_process_from_PID(int PID) -{ - return SIMIX_process_from_PID(PID)->ciface(); + msg_global->process_data_cleanup = data_cleanup; } /** @brief returns a list of all currently existing processes */ @@ -318,84 +256,6 @@ int MSG_process_get_number() return SIMIX_process_count(); } -/** \ingroup m_process_management - * \brief Set the kill time of a process. - * - * \param process a process - * \param kill_time the time when the process is killed. - */ -msg_error_t MSG_process_set_kill_time(msg_process_t process, double kill_time) -{ - simcall_process_set_kill_time(process->getImpl(), kill_time); - return MSG_OK; -} - -/** \ingroup m_process_management - * \brief Returns the process ID of \a process. - * - * This function checks whether \a process is a valid pointer and return its PID (or 0 in case of problem). - */ -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 || process->getImpl() == nullptr) - return 0; - return process->getImpl()->pid; -} - -/** \ingroup m_process_management - * \brief Returns the process ID of the parent of \a process. - * - * This function checks whether \a process is a valid pointer and return its PID. - * Returns -1 if the process has not been created by any other process. - */ -int MSG_process_get_PPID(msg_process_t process) -{ - return process->getImpl()->ppid; -} - -/** \ingroup m_process_management - * \brief Return the name of a process. - * - * This function checks whether \a process is a valid pointer and return its name. - */ -const char *MSG_process_get_name(msg_process_t process) -{ - return process->getCname(); -} - -/** \ingroup m_process_management - * \brief Returns the value of a given process property - * - * \param process a process - * \param name a property name - * \return value of a property (or nullptr if the property is not set) - */ -const char *MSG_process_get_property_value(msg_process_t process, const char *name) -{ - return process->getProperty(name); -} - -/** \ingroup m_process_management - * \brief Return the list of properties - * - * This function returns all the parameters associated with a process - */ -xbt_dict_t MSG_process_get_properties(msg_process_t process) -{ - 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* props = - simgrid::simix::kernelImmediate([process] { return process->getImpl()->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 * \brief Return the PID of the current process. * @@ -435,46 +295,8 @@ msg_process_t MSG_process_self() return SIMIX_process_self()->ciface(); } -/** \ingroup m_process_management - * \brief Suspend the process. - * - * This function suspends the process by suspending the task on which it was waiting for the completion. - */ -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()); - return MSG_OK; -} - -/** \ingroup m_process_management - * \brief Resume a suspended process. - * - * This function resumes a suspended process by resuming the task on which it was waiting for the completion. - */ -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; -} - -/** \ingroup m_process_management - * \brief Returns true if the process is suspended . - * - * This checks whether a process is suspended or not by inspecting the task on which it was waiting for the completion. - */ -int MSG_process_is_suspended(msg_process_t process) -{ - return process->isSuspended(); -} - -smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { - return process->getImpl()->context; +smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { // deprecated -- smx_context_t should die afterward + return process->get_impl()->context; } /** * \ingroup m_process_management @@ -483,44 +305,20 @@ 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(SIMIX_process_self(), fun, data); -} -/** - * \ingroup m_process_management - * \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) { - 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 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) -{ - simgrid::simix::kernelImmediate([process]() { process->getImpl()->daemonize(); }); + simgrid::s4u::this_actor::on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data); } /** @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); } -}