X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3a267e5ba376a0f0313767a12d518ffdeaa7196..26ba5558401021cb3854f2f1a5ffedd7044f6823:/include/simgrid/kernel/routing/ClusterZone.hpp
diff --git a/include/simgrid/kernel/routing/ClusterZone.hpp b/include/simgrid/kernel/routing/ClusterZone.hpp
index 0005d46756..cd41a4331b 100644
--- a/include/simgrid/kernel/routing/ClusterZone.hpp
+++ b/include/simgrid/kernel/routing/ClusterZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-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. */
@@ -52,7 +52,7 @@ namespace routing {
* host0 host1 host2
* \endverbatim
- * So, a communication from an host A to an host B goes through the following links (if they exist):
+ * So, a communication from a host A to a host B goes through the following links (if they exist):
* limiter(A)_UP, private(A)_UP, backbone, private(B)_DOWN, limiter(B)_DOWN.
* link_UP and link_DOWN usually share the exact same characteristics, but their
* performance are not shared, to model the fact that TCP links are full-duplex.
@@ -60,17 +60,17 @@ namespace routing {
* A cluster is connected to the outer world through a router that is connected
* directly to the cluster's backbone (no private link).
*
- * A communication from an host A to the outer world goes through the following links:
+ * A communication from a host A to the outer world goes through the following links:
* limiter(A)_UP, private(A)_UP, backbone
* (because the private router is directly connected to the cluster core).
*/
class ClusterZone : public NetZoneImpl {
public:
- explicit ClusterZone(NetZone* father, std::string name);
+ explicit ClusterZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel);
void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;
- void get_graph(xbt_graph_t graph, std::map* nodes,
+ void get_graph(const s_xbt_graph_t* graph, std::map* nodes,
std::map* edges) override;
virtual void create_links_for_node(ClusterCreationArgs* cluster, int id, int rank, unsigned int position);
@@ -80,15 +80,15 @@ public:
}
/* We use a map instead of a std::vector here because that's a sparse vector. Some values may not exist */
- /* The pair is {linkUp, linkDown} */
- std::unordered_map> private_links_;
+ /* The pair is {link_up, link_down} */
+ std::unordered_map> private_links_;
unsigned int node_pos(int id) { return id * num_links_per_node_; }
unsigned int node_pos_with_loopback(int id) { return node_pos(id) + (has_loopback_ ? 1 : 0); }
unsigned int node_pos_with_loopback_limiter(int id) { return node_pos_with_loopback(id) + (has_limiter_ ? 1 : 0); }
void* loopback_ = nullptr;
- surf::LinkImpl* backbone_ = nullptr;
+ kernel::resource::LinkImpl* backbone_ = nullptr;
NetPoint* router_ = nullptr;
bool has_limiter_ = false;
bool has_loopback_ = false;