X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02fbf5e463830a439464adae8626cd4f2dad27fd..acd052f4e734a5580577a6462a6e08c0ea3b5509:/src/surf/network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index e7338e9b5a..a8dbb4b114 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. 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. */
@@ -87,8 +87,8 @@ void surf_network_model_init_Reno()
   if (surf_network_model)
     return;
 
-  lmm_set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
-                                    simgrid::kernel::lmm::func_reno_fpi);
+  set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
+                                simgrid::kernel::lmm::func_reno_fpi);
 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
@@ -104,8 +104,8 @@ void surf_network_model_init_Reno2()
   if (surf_network_model)
     return;
 
-  lmm_set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp,
-                                    simgrid::kernel::lmm::func_reno2_fpi);
+  set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp,
+                                simgrid::kernel::lmm::func_reno2_fpi);
 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
@@ -120,8 +120,8 @@ void surf_network_model_init_Vegas()
   if (surf_network_model)
     return;
 
-  lmm_set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
-                                    simgrid::kernel::lmm::func_vegas_fpi);
+  set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
+                                simgrid::kernel::lmm::func_vegas_fpi);
 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
@@ -152,7 +152,7 @@ NetworkCm02Model::NetworkCm02Model()
     xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim.c_str());
   }
 
-  maxminSystem_ = new simgrid::kernel::lmm::s_lmm_system_t(selectiveUpdate_);
+  maxminSystem_ = new simgrid::kernel::lmm::System(selectiveUpdate_);
   loopback_     = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
 
   if (getUpdateMechanism() == UM_LAZY) {
@@ -160,8 +160,8 @@ NetworkCm02Model::NetworkCm02Model()
     maxminSystem_->keep_track = modifiedSet_;
   }
 }
-NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self))
-  : NetworkCm02Model()
+
+NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) : NetworkCm02Model()
 {
   maxminSystem_->solve_fun = specificSolveFun;
 }
@@ -331,13 +331,13 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
     maxminSystem_->expand(link->constraint(), action->getVariable(), 1.0);
 
   if (not back_route.empty()) { //  sg_network_crosstraffic was activated
-    XBT_DEBUG("Fullduplex active adding backward flow using 5%%");
+    XBT_DEBUG("Crosstraffic active adding backward flow using 5%%");
     for (auto const& link : back_route)
       maxminSystem_->expand(link->constraint(), action->getVariable(), .05);
 
-    //Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency
-    //(You would also have to change lmm_element_concurrency())
-    //lmm_variable_concurrency_share_set(action->getVariable(),2);
+    // 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())
+    // action->getVariable()->set_concurrency_share(2)
   }
   XBT_OUT();
 
@@ -379,9 +379,9 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
     if (value > 0)
       turnOn();
     else {
-      lmm_variable_t var = nullptr;
+      lmm_variable_t var       = nullptr;
       const_lmm_element_t elem = nullptr;
-      double now = surf_get_clock();
+      double now               = surf_get_clock();
 
       turnOff();
       while ((var = constraint()->get_variable(&elem))) {
@@ -416,7 +416,7 @@ void NetworkCm02Link::setBandwidth(double value)
     lmm_variable_t var;
     const_lmm_element_t elem     = nullptr;
     const_lmm_element_t nextelem = nullptr;
-    int numelem = 0;
+    int numelem                  = 0;
     while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
       NetworkCm02Action* action = static_cast<NetworkCm02Action*>(var->get_id());
       action->weight_ += delta;
@@ -432,7 +432,7 @@ void NetworkCm02Link::setLatency(double value)
   lmm_variable_t var           = nullptr;
   const_lmm_element_t elem     = nullptr;
   const_lmm_element_t nextelem = nullptr;
-  int numelem = 0;
+  int numelem                  = 0;
 
   latency_.peak = value;
 
@@ -464,7 +464,7 @@ void NetworkCm02Link::setLatency(double value)
 
 void NetworkCm02Action::updateRemainingLazy(double now)
 {
-  if (suspended_ != 0)
+  if (suspended_ != Action::SuspendStates::not_suspended)
     return;
 
   double delta        = now - getLastUpdate();