From c1f769c019bb761afe1c80b89ad4d6aa066a8d45 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 11 Oct 2019 13:59:39 +0200 Subject: [PATCH] MSG_task_receive_ext_bounded was indeed deprecated too. Remove it. --- docs/source/app_msg.rst | 1 - include/simgrid/msg.h | 3 --- src/bindings/java/jmsg_task.cpp | 2 +- src/msg/msg_task.cpp | 29 ++--------------------------- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/docs/source/app_msg.rst b/docs/source/app_msg.rst index 3b525173be..59dd0abcf8 100644 --- a/docs/source/app_msg.rst +++ b/docs/source/app_msg.rst @@ -154,7 +154,6 @@ Task structure of MSG :cpp:type:`msg_task_t` and associated functions. .. doxygenfunction:: MSG_task_listen_from .. doxygenfunction:: MSG_task_receive .. doxygenfunction:: MSG_task_receive_bounded -.. doxygenfunction:: MSG_task_receive_ext_bounded .. doxygenfunction:: MSG_task_receive_with_timeout .. doxygenfunction:: MSG_task_receive_with_timeout_bounded .. doxygendefine:: MSG_task_recv diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index a481a3283e..328ab23933 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -366,9 +366,6 @@ XBT_PUBLIC msg_error_t MSG_task_receive_with_timeout(msg_task_t* task, const cha XBT_PUBLIC msg_error_t MSG_task_receive(msg_task_t* task, const char* alias); #define MSG_task_recv(t, a) MSG_task_receive((t), (a)) -XBT_PUBLIC msg_error_t MSG_task_receive_ext_bounded(msg_task_t* task, const char* alias, double timeout, - msg_host_t host, double rate); - XBT_PUBLIC msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t* task, const char* alias, double timeout, double rate); XBT_PUBLIC msg_error_t MSG_task_receive_bounded(msg_task_t* task, const char* alias, double rate); diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index 5c28035e4f..448ae993b7 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -339,7 +339,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receiveBounded(JNIEnv* env, msg_task_t task = nullptr; const char *alias = env->GetStringUTFChars(jalias, 0); - msg_error_t res = MSG_task_receive_ext_bounded(&task, alias, jtimeout, /*host*/ nullptr, rate); + msg_error_t res = MSG_task_receive_with_timeout_bounded(&task, alias, jtimeout, rate); if (env->ExceptionOccurred()) return nullptr; if (res != MSG_OK) { diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index b83396b648..80a229a7f4 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -517,7 +517,7 @@ msg_error_t MSG_task_receive_bounded(msg_task_t* task, const char* alias, double */ msg_error_t MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, double timeout) { - return MSG_task_receive_ext_bounded(task, alias, timeout, nullptr, -1); + return MSG_task_receive_with_timeout_bounded(task, alias, timeout, -1); } /** @@ -539,33 +539,8 @@ msg_error_t MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, d */ msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t* task, const char* alias, double timeout, double rate) { - return MSG_task_receive_ext_bounded(task, alias, timeout, nullptr, rate); -} - -/** - * @brief Receives a task from a mailbox from a specific host with a given timeout and at a given rate. - * - * @param task a memory location for storing a #msg_task_t. - * @param alias name of the mailbox to receive the task from - * @param timeout is the maximum wait time for completion (provide -1 for no timeout) - * @param host a #msg_host_t host from where the task was sent - * @param rate limit the reception to rate bandwidth (byte/sec) - * - * The rate parameter can be used to receive a task with a limited bandwidth (smaller than the physical available - * value). Use MSG_task_receive_ext() if you don't limit the rate (or pass -1 as a rate value do disable this feature). - * - * @return Returns - * #MSG_OK if the task was successfully received, - * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE, or #MSG_TIMEOUT otherwise. - */ -msg_error_t MSG_task_receive_ext_bounded(msg_task_t* task, const char* alias, double timeout, msg_host_t host, - double rate) -{ - XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias); + XBT_DEBUG("MSG_task_receive_with_timeout_bounded: Trying to receive a message on mailbox '%s'", alias); msg_error_t ret = MSG_OK; - /* We no longer support getting a task from a specific host */ - if (host) - THROW_UNIMPLEMENTED; /* Sanity check */ xbt_assert(task, "Null pointer for the task storage"); -- 2.20.1