-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved. */
/* 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>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace simgrid::kernel::routing {
xbt::signal<void(ClusterCreationArgs const&)> on_cluster_creation;
-} // namespace routing
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::routing
static simgrid::kernel::routing::ClusterZoneCreationArgs
zone_cluster; /* temporary store data for irregular clusters, created with <zone routing="Cluster"> */
void sg_platf_exit()
{
simgrid::kernel::routing::on_cluster_creation.disconnect_slots();
- simgrid::s4u::Engine::on_platform_created.disconnect_slots();
surf_parse_lex_destroy();
}
return netpoint;
}
-static void sg_platf_set_link_properties(simgrid::s4u::Link* link,
- const simgrid::kernel::routing::LinkCreationArgs* args)
-{
- link->set_properties(args->properties)
- ->set_state_profile(args->state_trace)
- ->set_latency_profile(args->latency_trace)
- ->set_bandwidth_profile(args->bandwidth_trace)
- ->set_latency(args->latency);
-}
-
void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args)
{
simgrid::s4u::Link* link;
link = current_routing->create_link(args->id, args->bandwidths);
link->get_impl()->set_sharing_policy(args->policy, {});
}
- sg_platf_set_link_properties(link, args);
+
+ link->set_properties(args->properties)
+ ->set_state_profile(args->state_trace)
+ ->set_latency_profile(args->latency_trace)
+ ->set_bandwidth_profile(args->bandwidth_trace)
+ ->set_latency(args->latency);
+
link->seal();
}
"(total = %zu). Check the 'radical' parameter in XML",
cluster->id.c_str(), id, cluster->radicals.size());
- std::string host_id = std::string(cluster->prefix) + std::to_string(cluster->radicals[id]) + cluster->suffix;
+ std::string host_id = cluster->prefix + std::to_string(cluster->radicals[id]) + cluster->suffix;
XBT_DEBUG("Cluster: creating host=%s speed=%f", host_id.c_str(), cluster->speeds.front());
const simgrid::s4u::Host* host = zone->create_host(host_id, cluster->speeds)
->set_core_count(cluster->core_amount)
"(total = %zu). Check the 'radical' parameter in XML",
cluster->id.c_str(), id, cluster->radicals.size());
- std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(cluster->radicals[id]) + "_loopback";
+ std::string link_id = cluster->id + "_link_" + std::to_string(cluster->radicals[id]) + "_loopback";
XBT_DEBUG("Cluster: creating loopback link=%s bw=%f", link_id.c_str(), cluster->loopback_bw);
simgrid::s4u::Link* loopback = zone->create_link(link_id, cluster->loopback_bw)
const std::vector<unsigned long>& /*coord*/,
unsigned long id)
{
- std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(id) + "_limiter";
+ std::string link_id = cluster->id + "_link_" + std::to_string(id) + "_limiter";
XBT_DEBUG("Cluster: creating limiter link=%s bw=%f", link_id.c_str(), cluster->limiter_link);
simgrid::s4u::Link* limiter = zone->create_link(link_id, cluster->limiter_link)->seal();
}
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();
}
/*************************************************************************************************/
static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationArgs* cluster)
{
auto* zone = simgrid::s4u::create_star_zone(cluster->id);
- simgrid::s4u::NetZone const* parent = current_routing ? current_routing->get_iface() : nullptr;
- if (parent)
+ if (const auto* parent = current_routing ? current_routing->get_iface() : nullptr)
zone->set_parent(parent);
/* set properties */
- for (auto const& elm : cluster->properties)
- zone->set_property(elm.first, elm.second);
+ for (auto const& [key, value] : cluster->properties)
+ zone->set_property(key, value);
/* Make the backbone */
const simgrid::s4u::Link* backbone = nullptr;
if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) {
- std::string bb_name = std::string(cluster->id) + "_backbone";
+ std::string bb_name = cluster->id + "_backbone";
XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/> <!--backbone -->", bb_name.c_str(), cluster->bb_bw,
cluster->bb_lat);
}
for (int const& i : cluster->radicals) {
- std::string host_id = std::string(cluster->prefix) + std::to_string(i) + cluster->suffix;
+ std::string host_id = cluster->prefix + std::to_string(i) + cluster->suffix;
XBT_DEBUG("<host\tid=\"%s\"\tspeed=\"%f\">", host_id.c_str(), cluster->speeds.front());
const auto* host = zone->create_host(host_id, cluster->speeds)
XBT_DEBUG("</host>");
- std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(i);
+ std::string link_id = cluster->id + "_link_" + std::to_string(i);
XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id.c_str(), cluster->bw, cluster->lat);
// add a loopback link
// add a limiter link (shared link to account for maximal bandwidth of the node)
const simgrid::s4u::Link* limiter = nullptr;
if (cluster->limiter_link > 0) {
- std::string limiter_name = std::string(link_id) + "_limiter";
+ std::string limiter_name = link_id + "_limiter";
XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", limiter_name.c_str(), cluster->limiter_link);
limiter = zone->create_link(limiter_name, cluster->limiter_link)->seal();
XBT_DEBUG(" ");
XBT_DEBUG("<router id=\"%s\"/>", cluster->router_id.c_str());
if (cluster->router_id.empty())
- cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix;
+ cluster->router_id = cluster->prefix + cluster->id + "_router" + cluster->suffix;
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;
simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args));
auto* arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, actor->properties,
- auto_restart);
+ auto_restart, /*daemon=*/false, /*restart_count=*/0);
host->get_impl()->add_actor_at_boot(arg);
if (start_time > simgrid::s4u::Engine::get_clock()) {
arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, actor->properties,
- auto_restart);
-
- XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
- simgrid::kernel::timer::Timer::set(start_time, [arg, auto_restart]() {
- simgrid::kernel::actor::ActorImplPtr new_actor =
- simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), arg->code, arg->data, arg->host, nullptr);
- new_actor->set_properties(arg->properties);
- if (arg->kill_time >= 0)
- new_actor->set_kill_time(arg->kill_time);
- if (auto_restart)
- new_actor->set_auto_restart(auto_restart);
+ auto_restart, /*daemon=*/false, /*restart_count=*/0);
+
+ XBT_DEBUG("Actor %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
+ simgrid::kernel::timer::Timer::set(start_time, [arg]() {
+ simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create(arg);
delete arg;
});
} else { // start_time <= simgrid::s4u::Engine::get_clock()
- XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname());
+ XBT_DEBUG("Starting actor %s(%s) right now", arg->name.c_str(), host->get_cname());
try {
- simgrid::kernel::actor::ActorImplPtr new_actor = nullptr;
- new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), code, nullptr, host, nullptr);
- new_actor->set_properties(arg->properties);
- /* The actor creation will fail if the host is currently dead, but that's fine */
- if (arg->kill_time >= 0)
- new_actor->set_kill_time(arg->kill_time);
- if (auto_restart)
- new_actor->set_auto_restart(auto_restart);
+ simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create(arg);
} catch (simgrid::HostFailureException const&) {
- XBT_WARN("Deployment includes some initially turned off Hosts ... nevermind.");
+ XBT_WARN("Starting actor %s(%s) failed because its host is turned off.", arg->name.c_str(), host->get_cname());
}
}
}
zone_cluster.cabinets.clear();
zone_cluster.backbone.reset();
}
- current_routing->seal();
current_routing = current_routing->get_parent();
}
zone_cluster.host_links.emplace_back(*hostlink);
}
-void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* args)
+void sg_platf_new_trace(const simgrid::kernel::routing::ProfileCreationArgs* args)
{
simgrid::kernel::profile::Profile* profile;
if (not args->file.empty()) {
- profile = simgrid::kernel::profile::Profile::from_file(args->file);
+ profile = simgrid::kernel::profile::ProfileBuilder::from_file(args->file);
} else {
xbt_assert(not args->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.",
args->id.c_str());
- profile = simgrid::kernel::profile::Profile::from_string(args->id, args->pc_data, args->periodicity);
+ profile = simgrid::kernel::profile::ProfileBuilder::from_string(args->id, args->pc_data, args->periodicity);
}
- traces_set_list.insert({args->id, profile});
+ traces_set_list.try_emplace(args->id, profile);
}
