X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17c819afc4ceda4000eec137c8fee35168253b4d..da23351cb44bc018edc2c181b90bcdb7083b061c:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index f6ae5a1675..1ce64e2d9e 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -72,7 +72,7 @@ void DijkstraZone::seal() } } -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; @@ -84,7 +84,7 @@ xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_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; @@ -92,14 +92,14 @@ xbt_node_t DijkstraZone::nodeMapSearch(int id) /* 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; @@ -109,14 +109,14 @@ void DijkstraZone::newRoute(int src_id, int dst_id, simgrid::kernel::routing::Ro /* 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); } } @@ -126,15 +126,15 @@ void DijkstraZone::newRoute(int src_id, int dst_id, simgrid::kernel::routing::Ro 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(xbt_graph_node_get_data(src_elm))->graph_id; int dst_node_id = static_cast(xbt_graph_node_get_data(dst_elm))->graph_id; @@ -154,7 +154,7 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr for (auto const& link : e_route->link_list) { route->link_list.insert(route->link_list.begin(), link); if (lat) - *lat += static_cast(link)->latency(); + *lat += static_cast(link)->get_latency(); } } @@ -229,7 +229,7 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr first_gw = gw_dst; if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && gw_dst->get_name() != prev_gw_src->get_name()) { - std::vector e_route_as_to_as; + std::vector e_route_as_to_as; NetPoint* gw_dst_net_elm = nullptr; NetPoint* prev_gw_src_net_elm = nullptr; @@ -238,7 +238,7 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr 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++; } } @@ -246,7 +246,7 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr for (auto const& link : e_route->link_list) { route->link_list.insert(route->link_list.begin(), link); if (lat) - *lat += static_cast(link)->latency(); + *lat += static_cast(link)->get_latency(); } } @@ -266,18 +266,18 @@ DijkstraZone::~DijkstraZone() /* 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::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, - kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - std::vector& link_list, bool symmetrical) +void DijkstraZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, + std::vector& link_list, bool symmetrical) { 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_) @@ -287,8 +287,8 @@ void DijkstraZone::add_route(kernel::routing::NetPoint* src, kernel::routing::Ne * 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) { @@ -315,8 +315,8 @@ void DijkstraZone::add_route(kernel::routing::NetPoint* src, kernel::routing::Ne 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); } } }