A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use plain pointers instead of references to pointer.
[simgrid.git]
/
src
/
kernel
/
routing
/
WifiZone.cpp
diff --git
a/src/kernel/routing/WifiZone.cpp
b/src/kernel/routing/WifiZone.cpp
index 4c644205817c67db12f181f0f419223d28fc8d9b..b6d40835d8cb85b8baaccbe30a5afe899fdc4120 100644
(file)
--- a/
src/kernel/routing/WifiZone.cpp
+++ b/
src/kernel/routing/WifiZone.cpp
@@
-1,27
+1,19
@@
-/* Copyright (c) 2009-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
3
. 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. */
/* 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 "src/surf/xml/platf_private.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_platform, "Kernel Wifi Routing
");
namespace simgrid {
namespace simgrid {
-namespace kernel {
-namespace routing {
-WifiZone::WifiZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
- : RoutedZone(father, name, netmodel)
-{
-}
+namespace kernel::routing {
-void WifiZone::seal()
+void WifiZone::
do_
seal()
{
const char* AP_name = get_property("access_point");
if (AP_name != nullptr) {
{
const char* AP_name = get_property("access_point");
if (AP_name != nullptr) {
@@
-29,45
+21,45
@@
void WifiZone::seal()
xbt_assert(access_point_ != nullptr, "Access point '%s' of WIFI zone '%s' does not exist: no such host or router.",
AP_name, get_cname());
xbt_assert(access_point_->is_host() || access_point_->is_router(),
xbt_assert(access_point_ != nullptr, "Access point '%s' of WIFI zone '%s' does not exist: no such host or router.",
AP_name, get_cname());
xbt_assert(access_point_->is_host() || access_point_->is_router(),
- "Access point '%s' of WIFI zone '%s' must be either a
n
host or a router.", AP_name, get_cname());
+ "Access point '%s' of WIFI zone '%s' must be either a host or a router.", AP_name, get_cname());
}
}
}
}
-void WifiZone::get_local_route(
NetPoint* src, NetPoint* dst, RouteCreationArgs
* 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[%l
u]", 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 (wifi_link_ != nullptr) {
// If src and dst are nodes, not access_point, we need to traverse the link twice
- // Otherwise (if src or dst is access_poit), we need to traverse the link only once
+ // Otherwise (if src or dst is access_poi
n
t), we need to traverse the link only once
if (src != access_point_) {
XBT_DEBUG("src %s is not our gateway", src->get_cname());
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());
}
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);
}
}
}
}
}
}
-s4u::Link* WifiZone::create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
- s4u::Link::SharingPolicy policy,
- const std::unordered_map<std::string, std::string>* props)
+
+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());
{
xbt_assert(wifi_link_ == nullptr,
"WIFI netzone %s contains more than one link. Please only declare one, the wifi link.", get_cname());
- xbt_assert(policy == s4u::Link::SharingPolicy::WIFI, "Link %s in WIFI zone %s must follow the WIFI sharing policy.",
- name.c_str(), get_cname());
-
auto s4u_link = NetZoneImpl::create_link(name, bandwidths, latency, policy, prop
s);
- wifi_link_
= s4u_link->get_impl(
);
- return
s4u_link
;
+
wifi_link_ = get_network_model()->create_wifi_link(name, bandwidth
s);
+ 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)
+{
+ return (new kernel::routing::WifiZone(name))->get_iface();
+}
+} // namespace s4u
+
} // namespace simgrid
} // namespace simgrid