Change logic so that we don't use a value uninitialized

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6452 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/include/surf/surf_resource_lmm.h b/src/include/surf/surf_resource_lmm.h
index b8966be..d4740ee 100644 (file)
--- a/src/include/surf/surf_resource_lmm.h
+++ b/src/include/surf/surf_resource_lmm.h
@@ -12,14 +12,14 @@
 static XBT_INLINE
 surf_resource_lmm_t surf_resource_lmm_new(size_t childsize,
     /* for superclass */ surf_model_t model, char *name, xbt_dict_t props,
-    lmm_constraint_t constraint,
+    lmm_system_t system, double constraint_value,
     tmgr_history_t history,
     int state_init, tmgr_trace_t state_trace,
     double metric_init, tmgr_trace_t metric_trace) {
 
   surf_resource_lmm_t res = (surf_resource_lmm_t)surf_resource_new(childsize,model,name,props);
 
-  res->constraint = constraint;
+  res->constraint = lmm_constraint_new(system, res, constraint_value);
   res->state_current = state_init;
   if (state_trace)
     res->state_event = tmgr_history_add_trace(history, state_trace, 0.0, 0, res);

diff --git a/src/surf/network.c b/src/surf/network.c
index f6f1f32..bb035a8 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -40,7 +40,7 @@ static link_CM02_t link_new(char *name,
   link_CM02_t nw_link = (link_CM02_t)
     surf_resource_lmm_new(sizeof(s_link_CM02_t),
         surf_network_model,name,properties,
-        lmm_constraint_new(network_maxmin_system, nw_link, bandwidth_factor * bw_initial),
+        network_maxmin_system, bandwidth_factor * bw_initial,
         history,
         state_initial,state_trace,
         bw_initial,bw_trace);