X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/80179d0d487623a5bbd8b49a9ef8a32a5302cd9a..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 044ed0a4af..99b2dd15f8 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -1,6 +1,6 @@ /* platf_private.h - Interface to the SimGrid platforms which visibility should be limited to this directory */ -/* Copyright (c) 2004-2021. The SimGrid Team. +/* Copyright (c) 2004-2022. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,16 +11,13 @@ #include "simgrid/host.h" #include "simgrid/s4u/Link.hpp" -#include "src/surf/xml/platf.hpp" #include "src/surf/xml/simgrid_dtd.h" #include #include #include -namespace simgrid { -namespace kernel { -namespace routing { +namespace simgrid::kernel::routing { /* ***************************************** */ /* * Platform creation functions. Instead of passing 123 arguments to the creation functions @@ -80,7 +77,7 @@ public: NetPoint* dst = nullptr; NetPoint* gw_src = nullptr; NetPoint* gw_dst = nullptr; - std::vector link_list; + std::vector link_list; }; enum class ClusterTopology { DRAGONFLY = 3, FAT_TREE = 2, FLAT = 1, TORUS = 0 }; @@ -171,9 +168,7 @@ public: extern XBT_PRIVATE xbt::signal on_cluster_creation; -} // namespace routing -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::routing /********** Routing **********/ void routing_cluster_add_backbone(std::unique_ptr link); @@ -206,8 +201,7 @@ sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabine XBT_PUBLIC void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route); // Add a route XBT_PUBLIC void sg_platf_new_bypass_route(simgrid::kernel::routing::RouteCreationArgs* route); // Add a bypass route -XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* trace); - +XBT_PUBLIC void sg_platf_new_trace(const simgrid::kernel::routing::ProfileCreationArgs* trace); XBT_PUBLIC void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor); XBT_PRIVATE void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect);