* 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"
#include <string>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-XBT_PRIVATE std::map<std::string, simgrid::surf::Storage*> mount_list;
+XBT_PRIVATE std::map<std::string, simgrid::surf::StorageImpl*> mount_list;
XBT_PRIVATE std::vector<std::string> known_storages;
namespace simgrid {
if (args->coord && strcmp(args->coord, ""))
new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
- if (TRACE_is_enabled() && TRACE_needs_platform())
- sg_instr_new_host(*host);
}
/** @brief Add a "router" to the network element list */
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)
/* set the new current component of the tree */
current_routing = new_as;
- if (TRACE_is_enabled())
- sg_instr_AS_begin(AS);
+ simgrid::s4u::NetZone::onCreation(*new_as); // notify the signal
return new_as;
}
{
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->seal();
+ simgrid::s4u::NetZone::onSeal(*current_routing);
current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->father());
-
- if (TRACE_is_enabled())
- sg_instr_AS_end();
}
/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */