/* 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. */
+#include <xbt/dynar.h>
+
+#include <simgrid/s4u/host.hpp>
+
#include "src/surf/AsVivaldi.hpp"
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
namespace simgrid {
-namespace surf {
+namespace routing {
static inline double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) {
double src_coord = xbt_dynar_get_as(src, index, double);
double dst_coord = xbt_dynar_get_as(dst, index, double);
/* Retrieve the private links */
if ((int)xbt_dynar_length(privateLinks_) > src->id()) {
s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, src->id(), s_surf_parsing_link_up_down_t);
- if(info.link_up) {
- route->link_list->push_back(info.link_up);
+ if(info.linkUp) {
+ route->link_list->push_back(info.linkUp);
if (lat)
- *lat += info.link_up->getLatency();
+ *lat += info.linkUp->getLatency();
}
}
if ((int)xbt_dynar_length(privateLinks_)>dst->id()) {
s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, dst->id(), s_surf_parsing_link_up_down_t);
- if(info.link_down) {
- route->link_list->push_back(info.link_down);
+ if(info.linkDown) {
+ route->link_list->push_back(info.linkDown);
if (lat)
- *lat += info.link_down->getLatency();
+ *lat += info.linkDown->getLatency();
}
}