#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
#include <cfloat>
#include <queue>
}
}
-xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id)
+xbt_node_t DijkstraZone::route_graph_new_node(int id, int graph_id)
{
graph_node_data_t data = new s_graph_node_data_t;
data->id = id;
return node;
}
-xbt_node_t DijkstraZone::nodeMapSearch(int id)
+xbt_node_t DijkstraZone::node_map_search(int id)
{
auto ret = graph_node_map_.find(id);
return ret == graph_node_map_.end() ? nullptr : ret->second;
/* Parsing */
-void DijkstraZone::newRoute(int src_id, int dst_id, simgrid::kernel::routing::RouteCreationArgs* e_route)
+void DijkstraZone::new_route(int src_id, int dst_id, simgrid::kernel::routing::RouteCreationArgs* e_route)
{
XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id);
xbt_node_t src = nullptr;
xbt_node_t dst = nullptr;
- xbt_node_t src_elm = nodeMapSearch(src_id);
- xbt_node_t dst_elm = nodeMapSearch(dst_id);
+ xbt_node_t src_elm = node_map_search(src_id);
+ xbt_node_t dst_elm = node_map_search(dst_id);
if (src_elm)
src = src_elm;
/* add nodes if they don't exist in the graph */
if (src_id == dst_id && src == nullptr && dst == nullptr) {
- src = this->routeGraphNewNode(src_id, -1);
+ src = this->route_graph_new_node(src_id, -1);
dst = src;
} else {
if (src == nullptr) {
- src = this->routeGraphNewNode(src_id, -1);
+ src = this->route_graph_new_node(src_id, -1);
}
if (dst == nullptr) {
- dst = this->routeGraphNewNode(dst_id, -1);
+ dst = this->route_graph_new_node(dst_id, -1);
}
}
xbt_graph_new_edge(route_graph_, src, dst, e_route);
}
-void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
{
- getRouteCheckParams(src, dst);
+ get_route_check_params(src, dst);
int src_id = src->id();
int dst_id = dst->id();
xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_);
/* Use the graph_node id mapping set to quickly find the nodes */
- xbt_node_t src_elm = nodeMapSearch(src_id);
- xbt_node_t dst_elm = nodeMapSearch(dst_id);
+ xbt_node_t src_elm = node_map_search(src_id);
+ xbt_node_t dst_elm = node_map_search(dst_id);
int src_node_id = static_cast<graph_node_data_t>(xbt_graph_node_get_data(src_elm))->graph_id;
int dst_node_id = static_cast<graph_node_data_t>(xbt_graph_node_get_data(dst_elm))->graph_id;
xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_s_v, node_e_v);
if (edge == nullptr)
- THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname());
+ THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname());
RouteCreationArgs* e_route = static_cast<RouteCreationArgs*>(xbt_graph_edge_get_data(edge));
for (auto const& link : e_route->link_list) {
route->link_list.insert(route->link_list.begin(), link);
if (lat)
- *lat += static_cast<surf::LinkImpl*>(link)->latency();
+ *lat += static_cast<resource::LinkImpl*>(link)->get_latency();
}
}
xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_pred_v, node_v);
if (edge == nullptr)
- THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname());
+ THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname());
RouteCreationArgs* e_route = static_cast<RouteCreationArgs*>(xbt_graph_edge_get_data(edge));
if (v == dst_node_id)
first_gw = gw_dst;
- if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && gw_dst->getName() != prev_gw_src->getName()) {
- std::vector<surf::LinkImpl*> e_route_as_to_as;
+ if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && gw_dst->get_name() != prev_gw_src->get_name()) {
+ std::vector<resource::LinkImpl*> e_route_as_to_as;
NetPoint* gw_dst_net_elm = nullptr;
NetPoint* prev_gw_src_net_elm = nullptr;
- getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr);
+ get_global_route(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr);
auto pos = route->link_list.begin();
for (auto const& link : e_route_as_to_as) {
route->link_list.insert(pos, link);
if (lat)
- *lat += link->latency();
+ *lat += link->get_latency();
pos++;
}
}
for (auto const& link : e_route->link_list) {
route->link_list.insert(route->link_list.begin(), link);
if (lat)
- *lat += static_cast<surf::LinkImpl*>(link)->latency();
+ *lat += static_cast<resource::LinkImpl*>(link)->get_latency();
}
}
/* Creation routing model functions */
-DijkstraZone::DijkstraZone(NetZone* father, std::string name, bool cached) : RoutedZone(father, name), cached_(cached)
+DijkstraZone::DijkstraZone(NetZoneImpl* father, std::string name, bool cached)
+ : RoutedZone(father, name), cached_(cached)
{
}
-void DijkstraZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
- kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical)
+void DijkstraZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+ std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
{
- const char* srcName = src->getCname();
- const char* dstName = dst->getCname();
+ const char* srcName = src->get_cname();
+ const char* dstName = dst->get_cname();
- addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical);
+ add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
/* Create the topology graph */
if (not route_graph_)
* nodes */
/* Add the route to the base */
- RouteCreationArgs* e_route = newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
- newRoute(src->id(), dst->id(), e_route);
+ RouteCreationArgs* e_route = new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
+ new_route(src->id(), dst->id(), e_route);
// Symmetrical YES
if (symmetrical == true) {
if (edge)
THROWF(arg_error, 0, "Route from %s to %s already exists", dstName, srcName);
} else {
- XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, gw_dst->getCname(), srcName, gw_src->getCname());
+ XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, gw_dst->get_cname(), srcName, gw_src->get_cname());
if (edge)
- THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, gw_dst->getCname(), srcName,
- gw_src->getCname());
+ THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, gw_dst->get_cname(), srcName,
+ gw_src->get_cname());
}
if (gw_dst && gw_src) {
gw_dst = gw_tmp;
}
RouteCreationArgs* link_route_back =
- newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0);
- newRoute(dst->id(), src->id(), link_route_back);
+ new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0);
+ new_route(dst->id(), src->id(), link_route_back);
}
}
}