Simplyfying create_host and exporting it to s4u::NetZone

[simgrid.git] / src / kernel / routing / ClusterZone.cpp

diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp
index 500a1d1..0df128e 100644 (file)
--- a/src/kernel/routing/ClusterZone.cpp
+++ b/src/kernel/routing/ClusterZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-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. */
@@ -12,12 +12,29 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
 
 /* This routing is specifically setup to represent clusters, aka homogeneous sets of machines
- * Note that a router is created, easing the interconnexion with the rest of the world. */
+ * Note that a router is created, easing the interconnection with the rest of the world. */
 
 namespace simgrid {
 namespace kernel {
 namespace routing {
-ClusterZone::ClusterZone(NetZoneImpl* father, std::string name) : NetZoneImpl(father, name) {}
+ClusterZone::ClusterZone(const std::string& name) : NetZoneImpl(name) {}
+
+void ClusterZone::set_loopback()
+{
+  num_links_per_node_++;
+  has_loopback_ = true;
+}
+
+void ClusterZone::set_limiter()
+{
+  num_links_per_node_++;
+  has_limiter_ = true;
+}
+
+void ClusterZone::add_private_link_at(unsigned int position, std::pair<resource::LinkImpl*, resource::LinkImpl*> link)
+{
+  private_links_.insert({position, link});
+}
 
 void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
 {
@@ -26,17 +43,19 @@ void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
              "Cluster routing: no links attached to the source node - did you use host_link tag?");
 
   if ((src->id() == dst->id()) && has_loopback_) {
-    xbt_assert(not src->is_router(), "Routing from a cluster private router to itself is meaningless");
-
-    std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos(src->id()));
-    route->link_list.push_back(info.first);
-    if (lat)
-      *lat += info.first->get_latency();
+    if (src->is_router()) {
+      XBT_WARN("Routing from a cluster private router to itself is meaningless");
+    } else {
+      std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos(src->id()));
+      route->link_list.push_back(info.first);
+      if (lat)
+        *lat += info.first->get_latency();
+    }
     return;
   }
 
   if (not src->is_router()) { // No private link for the private router
-    if (has_limiter_) {      // limiter for sender
+    if (has_limiter_) {       // limiter for sender
       std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_loopback(src->id()));
       route->link_list.push_back(info.first);
     }
@@ -57,9 +76,9 @@ void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
   }
 
   if (not dst->is_router()) { // No specific link for router
-
     std::pair<resource::LinkImpl*, resource::LinkImpl*> info =
         private_links_.at(node_pos_with_loopback_limiter(dst->id()));
+
     if (info.second) { // link down
       route->link_list.push_back(info.second);
       if (lat)
@@ -72,8 +91,8 @@ void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
   }
 }
 
-void ClusterZone::get_graph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
-                            std::map<std::string, xbt_edge_t>* edges)
+void ClusterZone::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)
 {
   xbt_assert(router_,
              "Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph.");
@@ -123,14 +142,14 @@ void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, in
   std::string link_id = cluster->id + "_link_" + std::to_string(id);
 
   LinkCreationArgs link;
-  link.id        = link_id;
-  link.bandwidth = cluster->bw;
-  link.latency   = cluster->lat;
-  link.policy    = cluster->sharing_policy;
+  link.id = link_id;
+  link.bandwidths.push_back(cluster->bw);
+  link.latency = cluster->lat;
+  link.policy  = cluster->sharing_policy;
   sg_platf_new_link(&link);
 
-  s4u::Link* linkUp;
-  s4u::Link* linkDown;
+  const s4u::Link* linkUp;
+  const s4u::Link* linkDown;
   if (link.policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
     linkUp   = s4u::Link::by_name(link_id + "_UP");
     linkDown = s4u::Link::by_name(link_id + "_DOWN");
@@ -140,6 +159,14 @@ void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, in
   }
   private_links_.insert({position, {linkUp->get_impl(), linkDown->get_impl()}});
 }
+} // namespace routing
+} // namespace kernel
+
+namespace s4u {
+NetZone* createClusterZone(const std::string& name)
+{
+  return (new kernel::routing::ClusterZone(name))->get_iface();
 }
-}
-}
+} // namespace s4u
+
+} // namespace simgrid