From: Arnaud Giersch Date: Wed, 21 Mar 2018 07:42:10 +0000 (+0100) Subject: Kill features marked deprecated until v3.20. X-Git-Tag: v3.20~672 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9ceaa7392dd84bd6b76a143addd7db5871225c5b Kill features marked deprecated until v3.20. --- diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index c88f4b97ba..f71ddc98e2 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -76,12 +76,6 @@ XBT_PUBLIC void MSG_host_get_process_list(sg_host_t host, xbt_dynar_t whereto); XBT_PUBLIC sg_host_t MSG_host_self(); -XBT_ATTRIB_DEPRECATED_v320("Use MSG_host_get_speed(): v3.20 will drop MSG_host_get_current_power_peak() " - "completely.") static inline double MSG_host_get_current_power_peak(msg_host_t host) -{ - return sg_host_speed(host); -} - /* ******************************** VMs ************************************* */ typedef sg_vm_t msg_vm_t; @@ -310,10 +304,6 @@ XBT_PUBLIC msg_error_t MSG_task_receive_bounded(msg_task_t* task, const char* al XBT_PUBLIC msg_comm_t MSG_task_isend(msg_task_t task, const char* alias); XBT_PUBLIC msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char* alias, double maxrate); -XBT_ATTRIB_DEPRECATED_v320( - "This function will be removed from SimGrid v3.20. If you really need this function, please speak up quickly.") - XBT_PUBLIC msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char* alias, - int (*match_fun)(void*, void*, void*), void* match_data); XBT_PUBLIC void MSG_task_dsend(msg_task_t task, const char* alias, void_f_pvoid_t cleanup); XBT_PUBLIC void MSG_task_dsend_bounded(msg_task_t task, const char* alias, void_f_pvoid_t cleanup, double maxrate); diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index e5cf824b38..8d3a99f636 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -307,12 +307,6 @@ template inline void sleep_until(const SimulationTimePoint #include +#include #include #include -#include // DEPRECATED 3.20 #include +#include +#include #include namespace simgrid { @@ -66,37 +69,6 @@ public: /*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */ static int test_any(std::vector * comms); - /** Creates (but don't start) an async send to the mailbox @p dest */ - XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put_init(): v3.20 will turn this warning into an error.") static CommPtr - send_init(MailboxPtr dest) - { - return dest->put_init(); - } - /** Creates (but don't start) an async send to the mailbox @p dest */ - XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put_init(): v3.20 will turn this warning into an error.") static CommPtr - send_init(MailboxPtr dest, void* data, int simulatedByteAmount) - { - return dest->put_init(data, simulatedByteAmount); - } - /** Creates and start an async send to the mailbox @p dest */ - XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put_async(): v3.20 will turn this warning into an error.") static CommPtr - send_async(MailboxPtr dest, void* data, int simulatedByteAmount) - { - return dest->put_async(data, simulatedByteAmount); - } - /** Creates (but don't start) an async recv onto the mailbox @p from */ - XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::get_init(): v3.20 will turn this warning into an error.") static CommPtr - recv_init(MailboxPtr from) - { - return from->get_init(); - } - /** Creates and start an async recv to the mailbox @p from */ - XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::get_async(): v3.20 will turn this warning into an error.") static CommPtr - recv_async(MailboxPtr from, void** data) - { - return from->get_async(data); - } - Activity* start() override; Activity* wait() override; Activity* wait(double timeout) override; diff --git a/include/xbt/base.h b/include/xbt/base.h index c4579cf727..6c8735aad1 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -71,7 +71,6 @@ #define XBT_ATTRIB_DEPRECATED(mesg) __attribute__((deprecated(mesg))) #endif -#define XBT_ATTRIB_DEPRECATED_v320(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.20 */ #define XBT_ATTRIB_DEPRECATED_v321(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.21 */ #define XBT_ATTRIB_DEPRECATED_v322(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.22 */ diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index b378e622da..ac7bca2f13 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. 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. */ @@ -375,26 +375,6 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double max return MSG_task_isend_internal(task, alias, nullptr, nullptr, nullptr, 0); } -/** \ingroup msg_task_usage - * \brief Sends a task on a mailbox, with support for matching requests - * - * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() to end the communication. - * - * \param task a #msg_task_t to send on another location. - * \param alias name of the mailbox to sent the task to - * \param match_fun boolean function which parameters are: - * - match_data_provided_here - * - match_data_provided_by_other_side_if_any - * - the_smx_synchro_describing_the_other_side - * \param match_data user provided data passed to match_fun - * \return the msg_comm_t communication created - */ -msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char* alias, int (*match_fun)(void*, void*, void*), - void* match_data) -{ - return MSG_task_isend_internal(task, alias, match_fun, match_data, nullptr, 0); -} - /** \ingroup msg_task_usage * \brief Sends a task on a mailbox. * diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index d7e0afc1b8..7cb47fdc89 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -305,36 +305,6 @@ ExecPtr exec_async(double flops) return res; } -void* recv(MailboxPtr chan) // deprecated -{ - return chan->get(); -} - -void* recv(MailboxPtr chan, double timeout) // deprecated -{ - return chan->get(timeout); -} - -void send(MailboxPtr chan, void* payload, double simulatedSize) // deprecated -{ - chan->put(payload, simulatedSize); -} - -void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout) // deprecated -{ - chan->put(payload, simulatedSize, timeout); -} - -CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize) // deprecated -{ - return chan->put_async(payload, simulatedSize); -} - -CommPtr irecv(MailboxPtr chan, void** data) // deprecated -{ - return chan->get_async(data); -} - aid_t getPid() { return SIMIX_process_self()->pid;