-/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2022. 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. */
-#include "simgrid/kernel/routing/WifiZone.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "src/surf/network_interface.hpp"
-#include "surf/surf.hpp"
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/kernel/routing/WifiZone.hpp>
-#include <unordered_set>
+#include "src/kernel/resource/StandardLinkImpl.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_wifi, surf, "Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_wifi, ker_routing, "Kernel Wifi Routing");
namespace simgrid {
namespace kernel {
}
}
-void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, Route* res, double* lat)
+void WifiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* res, double* lat)
{
- XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
+ XBT_DEBUG("full getLocalRoute from %s[%lu] to %s[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
if (wifi_link_ != nullptr) {
// If src and dst are nodes, not access_point, we need to traverse the link twice
if (src != access_point_) {
XBT_DEBUG("src %s is not our gateway", src->get_cname());
- res->link_list_.push_back(wifi_link_);
- if (lat)
- *lat += wifi_link_->get_latency();
+ add_link_latency(res->link_list_, wifi_link_, lat);
}
if (dst != access_point_) {
XBT_DEBUG("dst %s is not our gateway", dst->get_cname());
- res->link_list_.push_back(wifi_link_);
- if (lat)
- *lat += wifi_link_->get_latency();
+ add_link_latency(res->link_list_, wifi_link_, lat);
}
}
}
"WIFI netzone %s contains more than one link. Please only declare one, the wifi link.", get_cname());
wifi_link_ = get_network_model()->create_wifi_link(name, bandwidths);
- wifi_link_->set_sharing_policy(s4u::Link::SharingPolicy::WIFI);
+ wifi_link_->set_sharing_policy(s4u::Link::SharingPolicy::WIFI, {});
return wifi_link_->get_iface();
}
} // namespace routing