-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2017. 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. */
#include "maxmin_private.hpp"
#include "network_cm02.hpp"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.h"
#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
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 {
char *optim = xbt_cfg_get_string("network/optim");
bool select = xbt_cfg_get_boolean("network/maxmin-selective-update");
- if (!strcmp(optim, "Full")) {
+ if (not strcmp(optim, "Full")) {
updateMechanism_ = UM_FULL;
selectiveUpdate_ = select;
- } else if (!strcmp(optim, "Lazy")) {
+ } else if (not strcmp(optim, "Lazy")) {
updateMechanism_ = UM_LAZY;
selectiveUpdate_ = true;
xbt_assert(select || (xbt_cfg_is_default_value("network/maxmin-selective-update")),
maxminSystem_->solve_fun = specificSolveFun;
}
-
-NetworkCm02Model::~NetworkCm02Model() {}
-
-LinkImpl* NetworkCm02Model::createLink(const char* name, double bandwidth, double latency,
+LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy)
{
return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxminSystem_);
// assume that flows that reached max_duration have remaining of 0
XBT_DEBUG("Action %p finished", action);
action->setRemains(0);
- action->finish();
- action->setState(Action::State::done);
+ action->finish(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()))
- lmm_update_variable_weight(maxminSystem_, action->getVariable(),
- action->weight_);
+ if (action->latency_ <= 0.0 && not action->isSuspended())
+ lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_);
}
if (TRACE_is_enabled()) {
int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable());
action->getLastUpdate(), now - action->getLastUpdate());
}
}
- if (!lmm_get_number_of_cnst_from_var (maxminSystem_, action->getVariable())) {
- /* There is actually no link used, hence an infinite bandwidth.
- * This happens often when using models like vivaldi.
- * In such case, just make sure that the action completes immediately.
+ if (not lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable())) {
+ /* There is actually no link used, hence an infinite bandwidth. This happens often when using models like
+ * vivaldi. In such case, just make sure that the action completes immediately.
*/
action->updateRemains(action->getRemains());
}
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
-
- if (action->getMaxDuration() != NO_MAX_DURATION)
+
+ if (action->getMaxDuration() > NO_MAX_DURATION)
action->updateMaxDuration(delta);
-
- if ((action->getRemains() <= 0) &&
- (lmm_get_variable_weight(action->getVariable()) > 0)) {
- action->finish();
- action->setState(Action::State::done);
- action->gapRemove();
- } else if (((action->getMaxDuration() != NO_MAX_DURATION)
- && (action->getMaxDuration() <= 0))) {
- action->finish();
- action->setState(Action::State::done);
- action->gapRemove();
+
+ if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
+ ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
+ action->finish(Action::State::done);
}
}
}
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
int failed = 0;
- double bandwidth_bound;
double latency = 0.0;
std::vector<LinkImpl*>* back_route = nullptr;
- int constraints_per_variable = 0;
-
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(!route->empty() || 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)
+ for (auto const& link : *route)
if (link->isOff())
failed = 1;
if (sg_network_crosstraffic == 1) {
back_route = new std::vector<LinkImpl*>();
dst->routeTo(src, back_route, nullptr);
- for (auto link: *back_route)
+ for (auto const& link : *back_route)
if (link->isOff())
failed = 1;
}
NetworkCm02Action *action = new NetworkCm02Action(this, size, failed);
- action->weight_ = action->latency_ = latency;
-
+ action->weight_ = latency;
+ action->latency_ = latency;
action->rate_ = rate;
if (updateMechanism_ == UM_LAZY) {
action->indexHeap_ = -1;
action->lastUpdate_ = surf_get_clock();
}
- bandwidth_bound = -1.0;
+ double bandwidth_bound = -1.0;
if (sg_weight_S_parameter > 0)
- for (auto link : *route)
+ for (auto const& link : *route)
action->weight_ += sg_weight_S_parameter / link->bandwidth();
- for (auto link : *route) {
+ for (auto const& link : *route) {
double bb = bandwidthFactor(size) * link->bandwidth();
bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb);
}
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_);
- }
-
- constraints_per_variable = route->size();
+ int constraints_per_variable = route->size();
if (back_route != nullptr)
constraints_per_variable += back_route->size();
lmm_update_variable_bound(maxminSystem_, action->getVariable(), (action->latCurrent_ > 0) ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) : action->rate_);
}
- for (auto link: *route)
+ for (auto const& link : *route)
lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), 1.0);
if (back_route != nullptr) { // sg_network_crosstraffic was activated
XBT_DEBUG("Fullduplex active adding backward flow using 5%%");
- for (auto link : *back_route)
+ for (auto const& link : *back_route)
lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), .05);
//Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency
return action;
}
-void NetworkCm02Model::gapAppend(double size, const LinkImpl* link, NetworkAction* action){
- // Nothing
-};
-
/************
* Resource *
************/
-NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency,
+NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy, lmm_system_t system)
: LinkImpl(model, name, lmm_constraint_new(system, this, sg_bandwidth_factor * bandwidth))
{
simgrid::s4u::Link::onCreation(this->piface_);
}
-void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value)
+void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
{
-
/* Find out which of my iterators was triggered, and react accordingly */
if (triggered == bandwidth_.event) {
setBandwidth(value);
double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale);
lmm_variable_t var;
- lmm_element_t elem = nullptr, nextelem = nullptr;
+ lmm_element_t elem = nullptr;
+ lmm_element_t nextelem = nullptr;
int numelem = 0;
while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) {
- NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var);
+ NetworkCm02Action *action = static_cast<NetworkCm02Action*>(lmm_variable_id(var));
action->weight_ += delta;
- if (!action->isSuspended())
+ if (not action->isSuspended())
lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_);
}
}
latency_.peak = value;
while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) {
- NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var);
+ NetworkCm02Action *action = static_cast<NetworkCm02Action*>(lmm_variable_id(var));
action->latCurrent_ += delta;
action->weight_ += delta;
if (action->rate_ < 0)
XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->latCurrent_);
}
}
- if (!action->isSuspended())
+ if (not action->isSuspended())
lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_);
}
}
-NetworkCm02Link::~NetworkCm02Link() {}
-
/**********
* Action *
**********/
-NetworkCm02Action::~NetworkCm02Action() {}
-
void NetworkCm02Action::updateRemainingLazy(double now)
{
- double delta = 0.0;
-
if (suspended_ != 0)
return;
- delta = now - lastUpdate_;
+ double delta = now - lastUpdate_;
if (remains_ > 0) {
XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, remains_, lastUpdate_);
XBT_DEBUG("Updating action(%p): remains is now %f", this, remains_);
}
- if (maxDuration_ != NO_MAX_DURATION)
+ if (maxDuration_ > NO_MAX_DURATION)
double_update(&maxDuration_, delta, sg_surf_precision);
- if (remains_ <= 0 &&
- (lmm_get_variable_weight(getVariable()) > 0)) {
- finish();
- setState(Action::State::done);
-
- heapRemove(getModel()->getActionHeap());
- } else if (((maxDuration_ != NO_MAX_DURATION)
- && (maxDuration_ <= 0))) {
- finish();
- setState(Action::State::done);
+ if ((remains_ <= 0 && (lmm_get_variable_weight(getVariable()) > 0)) ||
+ ((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) {
+ finish(Action::State::done);
heapRemove(getModel()->getActionHeap());
}
lastValue_ = lmm_variable_getvalue(getVariable());
}
-void NetworkCm02Link::gapAppend(double size, const LinkImpl* link, NetworkAction* action){
- // Nothing
-};
}
}
