XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-double sg_sender_gap = 0.0;
double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */
double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */
double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */
if (surf_network_model)
return;
- surf_network_model = new simgrid::surf::NetworkCm02Model();
- all_existing_models->push_back(surf_network_model);
-
xbt_cfg_setdefault_double("network/latency-factor", 1.0);
xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0);
xbt_cfg_setdefault_double("network/weight-S", 0.0);
+
+ surf_network_model = new simgrid::surf::NetworkCm02Model();
+ all_existing_models->push_back(surf_network_model);
}
/***************************************************************************/
if (surf_network_model)
return;
- surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
- all_existing_models->push_back(surf_network_model);
-
lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
- xbt_cfg_setdefault_double("network/latency-factor", 10.4);
- xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92);
- xbt_cfg_setdefault_double("network/weight-S", 8775);
+ xbt_cfg_setdefault_double("network/latency-factor", 13.01);
+ xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
+ xbt_cfg_setdefault_double("network/weight-S", 20537);
+
+ surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
+ all_existing_models->push_back(surf_network_model);
}
if (surf_network_model)
return;
- surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
- all_existing_models->push_back(surf_network_model);
-
lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi);
- xbt_cfg_setdefault_double("network/latency-factor", 10.4);
- xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92);
- xbt_cfg_setdefault_double("network/weight-S", 8775);
+ xbt_cfg_setdefault_double("network/latency-factor", 13.01);
+ xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
+ xbt_cfg_setdefault_double("network/weight-S", 20537);
+
+ surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
+ all_existing_models->push_back(surf_network_model);
}
void surf_network_model_init_Vegas()
if (surf_network_model)
return;
- surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
- all_existing_models->push_back(surf_network_model);
-
lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
- xbt_cfg_setdefault_double("network/latency-factor", 10.4);
- xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92);
- xbt_cfg_setdefault_double("network/weight-S", 8775);
+ xbt_cfg_setdefault_double("network/latency-factor", 13.01);
+ xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
+ xbt_cfg_setdefault_double("network/weight-S", 20537);
+
+ surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
+ all_existing_models->push_back(surf_network_model);
}
namespace simgrid {
action->finish();
action->setState(Action::State::done);
action->heapRemove(actionHeap_);
-
- action->gapRemove();
}
}
}
double_update(&(deltap), action->latency_, sg_surf_precision);
action->latency_ = 0.0;
}
- if (action->latency_ <= 0.0 && !(action->isSuspended()))
+ if (action->latency_ <= 0.0 && not action->isSuspended())
lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_);
}
if (TRACE_is_enabled()) {
((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
action->finish();
action->setState(Action::State::done);
- action->gapRemove();
}
}
}
std::vector<LinkImpl*>* back_route = nullptr;
std::vector<LinkImpl*>* route = new std::vector<LinkImpl*>();
- XBT_IN("(%s,%s,%g,%g)", src->cname(), dst->cname(), size, rate);
+ XBT_IN("(%s,%s,%g,%g)", src->getCname(), dst->getCname(), size, rate);
src->routeTo(dst, route, &latency);
xbt_assert(not route->empty() || latency,
"You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
- src->cname(), dst->cname());
+ src->getCname(), dst->getCname());
for (auto link: *route)
if (link->isOff())
action->latCurrent_ = action->latency_;
action->latency_ *= latencyFactor(size);
action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size);
- if (haveGap_) {
- xbt_assert(! route->empty(),
- "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!");
-
- gapAppend(size, route->at(0), action);
- XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->cname(), dst->cname(), action->senderGap_,
- action->latency_);
- }
int constraints_per_variable = route->size();
if (back_route != nullptr)
return action;
}
-void NetworkCm02Model::gapAppend(double size, const LinkImpl* link, NetworkAction* action){
- // Nothing
-};
-
/************
* Resource *
************/
lastValue_ = lmm_variable_getvalue(getVariable());
}
-void NetworkCm02Link::gapAppend(double size, const LinkImpl* link, NetworkAction* action){
- // Nothing
-};
}
}