From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 8 Jun 2017 19:27:18 +0000 (+0200)
Subject: Merge branch 'master' of github.com:simgrid/simgrid
X-Git-Tag: v3.16~134^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fd7651841882fc2795ff07da448a240dbdc90220?hp=-c

Merge branch 'master' of github.com:simgrid/simgrid
---

fd7651841882fc2795ff07da448a240dbdc90220
diff --combined src/surf/sg_platf.cpp
index f2be0fec9a,d75966f784..9079b8c2e2
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@@ -4,7 -4,6 +4,7 @@@
   * under the terms of the license (GNU LGPL) which comes with this package. */
  
  #include "simgrid/s4u/Engine.hpp"
 +#include "simgrid/s4u/Storage.hpp"
  
  #include "src/kernel/EngineImpl.hpp"
  #include "src/simix/smx_private.h"
@@@ -425,7 -424,8 +425,7 @@@ void sg_platf_new_mount(sg_platf_mount_
  
    if (mount_list.empty())
      XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id);
 -  mount_list.insert(
 -      {std::string(mount->name), surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId))});
 +  mount_list.insert({std::string(mount->name), simgrid::surf::StorageImpl::byName(mount->storageId)});
  }
  
  void sg_platf_new_route(sg_platf_route_cbarg_t route)
@@@ -677,10 -677,8 +677,8 @@@ void sg_platf_new_AS_seal(
  {
    xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
    current_routing->seal();
-   current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->father());
- 
-   if (TRACE_is_enabled())
-     sg_instr_AS_end();
+   simgrid::s4u::NetZone::onSeal(*current_routing);
+   current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->father()); 
  }
  
  /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */