From 1340219ef861e33d62b9d50afee919ff86ffb7a0 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 12 Mar 2019 09:19:49 +0100 Subject: [PATCH 1/1] mark old MSG functions as deprecated --- include/simgrid/msg.h | 7 +++++-- src/bindings/java/jmsg_task.cpp | 5 ++--- src/msg/msg_gos.cpp | 3 ++- src/msg/msg_task.cpp | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 29ce2e3cd0..821228b31b 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -340,7 +340,6 @@ XBT_PUBLIC msg_task_t MSG_parallel_task_create(const char* name, int host_nb, co double* flops_amount, double* bytes_amount, void* data); XBT_PUBLIC void* MSG_task_get_data(msg_task_t task); XBT_PUBLIC void MSG_task_set_data(msg_task_t task, void* data); -XBT_PUBLIC void MSG_task_set_copy_callback(void (*callback)(msg_task_t task, msg_process_t src, msg_process_t dst)); XBT_PUBLIC msg_process_t MSG_task_get_sender(msg_task_t task); XBT_PUBLIC msg_host_t MSG_task_get_source(msg_task_t task); XBT_PUBLIC const char* MSG_task_get_name(msg_task_t task); @@ -362,7 +361,9 @@ XBT_PUBLIC void MSG_task_set_bytes_amount(msg_task_t task, double bytes_amount); XBT_PUBLIC double MSG_task_get_remaining_communication(msg_task_t task); XBT_PUBLIC double MSG_task_get_bytes_amount(msg_task_t task); -XBT_PUBLIC msg_error_t MSG_task_receive_ext(msg_task_t* task, const char* alias, double timeout, msg_host_t host); +XBT_ATTRIB_DEPRECATED_v325("Getting a task from a specific host is no longer supported." + " Use MSG_task_receive_with_timeout instead.") XBT_PUBLIC msg_error_t + MSG_task_receive_ext(msg_task_t* task, const char* alias, double timeout, msg_host_t host); XBT_PUBLIC msg_error_t MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, double timeout); @@ -443,6 +444,8 @@ XBT_PUBLIC int MSG_barrier_wait(msg_bar_t bar); /* DO NOT USE this nasty pimple (unless if you're writing a binding) */ XBT_ATTRIB_DEPRECATED_v323("MSG_process_get_smx_ctx is deprecated. Please contact us if you need it.") XBT_PUBLIC smx_context_t MSG_process_get_smx_ctx(msg_process_t process); +XBT_ATTRIB_DEPRECATED_v325("MSG_process_set_copy_callback is deprecated. Please contact us if you need it.") XBT_PUBLIC + void MSG_task_set_copy_callback(void (*callback)(msg_task_t task, msg_process_t src, msg_process_t dst)); #ifdef __cplusplus } diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index 1983b13579..ede08bb0de 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -287,9 +287,8 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv* env, jclass const char *alias = env->GetStringUTFChars(jalias, 0); msg_error_t rv; - if (not simgrid::ForcefulKillException::try_n_catch([&rv, &task, &alias, &jtimeout]() { - rv = MSG_task_receive_ext(&task, alias, (double)jtimeout, /*host*/ nullptr); - })) { + if (not simgrid::ForcefulKillException::try_n_catch( + [&rv, &task, &alias, &jtimeout]() { rv = MSG_task_receive_with_timeout(&task, alias, (double)jtimeout); })) { jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); } env->ReleaseStringUTFChars(jalias, alias); diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 88a6c3af0e..7fbed8bd30 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -69,7 +69,7 @@ msg_error_t MSG_task_receive_bounded(msg_task_t * task, const char *alias, doubl */ msg_error_t MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, double timeout) { - return MSG_task_receive_ext(task, alias, timeout, nullptr); + return MSG_task_receive_ext_bounded(task, alias, timeout, nullptr, -1); } /** @@ -447,6 +447,7 @@ msg_task_t MSG_comm_get_task(msg_comm_t comm) * @param buff the data copied * @param buff_size size of the buffer */ +// deprecated but used by MSG_set_copy_callback. Should be removed in v325 void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size) { SIMIX_comm_copy_pointer_callback(comm, buff, buff_size); diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index 4ad294bdaa..6d14da6986 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -264,6 +264,7 @@ void MSG_task_set_data(msg_task_t task, void *data) /** @brief Sets a function to be called when a task has just been copied. * @param callback a callback function */ +// deprecated void MSG_task_set_copy_callback(void (*callback) (msg_task_t task, msg_process_t sender, msg_process_t receiver)) { msg_global->task_copy_callback = callback; -- 2.20.1