X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/121e1dc6ee0462b6f6f1f1570b0f48c61ee4ff9a..c3119f83962a5b1ef7bc8f79011698c83ce21cda:/src/surf/network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 22f0325d9d..4e6c8aad4f 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -65,12 +65,12 @@ void surf_network_model_init_CM02()
   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);
 }
 
 /***************************************************************************/
@@ -88,14 +88,14 @@ void surf_network_model_init_Reno()
   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);
 }
 
 
@@ -104,14 +104,14 @@ void surf_network_model_init_Reno2()
   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()
@@ -119,14 +119,14 @@ 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 {
@@ -138,10 +138,10 @@ NetworkCm02Model::NetworkCm02Model()
   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")),
@@ -234,7 +234,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta)
           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()) {
@@ -249,18 +249,17 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta)
                                           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->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
       action->finish();
@@ -280,7 +279,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
   XBT_IN("(%s,%s,%g,%g)", src->cname(), dst->cname(), 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());
 
@@ -319,7 +318,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
   action->latency_ *= latencyFactor(size);
   action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size);
   if (haveGap_) {
-    xbt_assert(! route->empty(),
+    xbt_assert(not 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);
@@ -391,9 +390,8 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const char* name, doub
   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);
@@ -449,7 +447,7 @@ void NetworkCm02Link::setBandwidth(double value)
     while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) {
       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_);
     }
   }
@@ -482,19 +480,15 @@ void NetworkCm02Link::setLatency(double value)
         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)
 {
   if (suspended_ != 0)
@@ -509,11 +503,11 @@ void NetworkCm02Action::updateRemainingLazy(double now)
     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)) ||
-      (((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0)))){
+      ((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) {
     finish();
     setState(Action::State::done);
     heapRemove(getModel()->getActionHeap());