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
vector::back() is good enough + assert for scan_build.
[simgrid.git]
/
src
/
kernel
/
routing
/
WifiZone.cpp
diff --git
a/src/kernel/routing/WifiZone.cpp
b/src/kernel/routing/WifiZone.cpp
index
b375032
..
95f3c16
100644
(file)
--- a/
src/kernel/routing/WifiZone.cpp
+++ b/
src/kernel/routing/WifiZone.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
1
. 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. */
@@
-6,7
+6,6
@@
#include "simgrid/kernel/routing/WifiZone.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#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 <unordered_set>
#include "surf/surf.hpp"
#include <unordered_set>
@@
-16,12
+15,8
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_wifi, surf, "Routing part of surf");
namespace simgrid {
namespace kernel {
namespace routing {
namespace simgrid {
namespace kernel {
namespace routing {
-WifiZone::WifiZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
- : RoutedZone(father, name, netmodel)
-{
-}
-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) {
@@
-33,7
+28,7
@@
void WifiZone::seal()
}
}
}
}
-void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, Route
CreationArgs
* res, double* lat)
+void WifiZone::get_local_route(NetPoint* src, 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[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
@@
-43,31
+38,36
@@
void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs*
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_);
+ res->link_list
_
.push_back(wifi_link_);
if (lat)
*lat += wifi_link_->get_latency();
}
if (dst != access_point_) {
XBT_DEBUG("dst %s is not our gateway", dst->get_cname());
if (lat)
*lat += wifi_link_->get_latency();
}
if (dst != access_point_) {
XBT_DEBUG("dst %s is not our gateway", dst->get_cname());
- res->link_list.push_back(wifi_link_);
+ res->link_list
_
.push_back(wifi_link_);
if (lat)
*lat += wifi_link_->get_latency();
}
}
}
if (lat)
*lat += wifi_link_->get_latency();
}
}
}
-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)
+
+s4u::Link* WifiZone::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_->get_iface()
;
}
} // namespace routing
} // namespace kernel
}
} // namespace routing
} // namespace kernel
+
+namespace s4u {
+NetZone* create_wifi_zone(const std::string& name)
+{
+ return (new kernel::routing::WifiZone(name))->get_iface();
+}
+} // namespace s4u
+
} // namespace simgrid
} // namespace simgrid