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
Wifi: Add crosstraffic on WIFI cells
[simgrid.git]
/
src
/
surf
/
network_cm02.cpp
diff --git
a/src/surf/network_cm02.cpp
b/src/surf/network_cm02.cpp
index 48fe8ed2421945e8b4d60985ef84c41c9806459b..6049efe98fd2316de0c6316399982546b7f1a0f1 100644
(file)
--- a/
src/surf/network_cm02.cpp
+++ b/
src/surf/network_cm02.cpp
@@
-104,7
+104,7
@@
void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/)
{
while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) {
-
NetworkCm02Action
* action = static_cast<NetworkCm02Action*>(get_action_heap().pop());
+
auto
* action = static_cast<NetworkCm02Action*>(get_action_heap().pop());
XBT_DEBUG("Something happened to action %p", action);
// if I am wearing a latency hat
@@
-184,7
+184,7
@@
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); });
}
-
NetworkCm02Action *action
= new NetworkCm02Action(this, size, failed);
+
auto* action
= new NetworkCm02Action(this, size, failed);
action->sharing_penalty_ = latency;
action->latency_ = latency;
action->rate_ = rate;
@@
-239,14
+239,11
@@
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
for (auto const& link : route) {
// Handle WIFI links
if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
- xbt_assert(!cfg_crosstraffic,
- "Cross-traffic is not yet supported when using WIFI. Please use --cfg=network/crosstraffic:0");
- NetworkWifiLink* wifi_link = (NetworkWifiLink*)link;
+ NetworkWifiLink* wifi_link = static_cast<NetworkWifiLink*>(link);
double src_rate = wifi_link->get_host_rate(src);
double dst_rate = wifi_link->get_host_rate(dst);
- // TODO: What do to when src and dst are on the same AP ? (for the moment we use src rate)
if (src_rate != -1 && dst_rate != -1) {
get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / src_rate);
} else {
@@
-265,8
+262,27
@@
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
if (cfg_crosstraffic) {
XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth");
- for (auto const& link : back_route)
- get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05);
+ bool wifi_dst_assigned = false; // Used by wifi crosstraffic
+ for (auto const& link : back_route) {
+ if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+ NetworkWifiLink* wifi_link = static_cast<NetworkWifiLink*>(link);
+ /**
+ * For wifi links we should add 0.05/rate.
+ * However since we are using the "back_route" we should encounter in
+ * the first place the dst wifi link.
+ */
+ if (!wifi_dst_assigned && (wifi_link->get_host_rate(dst) != -1)) {
+ get_maxmin_system()->expand(link->get_constraint(), action->get_variable(),
+ .05 / wifi_link->get_host_rate(dst));
+ wifi_dst_assigned = true;
+ } else {
+ get_maxmin_system()->expand(link->get_constraint(), action->get_variable(),
+ .05 / wifi_link->get_host_rate(src));
+ }
+ } else {
+ get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05);
+ }
+ }
// Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency
// (You would also have to change simgrid::kernel::lmm::Element::get_concurrency())
@@
-340,7
+356,7
@@
void NetworkCm02Link::set_bandwidth(double value)
const kernel::lmm::Element* nextelem = nullptr;
int numelem = 0;
while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
-
NetworkCm02Action
* action = static_cast<NetworkCm02Action*>(var->get_id());
+
auto
* action = static_cast<NetworkCm02Action*>(var->get_id());
action->sharing_penalty_ += delta;
if (not action->is_suspended())
get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
@@
-359,7
+375,7
@@
void NetworkCm02Link::set_latency(double value)
latency_.peak = value;
while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
-
NetworkCm02Action
* action = static_cast<NetworkCm02Action*>(var->get_id());
+
auto
* action = static_cast<NetworkCm02Action*>(var->get_id());
action->lat_current_ += delta;
action->sharing_penalty_ += delta;
if (action->rate_ < 0)
@@
-393,8
+409,7
@@
NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& nam
void NetworkWifiLink::set_host_rate(s4u::Host* host, int rate_level)
{
- std::pair<std::map<std::string, int>::iterator, bool> insert_done =
- host_rates_.insert(std::make_pair(host->get_name(), rate_level));
+ auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level));
if (insert_done.second == false)
insert_done.first->second = rate_level;
}
@@
-451,6
+466,6
@@
void NetworkCm02Action::update_remains_lazy(double now)
set_last_value(get_variable()->get_value());
}
-}
-}
+}
// namespace resource
+}
// namespace kernel
} // namespace simgrid