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
Consider Link latency as an optional parameter
[simgrid.git]
/
src
/
surf
/
network_wifi.cpp
diff --git
a/src/surf/network_wifi.cpp
b/src/surf/network_wifi.cpp
index 48c23e638d3b2adaea5d103d5f880701d1acd1f1..8fd7e08051849fd42dce66ba4c838f599573da7c 100644
(file)
--- a/
src/surf/network_wifi.cpp
+++ b/
src/surf/network_wifi.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2019-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2019-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. */
@@
-7,7
+7,7
@@
#include "simgrid/s4u/Host.hpp"
#include "src/surf/surf_interface.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/surf/surf_interface.hpp"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(
surf
_network);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(
res
_network);
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
@@
-23,24
+23,21
@@
NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& nam
{
for (auto bandwidth : bandwidths)
bandwidths_.push_back({bandwidth, 1.0, nullptr});
{
for (auto bandwidth : bandwidths)
bandwidths_.push_back({bandwidth, 1.0, nullptr});
-
- simgrid::s4u::Link::on_creation(*get_iface());
}
void NetworkWifiLink::set_host_rate(const s4u::Host* host, int rate_level)
{
auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level));
}
void NetworkWifiLink::set_host_rate(const s4u::Host* host, int rate_level)
{
auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level));
- if (
insert_done.second == false
)
+ if (
not insert_done.second
)
insert_done.first->second = rate_level;
// Each time we add a host, we refresh the decay model
refresh_decay_bandwidths();
}
insert_done.first->second = rate_level;
// Each time we add a host, we refresh the decay model
refresh_decay_bandwidths();
}
-double NetworkWifiLink::get_host_rate(const s4u::Host* host)
+double NetworkWifiLink::get_host_rate(const s4u::Host* host)
const
{
{
- std::map<xbt::string, int>::iterator host_rates_it;
- host_rates_it = host_rates_.find(host->get_name());
+ auto host_rates_it = host_rates_.find(host->get_name());
if (host_rates_it == host_rates_.end())
return -1;
if (host_rates_it == host_rates_.end())
return -1;
@@
-62,9
+59,9
@@
s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy() const
return s4u::Link::SharingPolicy::WIFI;
}
return s4u::Link::SharingPolicy::WIFI;
}
-int NetworkWifiLink::get_host_count()
+int NetworkWifiLink::get_host_count()
const
{
{
- return
host_rates_.size(
);
+ return
static_cast<int>(host_rates_.size()
);
}
void NetworkWifiLink::refresh_decay_bandwidths(){
}
void NetworkWifiLink::refresh_decay_bandwidths(){
@@
-72,7
+69,7
@@
void NetworkWifiLink::refresh_decay_bandwidths(){
int nSTA = get_host_count();
std::vector<Metric> new_bandwidths;
int nSTA = get_host_count();
std::vector<Metric> new_bandwidths;
- for (auto
bandwidth : bandwidths_)
{
+ for (auto
const& bandwidth : bandwidths_)
{
// Instantiate decay model relatively to the actual bandwidth
double max_bw=bandwidth.peak;
double min_bw=bandwidth.peak-(wifi_max_rate_-wifi_min_rate_);
// Instantiate decay model relatively to the actual bandwidth
double max_bw=bandwidth.peak;
double min_bw=bandwidth.peak-(wifi_max_rate_-wifi_min_rate_);