X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa159d28bf7eb7b7876fbd85ea11a8d74cf489fc..538908929dd1460bcad60cccebc75c6fcd48c2c0:/include/simgrid/kernel/routing/NetZoneImpl.hpp diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index afb2d38970..ef9b53c363 100644 --- a/include/simgrid/kernel/routing/NetZoneImpl.hpp +++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2019. 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. */ @@ -6,12 +6,12 @@ #ifndef SIMGRID_ROUTING_NETZONEIMPL_HPP #define SIMGRID_ROUTING_NETZONEIMPL_HPP -#include - -#include "xbt/graph.h" +#include +#include +#include -#include "simgrid/forward.h" -#include "simgrid/s4u/NetZone.hpp" +#include +#include namespace simgrid { namespace kernel { @@ -47,20 +47,31 @@ class BypassRoute; * called Autonomous Systems in this article). * */ -class XBT_PUBLIC NetZoneImpl : public s4u::NetZone { +class XBT_PUBLIC NetZoneImpl { friend simgrid::kernel::EngineImpl; // it destroys netRoot_ protected: - explicit NetZoneImpl(NetZone* father, std::string name); + explicit NetZoneImpl(NetZoneImpl* father, const std::string& name, resource::NetworkModel* network_model); + NetZoneImpl(const NetZoneImpl&) = delete; + NetZoneImpl& operator=(const NetZoneImpl&) = delete; virtual ~NetZoneImpl(); public: - /** @brief Make an host within that NetZone */ - simgrid::s4u::Host* createHost(const char* name, std::vector* speedPerPstate, int coreAmount, - std::map* props); + s4u::NetZone* get_iface() { return &piface_; } + + /** @brief Make a host within that NetZone */ + simgrid::s4u::Host* create_host(const char* name, const std::vector& speed_per_pstate, int core_count, + const std::map* props); /** @brief Creates a new route in this NetZone */ - void addBypassRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - std::vector& link_list, bool symmetrical) override; + virtual void add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, + std::vector& link_list, bool symmetrical); + + /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */ + virtual void seal(); + virtual int add_component(kernel::routing::NetPoint* elm); /* A host, a router or a netzone, whatever */ + virtual void add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, + kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, + std::vector& link_list, bool symmetrical); protected: /** @@ -71,13 +82,46 @@ protected: * @param into Container into which the traversed links and gateway informations should be pushed * @param latency Accumulator in which the latencies should be added (caller must set it to 0) */ - virtual void getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) = 0; + virtual void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) = 0; /** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */ /* returns whether we found a bypass path */ - bool getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, - /* OUT */ std::vector& links, double* latency); + bool get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst, + /* OUT */ std::vector& links, double* latency); + +public: + resource::NetworkModel* network_model_; + +private: + s4u::NetZone piface_; + + // our content, as known to our graph routing algorithm (maps vertex_id -> vertex) + std::vector vertices_; + + NetZoneImpl* father_ = nullptr; + + std::vector children_; // sub-netzones + +public: + unsigned int get_table_size() { return vertices_.size(); } + std::vector get_vertices() { return vertices_; } + + NetZoneImpl* get_father(); + + std::vector* get_children(); // Sub netzones + +private: + std::string name_; + bool sealed_ = false; // We cannot add more content when sealed public: + /** @brief Retrieves the name of that netzone as a C++ string */ + const std::string& get_name() const { return name_; } + /** @brief Retrieves the name of that netzone as a C string */ + const char* get_cname() const; + + std::vector get_all_hosts(); + int get_host_count(); + /* @brief get the route between two nodes in the full platform * * @param src where from @@ -85,11 +129,11 @@ public: * @param links Accumulator in which all traversed links should be pushed (caller must empty it) * @param latency Accumulator in which the latencies should be added (caller must set it to 0) */ - static void getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst, - /* OUT */ std::vector& links, double* latency); + static void get_global_route(routing::NetPoint* src, routing::NetPoint* dst, + /* OUT */ std::vector& links, double* latency); - virtual void getGraph(xbt_graph_t graph, std::map* nodes, - std::map* edges) = 0; + virtual void get_graph(xbt_graph_t graph, std::map* nodes, + std::map* edges) = 0; enum class RoutingMode { unset = 0, /**< Undefined type */ base, /**< Base case: use simple link lists for routing */ @@ -99,7 +143,7 @@ public: RoutingMode hierarchy_ = RoutingMode::unset; private: - std::map, BypassRoute*> bypassRoutes_; // src x dst -> route + std::map, BypassRoute*> bypass_routes_; // src x dst -> route routing::NetPoint* netpoint_ = nullptr; // Our representative in the father NetZone }; } // namespace routing