From: Arnaud Giersch Date: Fri, 5 Oct 2018 21:21:05 +0000 (+0200) Subject: Remove features marked with DEPRECATED_v322. X-Git-Tag: v3_22~917^2~1 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d46afc036c17f291795eaaab14ce42d0a96e3feb?hp=5e41cea3f1d670f198f312cfe398af95b9ed7b40 Remove features marked with DEPRECATED_v322. --- diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index b5f7607ac5..9c967a721b 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1463,7 +1463,6 @@ PREDEFINED = __cplusplus \ XBT_PRIVATE= \ XBT_ATTRIB_NORETURN= \ XBT_ATTRIB_UNUSED= \ - XBT_ATTRIB_DEPRECATED_v322(m)= \ XBT_ATTRIB_DEPRECATED_v323(m)= \ XBT_ATTRIB_DEPRECATED_v324(m)= diff --git a/docs/source/Doxyfile b/docs/source/Doxyfile index 664bf64487..1fc374013b 100644 --- a/docs/source/Doxyfile +++ b/docs/source/Doxyfile @@ -38,6 +38,5 @@ PREDEFINED += \ XBT_PRIVATE= \ XBT_ATTRIB_NORETURN= \ XBT_ATTRIB_UNUSED= \ - XBT_ATTRIB_DEPRECATED_v322(m)= \ XBT_ATTRIB_DEPRECATED_v323(m)= \ XBT_ATTRIB_DEPRECATED_v324(m)= diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 1df82a2f52..2abf905374 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -119,10 +119,6 @@ XBT_PUBLIC sg_host_t MSG_host_self(); /* ******************************** VMs ************************************* */ typedef sg_vm_t msg_vm_t; -XBT_ATTRIB_DEPRECATED_v322("Use sg_vm_create_migratable() from the live migration plugin: " - "v3.22 will drop MSG_vm_create() completely.") XBT_PUBLIC sg_vm_t - MSG_vm_create(sg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity); - XBT_PUBLIC msg_vm_t MSG_vm_create_core(msg_host_t pm, const char* name); XBT_PUBLIC msg_vm_t MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount); diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index 6bb6e896ca..7a06b5175d 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -221,16 +221,12 @@ public: /** @deprecated See Engine::get_host_count() */ XBT_ATTRIB_DEPRECATED_v323("Please use Engine::get_host_count()") size_t getHostCount() { return get_host_count(); } /** @deprecated See Engine::get_all_hosts() */ - XBT_ATTRIB_DEPRECATED_v322("Please use Engine::get_all_hosts()") void getHostList(std::vector* whereTo); - /** @deprecated See Engine::get_all_hosts() */ XBT_ATTRIB_DEPRECATED_v323("Please use Engine::get_all_hosts()") std::vector getAllHosts() { return get_all_hosts(); } /** @deprecated See Engine::get_link_count() */ XBT_ATTRIB_DEPRECATED_v323("Please use Engine::get_link_count()") size_t getLinkCount() { return get_link_count(); } - /** @deprecated See Engine::get_all_links() */ - XBT_ATTRIB_DEPRECATED_v322("Please use Engine::get_all_links()") void getLinkList(std::vector* list); /** @deprecated See Engine::get_link_list() */ XBT_ATTRIB_DEPRECATED_v323("Please use Engine::get_link_list()") std::vector getAllLinks() { diff --git a/include/simgrid/s4u/Storage.hpp b/include/simgrid/s4u/Storage.hpp index 2f5f89d34d..7559611c7f 100644 --- a/include/simgrid/s4u/Storage.hpp +++ b/include/simgrid/s4u/Storage.hpp @@ -19,11 +19,6 @@ namespace simgrid { namespace s4u { -#ifndef DOXYGEN -/** @deprecated Engine::get_all_storages() */ -XBT_ATTRIB_DEPRECATED_v322("Please use Engine::get_all_storages()") XBT_PUBLIC void getStorageList(std::map* whereTo); -#endif - /** Storage represent the disk resources, usually associated to a given host * * By default, SimGrid does not keep track of the actual data being written but diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 3bc7ae8b3d..e6572c94e0 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -999,8 +999,6 @@ XBT_PUBLIC void* smpi_shared_set_call(const char* func, const char* input, void* /* Fortran specific stuff */ XBT_PUBLIC int smpi_main(const char* program, int argc, char* argv[]); -XBT_ATTRIB_DEPRECATED_v322("Use s4u::this_actor::getPid(): v3.22 will turn this warning into an error.") XBT_PUBLIC - int smpi_process_index(); XBT_PUBLIC void smpi_process_init(int* argc, char*** argv); /* Trace replay specific stuff */ diff --git a/include/xbt/base.h b/include/xbt/base.h index e9faa61a05..e0279ba14b 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_v322(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.22 */ #define XBT_ATTRIB_DEPRECATED_v323(mesg) \ XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.23)") /* Will be dropped in v3.23 */ #define XBT_ATTRIB_DEPRECATED_v324(mesg) \ diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp index 74a45e8796..384d90f66e 100644 --- a/src/plugins/vm/VmLiveMigration.cpp +++ b/src/plugins/vm/VmLiveMigration.cpp @@ -300,13 +300,6 @@ void sg_vm_live_migration_plugin_init() simgrid::s4u::VirtualMachine::on_shutdown.connect(&onVirtualMachineShutdown); } -/* Deprecated. Please use MSG_vm_create_migratable() instead */ -msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, - int dp_intensity) -{ - return sg_vm_create_migratable(ind_pm, name, coreAmount, ramsize, mig_netspeed, dp_intensity); -} - simgrid::s4u::VirtualMachine* sg_vm_create_migratable(simgrid::s4u::Host* pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity) { diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 3f8d5677e8..5cb1a9839a 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -97,14 +97,6 @@ size_t Engine::get_host_count() { return pimpl->hosts_.size(); } -/** @brief Fills the passed list with all hosts found in the platform - * @deprecated Please prefer Engine::getAllHosts() - */ -void Engine::getHostList(std::vector* list) -{ - for (auto const& kv : pimpl->hosts_) - list->push_back(kv.second); -} std::vector Engine::get_all_hosts() { diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp index b1e3e714ae..799240f9a7 100644 --- a/src/s4u/s4u_Storage.cpp +++ b/src/s4u/s4u_Storage.cpp @@ -93,13 +93,6 @@ sg_size_t Storage::write(sg_size_t size) return i->get_performed_ioops(); } -// Deprecated functions -void getStorageList(std::map* whereTo) -{ - for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) - whereTo->insert({s->get_name(), s}); -} - } /* namespace s4u */ } /* namespace simgrid */ diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 96f7ff51d3..65bfc09ca4 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -130,10 +130,6 @@ void smpi_process_init(int *argc, char ***argv){ simgrid::smpi::ActorExt::init(argc, argv); } -int smpi_process_index(){ - return simgrid::s4u::this_actor::get_pid(); -} - void * smpi_process_get_user_data(){ return Actor::self()->get_impl()->get_user_data(); }