From 2ec134835b1aecf5697def4554902b2c6e4ad566 Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Wed, 2 Feb 2022 14:33:26 +0100 Subject: [PATCH] mark some old simcalls as deprecated (test, test_any, and wait_any) --- include/simgrid/simix.h | 9 ++++++--- src/simix/libsmx.cpp | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 8413ffa93f..242bbc255a 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -94,10 +94,13 @@ simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, siz bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double rate); -XBT_PUBLIC ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout); +XBT_ATTRIB_DEPRECATED_v335("Please use s4u::Comm::wait_any_for()") XBT_PUBLIC ssize_t + simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout); XBT_PUBLIC void simcall_comm_wait(simgrid::kernel::activity::ActivityImpl* comm, double timeout); -XBT_PUBLIC bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm); -XBT_PUBLIC ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count); +XBT_ATTRIB_DEPRECATED_v335("Please use s4u::Comm::test()") XBT_PUBLIC + bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm); +XBT_ATTRIB_DEPRECATED_v335("Please use s4u::Comm::test_any()") XBT_PUBLIC ssize_t + simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count); #endif #endif diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 1236119f41..79a9a5f7f1 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -116,7 +116,8 @@ simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, siz /** * @ingroup simix_comm_management */ -ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout) +ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, + double timeout) // XBT_ATTRIB_DEPRECATED_v335 { return simcall_BODY_comm_waitany(comms, count, timeout); } @@ -124,7 +125,7 @@ ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_ /** * @ingroup simix_comm_management */ -ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count) +ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count) // XBT_ATTRIB_DEPRECATED_v335 { if (count == 0) return -1; @@ -144,7 +145,7 @@ void simcall_comm_wait(simgrid::kernel::activity::ActivityImpl* comm, double tim * @ingroup simix_comm_management * */ -bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm) +bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm) // XBT_ATTRIB_DEPRECATED_v335 { return simcall_BODY_comm_test(static_cast(comm)); } -- 2.20.1