cosmetics in comments and error messages

[simgrid.git] / src / surf / network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 7caca4b..f0fce7b 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -84,13 +84,11 @@ void surf_network_model_init_CM02(void)
     return;
 
   surf_network_model = new simgrid::surf::NetworkCm02Model();
+  xbt_dynar_push(all_existing_models, &surf_network_model);
   net_define_callbacks();
-  simgrid::surf::Model *model = surf_network_model;
-  xbt_dynar_push(all_existing_models, &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/bandwidth_factor", 1.0);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 0.0);
 }
 
@@ -110,16 +108,13 @@ void surf_network_model_init_Reno(void)
     return;
 
   surf_network_model = new simgrid::surf::NetworkCm02Model();
+  xbt_dynar_push(all_existing_models, &surf_network_model);
   net_define_callbacks();
-  simgrid::surf::Model *model = surf_network_model;
-  xbt_dynar_push(all_existing_models, &model);
-  lmm_set_default_protocol_function(func_reno_f, func_reno_fp,
-                                    func_reno_fpi);
+  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/bandwidth_factor", 0.92);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
@@ -130,18 +125,14 @@ void surf_network_model_init_Reno2(void)
     return;
 
   surf_network_model = new simgrid::surf::NetworkCm02Model();
+  xbt_dynar_push(all_existing_models, &surf_network_model);
   net_define_callbacks();
-  simgrid::surf::Model *model = surf_network_model;
-  xbt_dynar_push(all_existing_models, &model);
-  lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
-                                    func_reno2_fpi);
+  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(_sg_cfg_set, "network/bandwidth_factor", 0.92);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
 void surf_network_model_init_Vegas(void)
@@ -150,16 +141,13 @@ void surf_network_model_init_Vegas(void)
     return;
 
   surf_network_model = new simgrid::surf::NetworkCm02Model();
+  xbt_dynar_push(all_existing_models, &surf_network_model);
   net_define_callbacks();
-  simgrid::surf::Model *model = surf_network_model;
-  xbt_dynar_push(all_existing_models, &model);
-  lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,
-                                    func_vegas_fpi);
+  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/bandwidth_factor", 0.92);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
@@ -202,8 +190,6 @@ NetworkCm02Model::NetworkCm02Model()
        p_modifiedSet = new ActionLmmList();
        p_maxminSystem->keep_track = p_modifiedSet;
   }
-
-  m_haveGap = false;
 }
 
 Link* NetworkCm02Model::createLink(const char *name,
@@ -222,7 +208,7 @@ Link* NetworkCm02Model::createLink(const char *name,
 
   Link* link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial, history,
                                             state_initial, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy);
-  networkLinkCreatedCallbacks(link);
+  Link::onCreation(link);
   return link;
 }
 
@@ -347,7 +333,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta)
   return;
 }
 
-Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst,
                                                 double size, double rate)
 {
   unsigned int i;
@@ -360,13 +346,13 @@ Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst,
   xbt_dynar_t back_route = NULL;
   int constraints_per_variable = 0;
 
-  xbt_dynar_t route = xbt_dynar_new(sizeof(RoutingEdge*), NULL);
+  xbt_dynar_t route = xbt_dynar_new(sizeof(NetCard*), NULL);
 
   XBT_IN("(%s,%s,%g,%g)", src->getName(), dst->getName(), size, rate);
 
   routing_platf->getRouteAndLatency(src, dst, &route, &latency);
   xbt_assert(!xbt_dynar_is_empty(route) || latency,
-             "You're trying to send data from %s to %s but there is no connection at all between these two hosts.",
+             "You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
              src->getName(), dst->getName());
 
   xbt_dynar_foreach(route, i, _link) {