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"> */
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;
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);
}