double src_rate = wifi_link->get_host_rate(src);
double dst_rate = wifi_link->get_host_rate(dst);
-
- if (src_rate != -1 && dst_rate != -1) {
+ xbt_assert(
+ !(src_rate == -1 && dst_rate == -1),
+ "Some Stations are not associated to any Access Point. Make sure to call set_host_rate on all Stations.");
+ if (src_rate != -1)
get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / src_rate);
+ else
get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / dst_rate);
- } else {
- xbt_assert(
- !(src_rate == -1 && dst_rate == -1),
- "Some Stations are not associated to any Access Point. Make sure to call set_host_rate on all Stations.");
- if (src_rate != -1)
- get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / src_rate);
- else
- get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / dst_rate);
- }
+
} else {
get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0);
}
if (cfg_crosstraffic) {
XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth");
+ bool wifi_dst_assigned = false; // Used by wifi crosstraffic
for (auto const& link : back_route) {
- // Do not add crosstraffic on WIFI links
- if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI)
+ 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
s4u::Link::SharingPolicy policy, lmm::System* system)
: NetworkCm02Link(
model, name, 1 / sg_bandwidth_factor, 0, policy,
- system) // Since link use bw*sg_bandwidth_factor we should divise in order to as 1 as bound in the lmm system
+ system) // Since link uses bw*sg_bandwidth_factor we should divide by sg_bw_factor to ensure that we have 1 as
+ // a bound in the lmm system
{
for (auto bandwidth : bandwidths) {
bandwidths_.push_back({bandwidth, 1.0, nullptr});