X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/71c99a9d63794db4887045de2512d3a06ff62344..d60c93c4ec0ba158a9e58681f4df021f76e78f9e:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 91ebad6981..c2cdf20b0b 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -1,12 +1,13 @@ -/* Copyright (c) 2004-2015. 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 "simgrid/s4u/host.hpp" +#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)"); @@ -21,46 +22,42 @@ 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) { - 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->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::byName(instr_pid(smx_actor->ciface()))->removeFromParent(); + // 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); } - // 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 code, void *data, sg_host_t host, - double kill_time, xbt_dict_t properties, - int auto_restart, smx_actor_t parent_process) +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*/) { - msg_process_t p = MSG_process_create_with_environment(name, std::move(code), data, host, properties); - if (p) { - MSG_process_set_kill_time(p,kill_time); - 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->get_impl(); } /** \ingroup m_process_management @@ -127,39 +124,38 @@ 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)); - msg_process_t res = MSG_process_create_with_environment(name, - std::move(function), data, host, properties); + function = simgrid::xbt::wrapMain(code, argc, static_cast(argv)); + + 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; } -msg_process_t MSG_process_create_with_environment( - const char *name, std::function code, void *data, - msg_host_t host, xbt_dict_t properties) +msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, + std::map* properties) { xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr"); - MsgActorExt* simdata = new MsgActorExt(); + simgrid::msg::ActorExt* msgExt = new simgrid::msg::ActorExt(data); - /* Simulator data for MSG */ - simdata->m_host = host; - simdata->data = data; + smx_actor_t process = simcall_process_create(name, std::move(code), msgExt, host, properties); - /* 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), simdata, host, -1, properties, 0); - - if (!process) { - /* Undo everything we have just changed */ - xbt_free(simdata); + 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; + + process->ciface()->on_exit((int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process); + return process->ciface(); } /* Become a process in the simulation @@ -172,18 +168,21 @@ msg_process_t MSG_process_create_with_environment( 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"); - MsgActorExt* msgExt = new MsgActorExt(); - - /* Simulator data for MSG */ - msgExt->m_host = host; - msgExt->data = data; + 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 */ - msg_process_t process = SIMIX_process_attach(name, msgExt, host->cname(), properties, nullptr); - if (!process) + 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); - return process; + process->ciface()->on_exit((int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process); + return process->ciface(); } /** Detach a process attached with `MSG_process_attach()` @@ -197,43 +196,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) -{ - simcall_process_kill(process); -} - -/** -* \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, 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) -{ - MsgActorExt* msgExt = (MsgActorExt*)process->data; - msgExt->m_host = host; - msg_host_t now = msgExt->m_host; - TRACE_msg_process_change_host(process, now, host); - simcall_process_set_host(process, host); - return MSG_OK; -} - /** Yield the current actor; let the other actors execute first */ void MSG_process_yield() { @@ -250,7 +212,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 */ - MsgActorExt* msgExt = (MsgActorExt*)process->data; + simgrid::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->get_impl()->getUserData(); if (msgExt) return msgExt->data; else @@ -266,8 +228,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!"); - MsgActorExt* msgExt = (MsgActorExt*)process->data; - msgExt->data = data; + static_cast(process->get_impl()->getUserData())->data = data; return MSG_OK; } @@ -276,25 +237,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) { - MsgActorExt* msgExt; - if (process == nullptr) { - msgExt = (MsgActorExt*)SIMIX_process_self_get_data(); - } - else { - msgExt = (MsgActorExt*)process->data; - } - return msgExt ? msgExt->m_host : nullptr; + msg_global->process_data_cleanup = data_cleanup; } /** \ingroup m_process_management @@ -307,12 +252,17 @@ 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 */ 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. */ @@ -321,76 +271,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,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) - return 0; - return process->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->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->name.c_str(); -} - -/** \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 (char*) xbt_dict_get_or_null(MSG_process_get_properties(process), 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"); - return simcall_process_get_properties(process); -} - /** \ingroup m_process_management * \brief Return the PID of the current process. * @@ -398,7 +278,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 @@ -412,56 +293,25 @@ int MSG_process_self_PPID() } /** \ingroup m_process_management - * \brief Return the current process. - * - * This function returns the currently running #msg_process_t. + * \brief Return the name of the current process. */ -msg_process_t MSG_process_self() +const char* MSG_process_self_name() { - return SIMIX_process_self(); + return SIMIX_process_self_get_name(); } /** \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); - 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); - simcall_process_resume(process); - return MSG_OK; -} - -/** \ingroup m_process_management - * \brief Returns true if the process is suspended . + * \brief Return the current process. * - * This checks whether a process is suspended or not by inspecting the task on which it was waiting for the completion. + * This function returns the currently running #msg_process_t. */ -int MSG_process_is_suspended(msg_process_t process) +msg_process_t MSG_process_self() { - xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr"); - return simcall_process_is_suspended(process); + return SIMIX_process_self()->ciface(); } -smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { - return SIMIX_process_get_context(process); +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 @@ -470,20 +320,29 @@ 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); + simgrid::s4u::this_actor::on_exit(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) { - simcall_process_auto_restart_set(process,auto_restart); +XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_restart) +{ + process->set_auto_restart(auto_restart); +} + +/** @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 Restarts a process from the beginning. +/** @ingroup m_process_management + * @brief Release a reference on that process so that it can get be garbage-collected */ -XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process) { - return simcall_process_restart(process); +XBT_PUBLIC void MSG_process_unref(msg_process_t process) +{ + intrusive_ptr_release(process); }