-/* 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/NetworkModel.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 {
-namespace routing {
+namespace kernel::routing {
void WifiZone::do_seal()
{
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
}
}
-s4u::Link* WifiZone::create_link(const std::string& name, const std::vector<double>& bandwidths)
+resource::StandardLinkImpl* WifiZone::do_create_link(const std::string& name, const std::vector<double>& bandwidths)
{
xbt_assert(wifi_link_ == nullptr,
"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);
- return wifi_link_->get_iface();
+ wifi_link_->set_sharing_policy(s4u::Link::SharingPolicy::WIFI, {});
+ return wifi_link_;
}
-} // namespace routing
-} // namespace kernel
+} // namespace kernel::routing
namespace s4u {
NetZone* create_wifi_zone(const std::string& name)