X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/281f8c29e177852dcb1591fc31e363e1176857c8..b458e6e72708bd5aa00d9b5b6f1c46fa942b2894:/src/surf/network.cpp

diff --git a/src/surf/network.cpp b/src/surf/network.cpp
index e8e886e3ee..a158d7fd72 100644
--- a/src/surf/network.cpp
+++ b/src/surf/network.cpp
@@ -248,11 +248,9 @@ void surf_network_model_init_Vegas(void)
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
-NetworkCm02Model::NetworkCm02Model() : NetworkCm02Model("network"){
-}
-
-NetworkCm02Model::NetworkCm02Model(string name) : Model(name){
-  ActionLmmPtr comm;
+void NetworkCm02Model::initialize()
+{
+  ActionLmmPtr comm = NULL;
 
   char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
   int select =
@@ -276,7 +274,8 @@ NetworkCm02Model::NetworkCm02Model(string name) : Model(name){
   if (!p_maxminSystem)
 	p_maxminSystem = lmm_system_new(m_selectiveUpdate);
 
-  routing_model_create(static_cast<ResourcePtr>(createResource("__loopback__",
+  const char* lb_name = "__loopback__";
+  routing_model_create(static_cast<ResourcePtr>(createResource(lb_name,
 	                                           498000000, NULL, 0.000015, NULL,
 	                                           SURF_RESOURCE_ON, NULL,
 	                                           SURF_LINK_FATPIPE, NULL)));
@@ -287,6 +286,8 @@ NetworkCm02Model::NetworkCm02Model(string name) : Model(name){
 	p_modifiedSet = xbt_swag_new(xbt_swag_offset(*comm, p_actionListHookup));
 	p_maxminSystem->keep_track = p_modifiedSet;
   }
+
+  m_haveGap = false;
 }
 
 NetworkCm02LinkLmmPtr NetworkCm02Model::createResource(const char *name,
@@ -314,7 +315,7 @@ NetworkCm02LinkLmmPtr NetworkCm02Model::createResource(const char *name,
   return nw_link;
 }
 
-void NetworkCm02Model::updateActionsStateLazy(double now, double delta)
+void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/)
 {
   NetworkCm02ActionLmmPtr action;
   while ((xbt_heap_size(p_actionHeap) > 0)
@@ -324,7 +325,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double delta)
 #ifdef HAVE_TRACING
     if (TRACE_is_enabled()) {
       int n = lmm_get_number_of_cnst_from_var(p_maxminSystem, action->p_variable);
-      unsigned int i;
+      int i;
       for (i = 0; i < n; i++){
         lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem,
                                                             action->p_variable,
@@ -500,15 +501,15 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
   return action;
 }
 
-double NetworkCm02Model::latencyFactor(double size) {
+double NetworkCm02Model::latencyFactor(double /*size*/) {
   return sg_latency_factor;
 }
 
-double NetworkCm02Model::bandwidthFactor(double size) {
+double NetworkCm02Model::bandwidthFactor(double /*size*/) {
   return sg_bandwidth_factor;
 }
 
-double NetworkCm02Model::bandwidthConstraint(double rate, double bound, double size) {
+double NetworkCm02Model::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) {
   return rate;
 }