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 3c420171b94ce684d4c24380fe87a7604b6dea8d..b6d40835d8cb85b8baaccbe30a5afe899fdc4120 100644
(file)
--- a/
src/kernel/routing/WifiZone.cpp
+++ b/
src/kernel/routing/WifiZone.cpp
@@
-1,20
+1,17
@@
-/* Copyright (c) 2009-202
1
. 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 "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 {
+namespace kernel::routing {
void WifiZone::do_seal()
{
void WifiZone::do_seal()
{
@@
-30,7
+27,7
@@
void WifiZone::do_seal()
void WifiZone::get_local_route(const NetPoint* src, const 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[%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
@@
-47,17
+44,16
@@
void WifiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route*
}
}
}
}
-
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);
{
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)
namespace s4u {
NetZone* create_wifi_zone(const std::string& name)