-/* Copyright (c) 2013-2017. 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. */
#ifndef SIMGRID_ROUTING_CLUSTER_HPP_
#define SIMGRID_ROUTING_CLUSTER_HPP_
-#include <src/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
#include <unordered_map>
* 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):
* <tt>limiter(A)_UP, private(A)_UP, backbone, private(B)_DOWN, limiter(B)_DOWN.</tt>
* 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.
* 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:
* <tt>limiter(A)_UP, private(A)_UP, backbone</tt>
* (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 getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;
- void getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
- std::map<std::string, xbt_edge_t>* edges) override;
+ void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;
+ void get_graph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
+ std::map<std::string, xbt_edge_t>* edges) override;
virtual void create_links_for_node(ClusterCreationArgs* cluster, int id, int rank, unsigned int position);
virtual void parse_specific_arguments(ClusterCreationArgs* cluster)
}
/* 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<unsigned int, std::pair<surf::LinkImpl*, surf::LinkImpl*>> privateLinks_;
+ /* The pair is {link_up, link_down} */
+ std::unordered_map<unsigned int, std::pair<kernel::resource::LinkImpl*, kernel::resource::LinkImpl*>> private_links_;
- unsigned int nodePosition(int id) { return id * linkCountPerNode_; }
- unsigned int nodePositionWithLoopback(int id) { return nodePosition(id) + (hasLoopback_ ? 1 : 0); }
- unsigned int nodePositionWithLimiter(int id) { return nodePositionWithLoopback(id) + (hasLimiter_ ? 1 : 0); }
+ 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); }
- surf::LinkImpl* backbone_ = nullptr;
void* loopback_ = nullptr;
+ kernel::resource::LinkImpl* backbone_ = nullptr;
NetPoint* router_ = nullptr;
- bool hasLimiter_ = false;
- bool hasLoopback_ = false;
- unsigned int linkCountPerNode_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
+ bool has_limiter_ = false;
+ bool has_loopback_ = false;
+ unsigned int num_links_per_node_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
};
} // namespace routing
} // namespace kernel