/* 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
#include "simgrid/host.h"
#include "simgrid/s4u/Link.hpp"
-#include "src/surf/xml/platf.hpp"
#include "src/surf/xml/simgrid_dtd.h"
#include <map>
#include <string>
#include <vector>
-namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace simgrid::kernel::routing {
/* ***************************************** */
/*
* Platform creation functions. Instead of passing 123 arguments to the creation functions
profile::Profile* speed_trace = nullptr;
profile::Profile* state_trace = nullptr;
std::string coord = "";
- std::unordered_map<std::string, std::string>* properties = nullptr;
- std::vector<resource::DiskImpl*> disks;
};
class HostLinkCreationArgs {
profile::Profile* latency_trace = nullptr;
profile::Profile* state_trace = nullptr;
s4u::Link::SharingPolicy policy = s4u::Link::SharingPolicy::FATPIPE;
- std::unordered_map<std::string, std::string>* properties = nullptr;
+ std::unordered_map<std::string, std::string> properties;
};
class PeerCreationArgs {
NetPoint* dst = nullptr;
NetPoint* gw_src = nullptr;
NetPoint* gw_dst = nullptr;
- std::vector<resource::LinkImpl*> link_list;
+ std::vector<simgrid::s4u::LinkInRoute> link_list;
};
enum class ClusterTopology { DRAGONFLY = 3, FAT_TREE = 2, FLAT = 1, TORUS = 0 };
double limiter_link = 0;
ClusterTopology topology = ClusterTopology::FLAT;
std::string topo_parameters;
- std::unordered_map<std::string, std::string>* properties = nullptr;
+ std::unordered_map<std::string, std::string> properties;
std::string router_id;
s4u::Link::SharingPolicy sharing_policy = s4u::Link::SharingPolicy::SPLITDUPLEX;
s4u::Link::SharingPolicy bb_sharing_policy = s4u::Link::SharingPolicy::SHARED;
double lat;
};
+class ClusterZoneCreationArgs {
+public:
+ std::string routing;
+ std::vector<HostLinkCreationArgs> host_links;
+ std::vector<CabinetCreationArgs> cabinets;
+ std::unique_ptr<LinkCreationArgs> backbone;
+};
+
class DiskCreationArgs {
public:
std::string id;
- std::unordered_map<std::string, std::string>* properties;
+ std::unordered_map<std::string, std::string> properties;
double read_bw;
double write_bw;
};
class ActorCreationArgs {
public:
std::vector<std::string> args;
- std::unordered_map<std::string, std::string>* properties = nullptr;
+ std::unordered_map<std::string, std::string> properties;
const char* host = nullptr;
const char* function = nullptr;
double start_time = 0.0;
extern XBT_PRIVATE xbt::signal<void(ClusterCreationArgs const&)> on_cluster_creation;
-} // namespace routing
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::routing
/********** Routing **********/
-void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb);
+void routing_cluster_add_backbone(std::unique_ptr<simgrid::kernel::routing::LinkCreationArgs> link);
/*** END of the parsing cruft ***/
XBT_PUBLIC simgrid::kernel::routing::NetZoneImpl*
-sg_platf_new_Zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone); // Begin description of new Zone
-XBT_PUBLIC void sg_platf_new_Zone_set_properties(const std::unordered_map<std::string, std::string>* props);
-XBT_PUBLIC void sg_platf_new_Zone_seal(); // That Zone is fully described
+sg_platf_new_zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone); // Begin description of new Zone
+XBT_PUBLIC void sg_platf_new_zone_set_properties(const std::unordered_map<std::string, std::string>& props);
+XBT_PUBLIC void sg_platf_new_zone_seal(); // That Zone is fully described
XBT_PUBLIC void
-sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* host); // Add a host to the current Zone
+sg_platf_new_host_begin(const simgrid::kernel::routing::HostCreationArgs* host); // Add a host to the current Zone
+XBT_PUBLIC void sg_platf_new_host_set_properties(const std::unordered_map<std::string, std::string>& props);
+XBT_PUBLIC void sg_platf_new_host_seal(int pstate); // That Host is fully described
+
XBT_PUBLIC void
sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* h); // Add a host_link to the current Zone
XBT_PUBLIC void
sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link); // Add a link to the current Zone
XBT_PUBLIC void
-sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer); // Add a peer to the current Zone
-XBT_PUBLIC void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* clust); // Add a cluster to the current Zone
+sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk); // Add a disk to the current host
XBT_PUBLIC void
-sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet); // Add a cabinet to the current Zone
+sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer); // Add a peer to the current Zone
+XBT_PUBLIC void sg_platf_new_tag_cluster(
+ simgrid::kernel::routing::ClusterCreationArgs* clust); // Add a regular cluster to the current Zone
XBT_PUBLIC simgrid::kernel::routing::NetPoint* // Add a router to the current Zone
sg_platf_new_router(const std::string&, const std::string& coords);
-
+XBT_PUBLIC void
+sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet); // Add a cabinet to the current Zone
XBT_PUBLIC void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route); // Add a route
-XBT_PUBLIC void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreationArgs* bypassroute); // Add a bypassRoute
-
-XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* trace);
+XBT_PUBLIC void sg_platf_new_bypass_route(simgrid::kernel::routing::RouteCreationArgs* route); // Add a bypass route
-XBT_PUBLIC simgrid::kernel::resource::DiskImpl*
-sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk); // Add a disk to the current host
+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);
