X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..8735a101c4a502473ba7381e88aec514ebe1b828:/include/simgrid/kernel/routing/NetZoneImpl.hpp

diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp
index 585bc78682..d530a4eb0f 100644
--- a/include/simgrid/kernel/routing/NetZoneImpl.hpp
+++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2020. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2016-2021. 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. */
@@ -7,6 +7,7 @@
 #define SIMGRID_ROUTING_NETZONEIMPL_HPP
 
 #include <simgrid/forward.h>
+#include <simgrid/s4u/Link.hpp>
 #include <simgrid/s4u/NetZone.hpp>
 #include <xbt/PropertyHolder.hpp>
 #include <xbt/graph.h>
@@ -69,9 +70,16 @@ class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder {
 
   std::map<std::pair<NetPoint*, NetPoint*>, BypassRoute*> bypass_routes_; // src x dst -> route
   routing::NetPoint* netpoint_ = nullptr;                                 // Our representative in the father NetZone
+  resource::NetworkModel* network_model_;
+  resource::CpuModel* cpu_model_vm_;
+  resource::CpuModel* cpu_model_pm_;
+  resource::DiskModel* disk_model_;
+  simgrid::surf::HostModel* host_model_;
+  /** @brief Perform sealing procedure for derived classes, if necessary */
+  virtual void do_seal(){};
 
 protected:
-  explicit NetZoneImpl(NetZoneImpl* father, const std::string& name, resource::NetworkModel* network_model);
+  explicit NetZoneImpl(const std::string& name);
   NetZoneImpl(const NetZoneImpl&) = delete;
   NetZoneImpl& operator=(const NetZoneImpl&) = delete;
   virtual ~NetZoneImpl();
@@ -81,7 +89,7 @@ protected:
    *
    * @param src where from
    * @param dst where to
-   * @param into Container into which the traversed links and gateway informations should be pushed
+   * @param into Container into which the traversed links and gateway information should be pushed
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */
   virtual void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) = 0;
@@ -100,8 +108,18 @@ public:
   /* FIXME: protect the following fields once the construction madness is sorted out */
   RoutingMode hierarchy_ = RoutingMode::unset;
 
-  resource::NetworkModel* network_model_;
-
+  /** @brief Retrieves the network model associated to this NetZone */
+  resource::NetworkModel* get_network_model() const { return network_model_; }
+  /** @brief Retrieves the CPU model for virtual machines associated to this NetZone */
+  resource::CpuModel* get_cpu_vm_model() const { return cpu_model_vm_; }
+  /** @brief Retrieves the CPU model for physical machines associated to this NetZone */
+  resource::CpuModel* get_cpu_pm_model() const { return cpu_model_pm_; }
+  /** @brief Retrieves the disk model associated to this NetZone */
+  resource::DiskModel* get_disk_model() const { return disk_model_; }
+  /** @brief Retrieves the host model associated to this NetZone */
+  simgrid::surf::HostModel* get_host_model() const { return host_model_; }
+
+  const s4u::NetZone* get_iface() const { return &piface_; }
   s4u::NetZone* get_iface() { return &piface_; }
   unsigned int get_table_size() const { return vertices_.size(); }
   std::vector<kernel::routing::NetPoint*> get_vertices() const { return vertices_; }
@@ -118,18 +136,26 @@ public:
   int get_host_count() const;
 
   /** @brief Make a host within that NetZone */
-  s4u::Host* create_host(const std::string& name, const std::vector<double>& speed_per_pstate, int core_count,
-                         const std::map<std::string, std::string>* props);
+  s4u::Host* create_host(const std::string& name, const std::vector<double>& speed_per_pstate, int core_amount);
+  /** @brief Create a disk with the disk model from this NetZone */
+  s4u::Disk* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth);
+  /** @brief Make a link within that NetZone */
+  virtual s4u::Link* create_link(const std::string& name, const std::vector<double>& bandwidths,
+                                 s4u::Link::SharingPolicy policy);
   /** @brief Creates a new route in this NetZone */
   virtual void add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
                                 std::vector<resource::LinkImpl*>& link_list, bool symmetrical);
 
   /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
-  virtual void seal() { sealed_ = true; };
+  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<kernel::resource::LinkImpl*>& link_list, bool symmetrical);
+  /** @brief Set parent of this Netzone */
+  void set_parent(NetZoneImpl* parent);
+  /** @brief Set network model for this Netzone */
+  void set_network_model(simgrid::kernel::resource::NetworkModel* netmodel);
 
   /* @brief get the route between two nodes in the full platform
    *
@@ -141,8 +167,8 @@ public:
   static void get_global_route(routing::NetPoint* src, routing::NetPoint* dst,
                                /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
 
-  virtual void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t>* nodes,
-                         std::map<std::string, xbt_edge_t>* edges) = 0;
+  virtual void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
+                         std::map<std::string, xbt_edge_t, std::less<>>* edges) = 0;
 };
 } // namespace routing
 } // namespace kernel