X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8e92a8fe1dadd3c279b3a790995dd3a1c3f2c03..04614a7a24a05d9f2afe7b6a383c867680263710:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 0abc0ce7b4..0d633050ea 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -5,11 +5,8 @@ #include +#include "src/msg/msg_private.h" #include "src/simix/smx_private.h" /* MSG_task_listen looks inside the rdv directly. Not clean. */ -#include "msg_private.h" -#include "mc/mc.h" -#include "xbt/log.h" -#include "xbt/sysdep.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)"); @@ -574,14 +571,6 @@ int MSG_comm_testany(xbt_dynar_t comms) */ void MSG_comm_destroy(msg_comm_t comm) { - /* Diagnose a possible user error: destroying a comm that is not done yet, and not detached either */ - if ((comm->s_comm->state == SIMIX_READY || comm->s_comm->state == SIMIX_RUNNING) - && (!static_cast(comm->s_comm)->detached)) - XBT_WARN("You are destroying a communication that is not done yet but %s. " - "This will lead to issues when the other side continues this communication. " - "Are you looking for MSG_task_dsend()?", - (comm->s_comm->state == SIMIX_READY ? "ready" : "running")); - xbt_free(comm); } @@ -631,10 +620,8 @@ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout) */ void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout) { - int i = 0; - for (i = 0; i < nb_elem; i++) { + for (int i = 0; i < nb_elem; i++) MSG_comm_wait(comm[i], timeout); - } } /** \ingroup msg_task_usage @@ -716,7 +703,7 @@ msg_task_t MSG_comm_get_task(msg_comm_t comm) /** * \brief This function is called by SIMIX in kernel mode to copy the data of a comm. - * \param comm the comm + * \param synchro the comm * \param buff the data copied * \param buff_size size of the buffer */ @@ -926,39 +913,3 @@ const char *MSG_task_get_category (msg_task_t task) { return task->category; } - -/** - * \brief Returns the value of a given AS or router property - * - * \param asr the name of a router or AS - * \param name a property name - * \return value of a property (or nullptr if property not set) - */ -const char *MSG_as_router_get_property_value(const char* asr, const char *name) -{ - return static_cast(xbt_dict_get_or_null(MSG_as_router_get_properties(asr), name)); -} - -/** - * \brief Returns a xbt_dict_t consisting of the list of properties assigned to - * a the AS or router - * - * \param asr the name of a router or AS - * \return a dict containing the properties - */ -xbt_dict_t MSG_as_router_get_properties(const char* asr) -{ - return (simcall_asr_get_properties(asr)); -} - -/** - * \brief Change the value of a given AS or router - * - * \param asr the name of a router or AS - * \param name a property name - * \param value what to change the property to - */ -void MSG_as_router_set_property_value(const char* asr, const char* name, char* value) -{ - xbt_dict_set(MSG_as_router_get_properties(asr), name, value, nullptr); -}