Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --cc examples/s4u/dht-chord/s4u-dht-chord.cpp
index 2fc2877,b675aa1..4a465bb
--- 1/examples/s4u/dht-chord/s4u-dht-chord.cpp
--- 2/examples/s4u/dht-chord/s4u-dht-chord.cpp
+++ b/examples/s4u/dht-chord/s4u-dht-chord.cpp
@@@ -64,7 -38,13 +38,13 @@@ int main(int argc, char* argv[]
  
    e.load_platform(options[0]);
  
-   chord_init(); // FIXME: inline me
+   /* Global initialization of the Chord simulation. */
+   nb_keys = 1U << nb_bits;
+   XBT_DEBUG("Sets nb_keys to %d", nb_keys);
+ 
+   HostChord::EXTENSION_ID = simgrid::s4u::Host::extension_create<HostChord>();
 -  for (auto const& host : simgrid::s4u::Engine::getInstance()->get_all_hosts())
++  for (auto const& host : simgrid::s4u::Engine::get_instance()->get_all_hosts())
+     host->extension_set(new HostChord(host));
  
    e.register_actor<Node>("node");
    e.load_deployment(options[1]);

diff --cc src/s4u/s4u_Storage.cpp
index 2e5d37d,8a870df..6080b06
--- 1/src/s4u/s4u_Storage.cpp
--- 2/src/s4u/s4u_Storage.cpp
+++ b/src/s4u/s4u_Storage.cpp
@@@ -19,11 -19,9 +19,9 @@@ template class Extendable<simgrid::s4u:
  
  namespace s4u {
  
- void XBT_ATTRIB_DEPRECATED_v322(
-     "simgrid::s4u::getStorageList() is deprecated in favor of Engine::getAllStorages(). Please switch before v3.22")
-     getStorageList(std::map<std::string, Storage*>* whereTo)
+ void getStorageList(std::map<std::string, Storage*>* whereTo)
  {
 -  for (auto const& s : simgrid::s4u::Engine::getInstance()->get_all_storages())
 +  for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
      whereTo->insert({s->get_name(), s});
  }
  

diff --cc src/surf/instr_routing.cpp
Simple merge

diff --cc src/surf/sg_platf.cpp
Simple merge

diff --cc src/surf/storage_n11.cpp
index 237c72d,6d71df7..e1a0cd2
--- 1/src/surf/storage_n11.cpp
--- 2/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@@ -17,9 -17,9 +17,9 @@@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_
   *************/
  extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
  
- static void check_disk_attachment()
+ void check_disk_attachment()
  {
 -  for (auto const& s : simgrid::s4u::Engine::getInstance()->get_all_storages()) {
 +  for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) {
      simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str());
      if (not host_elm)
        surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +