/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "simgrid/Exception.hpp"
-#include "simgrid/kernel/routing/DijkstraZone.hpp"
-#include "simgrid/kernel/routing/DragonflyZone.hpp"
-#include "simgrid/kernel/routing/EmptyZone.hpp"
-#include "simgrid/kernel/routing/FatTreeZone.hpp"
-#include "simgrid/kernel/routing/FloydZone.hpp"
-#include "simgrid/kernel/routing/FullZone.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/kernel/routing/NetZoneImpl.hpp"
-#include "simgrid/kernel/routing/TorusZone.hpp"
-#include "simgrid/kernel/routing/VivaldiZone.hpp"
-#include "simgrid/kernel/routing/WifiZone.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/NetZone.hpp"
-#include "src/include/simgrid/sg_config.hpp"
-#include "src/include/surf/surf.hpp"
+#include <simgrid/Exception.hpp>
+#include <simgrid/kernel/routing/DijkstraZone.hpp>
+#include <simgrid/kernel/routing/DragonflyZone.hpp>
+#include <simgrid/kernel/routing/EmptyZone.hpp>
+#include <simgrid/kernel/routing/FatTreeZone.hpp>
+#include <simgrid/kernel/routing/FloydZone.hpp>
+#include <simgrid/kernel/routing/FullZone.hpp>
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/kernel/routing/TorusZone.hpp>
+#include <simgrid/kernel/routing/VivaldiZone.hpp>
+#include <simgrid/kernel/routing/WifiZone.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/NetZone.hpp>
+
+#include "simgrid/sg_config.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
-#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
+#include "src/surf/xml/platf.hpp"
#include "src/surf/xml/platf_private.hpp"
#include <algorithm>
void sg_platf_exit()
{
simgrid::kernel::routing::on_cluster_creation.disconnect_slots();
- simgrid::s4u::Engine::on_platform_created.disconnect_slots();
+ // simgrid::s4u::Engine::on_platform_created.disconnect_slots();
surf_parse_lex_destroy();
}
}
simgrid::s4u::NetZone const* parent = current_routing ? current_routing->get_iface() : nullptr;
- simgrid::s4u::NetZone* zone;
switch (cluster->topology) {
case simgrid::kernel::routing::ClusterTopology::TORUS:
- zone = simgrid::s4u::create_torus_zone(
- cluster->id, parent, TorusZone::parse_topo_parameters(cluster->topo_parameters),
- {set_host, set_loopback, set_limiter}, cluster->bw, cluster->lat, cluster->sharing_policy);
+ simgrid::s4u::create_torus_zone(cluster->id, parent, TorusZone::parse_topo_parameters(cluster->topo_parameters),
+ {set_host, set_loopback, set_limiter}, cluster->bw, cluster->lat,
+ cluster->sharing_policy);
break;
case simgrid::kernel::routing::ClusterTopology::DRAGONFLY:
- zone = simgrid::s4u::create_dragonfly_zone(
+ simgrid::s4u::create_dragonfly_zone(
cluster->id, parent, DragonflyZone::parse_topo_parameters(cluster->topo_parameters),
{set_host, set_loopback, set_limiter}, cluster->bw, cluster->lat, cluster->sharing_policy);
break;
case simgrid::kernel::routing::ClusterTopology::FAT_TREE:
- zone = simgrid::s4u::create_fatTree_zone(
+ simgrid::s4u::create_fatTree_zone(
cluster->id, parent, FatTreeZone::parse_topo_parameters(cluster->topo_parameters),
{set_host, set_loopback, set_limiter}, cluster->bw, cluster->lat, cluster->sharing_policy);
break;
default:
THROW_IMPOSSIBLE;
}
- zone->seal();
}
/*************************************************************************************************/
auto* router = zone->create_router(cluster->router_id);
zone->add_route(router, nullptr, nullptr, nullptr, {});
- zone->seal();
simgrid::kernel::routing::on_cluster_creation(*cluster);
}
const simgrid::kernel::routing::HostLinkCreationArgs* hostlink,
const simgrid::s4u::Link* backbone)
{
- simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_netpoint();
+ const auto engine = simgrid::s4u::Engine::get_instance();
+ auto netpoint = engine->host_by_name(hostlink->id)->get_netpoint();
xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str());
- const simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up);
- const simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down);
+ const auto linkUp = engine->link_by_name_or_null(hostlink->link_up);
+ const auto linkDown = engine->link_by_name_or_null(hostlink->link_down);
xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str());
xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str());
void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
{
+ const auto* engine = simgrid::s4u::Engine::get_instance();
sg_host_t host = sg_host_by_name(actor->host);
if (not host) {
// The requested host does not exist. Do a nice message to the user
std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host +
"' does not exist\nExisting hosts: '";
- std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::get_instance()->get_all_hosts();
+ std::vector<simgrid::s4u::Host*> list = engine->get_all_hosts();
for (auto const& some_host : list) {
msg += some_host->get_name();
}
xbt_die("%s", msg.c_str());
}
- const simgrid::kernel::actor::ActorCodeFactory& factory =
- simgrid::kernel::EngineImpl::get_instance()->get_function(actor->function);
+ const simgrid::kernel::actor::ActorCodeFactory& factory = engine->get_impl()->get_function(actor->function);
xbt_assert(factory, "Error while creating an actor from the XML file: Function '%s' not registered", actor->function);
double start_time = actor->start_time;
zone_cluster.cabinets.clear();
zone_cluster.backbone.reset();
}
- current_routing->seal();
current_routing = current_routing->get_parent();
}
