X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bb0a4c740aeef584818cc72196508d1b483100b..a5945452ef5b1114fd7c2fab0e865d776775c34d:/src/surf/network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 432189ddf6..bb735decf8 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -43,9 +43,9 @@ void surf_network_model_init_LegrandVelho(void)
   surf_network_model = new simgrid::surf::NetworkCm02Model();
   xbt_dynar_push(all_existing_models, &surf_network_model);
 
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor",      13.01);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",     0.97);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S",         20537);
+  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);
 }
 
 /***************************************************************************/
@@ -68,9 +68,9 @@ void surf_network_model_init_CM02(void)
   surf_network_model = new simgrid::surf::NetworkCm02Model();
   xbt_dynar_push(all_existing_models, &surf_network_model);
 
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor",   1.0);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 1.0);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S",         0.0);
+  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);
 }
 
 /***************************************************************************/
@@ -94,9 +94,9 @@ void surf_network_model_init_Reno(void)
   lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
   surf_network_model->f_networkSolve = lagrange_solve;
 
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor",     10.4);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",    0.92);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S",         8775);
+  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);
 }
 
 
@@ -111,9 +111,9 @@ void surf_network_model_init_Reno2(void)
   lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi);
   surf_network_model->f_networkSolve = lagrange_solve;
 
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor",    10.4);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",   0.92);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S",        8775);
+  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);
 }
 
 void surf_network_model_init_Vegas(void)
@@ -127,9 +127,9 @@ void surf_network_model_init_Vegas(void)
   lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
   surf_network_model->f_networkSolve = lagrange_solve;
 
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor",    10.4);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",   0.92);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S",        8775);
+  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);
 }
 
 namespace simgrid {
@@ -138,8 +138,8 @@ namespace surf {
 NetworkCm02Model::NetworkCm02Model()
   :NetworkModel()
 {
-  char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
-  int select = xbt_cfg_get_boolean(_sg_cfg_set, "network/maxmin_selective_update");
+  char *optim = xbt_cfg_get_string("network/optim");
+  int select = xbt_cfg_get_boolean("network/maxmin-selective-update");
 
   if (!strcmp(optim, "Full")) {
     updateMechanism_ = UM_FULL;
@@ -147,7 +147,7 @@ NetworkCm02Model::NetworkCm02Model()
   } else if (!strcmp(optim, "Lazy")) {
     updateMechanism_ = UM_LAZY;
     selectiveUpdate_ = 1;
-    xbt_assert((select == 1) || (xbt_cfg_is_default_value(_sg_cfg_set, "network/maxmin_selective_update")),
+    xbt_assert((select == 1) || (xbt_cfg_is_default_value("network/maxmin-selective-update")),
                "Disabling selective update while using the lazy update mechanism is dumb!");
   } else {
     xbt_die("Unsupported optimization (%s) for this model", optim);
@@ -166,9 +166,12 @@ NetworkCm02Model::NetworkCm02Model()
   }
 }
 
-Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, xbt_dict_t properties)
+NetworkCm02Model::~NetworkCm02Model() {}
+
+Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy,
+    xbt_dict_t properties)
 {
-  return new NetworkCm02Link(this, name, properties, maxminSystem_, sg_bandwidth_factor * bandwidth, bandwidth, latency, policy);
+  return new NetworkCm02Link(this, name, properties, bandwidth, latency, policy, maxminSystem_);
 }
 
 void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/)
@@ -379,21 +382,30 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d
   }
 
   delete route;
+  delete back_route;
   XBT_OUT();
 
   Link::onCommunicate(action, src, dst);
   return action;
 }
 
+bool NetworkCm02Model::next_occuring_event_isIdempotent()
+{
+  return true;
+}
+
+void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action)
+{
+  // Nothing
+};
+
 /************
  * Resource *
  ************/
 NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-    lmm_system_t system,
-    double constraint_value,
-    double bandwidth,  double latency,
-    e_surf_link_sharing_policy_t policy)
-: Link(model, name, props, lmm_constraint_new(system, this, constraint_value))
+    double bandwidth,  double latency, e_surf_link_sharing_policy_t policy,
+    lmm_system_t system)
+: Link(model, name, props, lmm_constraint_new(system, this, sg_bandwidth_factor * bandwidth))
 {
   m_bandwidth.scale = 1.0;
   m_bandwidth.peak = bandwidth;
@@ -502,9 +514,14 @@ void NetworkCm02Link::updateLatency(double value){
   }
 }
 
+NetworkCm02Link::~NetworkCm02Link() {}
+
 /**********
  * Action *
  **********/
+
+NetworkCm02Action::~NetworkCm02Action() {}
+
 void NetworkCm02Action::updateRemainingLazy(double now)
 {
   double delta = 0.0;
@@ -541,5 +558,10 @@ void NetworkCm02Action::updateRemainingLazy(double now)
   lastValue_ = lmm_variable_getvalue(getVariable());
 }
 
+void NetworkCm02Link::gapAppend(double size, const Link* link, NetworkAction* action)
+{
+  // Nothing
+};
+
 }
 }