Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Tue, 9 Oct 2018 23:31:38 +0000 (01:31 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Tue, 9 Oct 2018 23:31:38 +0000 (01:31 +0200)
doc/Doxyfile.in
docs/source/Doxyfile
include/simgrid/msg.h
include/simgrid/s4u/Engine.hpp
include/simgrid/s4u/Storage.hpp
include/smpi/smpi.h
include/xbt/base.h
src/plugins/vm/VmLiveMigration.cpp
src/s4u/s4u_Engine.cpp
src/s4u/s4u_Storage.cpp
src/smpi/internals/smpi_global.cpp

index b5f7607..9e19c0b 100644 (file)
@@ -1463,9 +1463,9 @@ 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)=
+                         XBT_ATTRIB_DEPRECATED_v324(m)= \
+                         XBT_ATTRIB_DEPRECATED_v325(m)=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
index 664bf64..79fd2db 100644 (file)
@@ -38,6 +38,6 @@ PREDEFINED             += \
     XBT_PRIVATE= \
     XBT_ATTRIB_NORETURN= \
     XBT_ATTRIB_UNUSED= \
-    XBT_ATTRIB_DEPRECATED_v322(m)= \
     XBT_ATTRIB_DEPRECATED_v323(m)= \
-    XBT_ATTRIB_DEPRECATED_v324(m)=
+    XBT_ATTRIB_DEPRECATED_v324(m)= \
+    XBT_ATTRIB_DEPRECATED_v325(m)=
index 515b066..1092890 100644 (file)
@@ -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);
 
index 6bb6e89..7a06b51 100644 (file)
@@ -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<Host*>* whereTo);
-  /** @deprecated See Engine::get_all_hosts() */
   XBT_ATTRIB_DEPRECATED_v323("Please use Engine::get_all_hosts()") std::vector<Host*> 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<Link*>* list);
   /** @deprecated See Engine::get_link_list() */
   XBT_ATTRIB_DEPRECATED_v323("Please use Engine::get_link_list()") std::vector<Link*> getAllLinks()
   {
index 2f5f89d..7559611 100644 (file)
 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<std::string, Storage*>* 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
index 3bc7ae8..e6572c9 100644 (file)
@@ -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 */
index e9faa61..5dffa94 100644 (file)
 #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)                                                                               \
   XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.24)") /* Will be dropped in v3.24 */
+#define XBT_ATTRIB_DEPRECATED_v325(mesg)                                                                               \
+  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.25)") /* Will be dropped in v3.25 */
 
 #if !defined(__APPLE__)
 #  define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__(prio)))
index 74a45e8..384d90f 100644 (file)
@@ -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)
 {
index 3f8d567..5cb1a98 100644 (file)
@@ -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<Host*>* list)
-{
-  for (auto const& kv : pimpl->hosts_)
-    list->push_back(kv.second);
-}
 
 std::vector<Host*> Engine::get_all_hosts()
 {
index b1e3e71..799240f 100644 (file)
@@ -93,13 +93,6 @@ sg_size_t Storage::write(sg_size_t size)
   return i->get_performed_ioops();
 }
 
-// Deprecated functions
-void getStorageList(std::map<std::string, Storage*>* whereTo)
-{
-  for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
-    whereTo->insert({s->get_name(), s});
-}
-
 } /* namespace s4u */
 } /* namespace simgrid */
 
index 96f7ff5..65bfc09 100644 (file)
@@ -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();
 }