From: navarro <navarro@caraja.(none)>
Date: Wed, 9 May 2012 12:51:07 +0000 (+0200)
Subject: Prepare network.c and cpu_cas01.c for net and cpu merge.
X-Git-Tag: v3_7~25
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/867ae3ddfab33175d0bce6d797b2f537396693aa?hp=0c14e681436e252f680310c7696b3ba17a349706

Prepare network.c and cpu_cas01.c for net and cpu merge.
---

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 2d4e5b4193..04530c6fdd 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -22,6 +22,12 @@
 SG_BEGIN_DECL()
 /* Actions and models are highly connected structures... */
 
+typedef enum {
+  UM_FULL,
+  UM_LAZY,
+  UM_UNDEFINED
+} e_UM_t;
+
 typedef enum {
   SURF_NETWORK_ELEMENT_NULL = 0,        /* NULL */
   SURF_NETWORK_ELEMENT_HOST,    /* host type */
@@ -317,6 +323,13 @@ typedef struct surf_model {
 
   surf_model_private_t model_private;
 
+  // for action
+  lmm_system_t maxmin_system;
+  e_UM_t update_mechanism;
+  xbt_swag_t modified_set;
+  xbt_heap_t action_heap;
+  int selective_update;
+
   union extension {
     s_surf_model_extension_cpu_t cpu;
     s_surf_model_extension_network_t network;
diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c
index 05aa5b4b92..56aebc155d 100644
--- a/src/surf/cpu_cas01.c
+++ b/src/surf/cpu_cas01.c
@@ -9,12 +9,6 @@
 #include "maxmin_private.h"
 
 surf_model_t surf_cpu_model = NULL;
-lmm_system_t cpu_maxmin_system = NULL;
-e_UM_t cpu_update_mechanism = UM_UNDEFINED;
-static int cpu_selective_update = 0;
-
-static xbt_swag_t cpu_modified_set= NULL;
-static xbt_heap_t cpu_action_heap = NULL;
 
 #undef GENERIC_LMM_ACTION
 #undef GENERIC_ACTION
@@ -80,7 +74,7 @@ static void *cpu_create_resource(const char *name, double power_peak,
         tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
 
   cpu->constraint =
-      lmm_constraint_new(cpu_maxmin_system, cpu,
+      lmm_constraint_new(surf_cpu_model->maxmin_system, cpu,
                          cpu->core * cpu->power_scale * cpu->power_peak);
 
   xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
@@ -141,7 +135,7 @@ static void cpu_define_callbacks()
 
 static int cpu_resource_used(void *resource)
 {
-  return lmm_constraint_used(cpu_maxmin_system,
+  return lmm_constraint_used(surf_cpu_model->maxmin_system,
                              ((cpu_Cas01_t) resource)->constraint);
 }
 
@@ -151,12 +145,12 @@ static int cpu_action_unref(surf_action_t action)
   if (!action->refcount) {
     xbt_swag_remove(action, action->state_set);
     if (((surf_action_lmm_t) action)->variable)
-      lmm_variable_free(cpu_maxmin_system,
+      lmm_variable_free(surf_cpu_model->maxmin_system,
                         ((surf_action_lmm_t) action)->variable);
-    if (cpu_update_mechanism == UM_LAZY) {
+    if (surf_cpu_model->update_mechanism == UM_LAZY) {
       /* remove from heap */
-      surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
-      xbt_swag_remove(action, cpu_modified_set);
+      surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
+      xbt_swag_remove(action, surf_cpu_model->modified_set);
     }
 #ifdef HAVE_TRACING
     xbt_free(action->category);
@@ -170,9 +164,9 @@ static int cpu_action_unref(surf_action_t action)
 static void cpu_action_cancel(surf_action_t action)
 {
   surf_action_state_set(action, SURF_ACTION_FAILED);
-  if (cpu_update_mechanism == UM_LAZY) {
-    xbt_swag_remove(action, cpu_modified_set);
-    surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
+  if (surf_cpu_model->update_mechanism == UM_LAZY) {
+    xbt_swag_remove(action, surf_cpu_model->modified_set);
+    surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
   }
   return;
 }
@@ -182,7 +176,7 @@ static void cpu_action_state_set(surf_action_t action,
 {
 /*   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
 /*     if(((surf_action_lmm_t)action)->variable) { */
-/*       lmm_variable_disable(cpu_maxmin_system, ((surf_action_lmm_t)action)->variable); */
+/*       lmm_variable_disable(surf_cpu_model->maxmin_system, ((surf_action_lmm_t)action)->variable); */
 /*       ((surf_action_lmm_t)action)->variable = NULL; */
 /*     } */
 
@@ -213,7 +207,7 @@ static void cpu_update_action_remaining_lazy(surf_action_cpu_Cas01_t action, dou
     if (TRACE_is_enabled()) {
       cpu_Cas01_t cpu =
           lmm_constraint_id(lmm_get_cnst_from_var
-              (cpu_maxmin_system,
+              (surf_cpu_model->maxmin_system,
                   GENERIC_LMM_ACTION(action).variable, 0));
       TRACE_surf_host_set_utilization(cpu->generic_resource.name,
           ((surf_action_t)action)->category,
@@ -237,15 +231,15 @@ static double cpu_share_resources_lazy(double now)
 
   XBT_DEBUG
       ("Before share resources, the size of modified actions set is %d",
-       xbt_swag_size(cpu_modified_set));
+       xbt_swag_size(surf_cpu_model->modified_set));
 
-  lmm_solve(cpu_maxmin_system);
+  lmm_solve(surf_cpu_model->maxmin_system);
 
   XBT_DEBUG
       ("After share resources, The size of modified actions set is %d",
-       xbt_swag_size(cpu_modified_set));
+       xbt_swag_size(surf_cpu_model->modified_set));
 
-  while((action = xbt_swag_extract(cpu_modified_set))) {
+  while((action = xbt_swag_extract(surf_cpu_model->modified_set))) {
     int max_dur_flag = 0;
 
     if (GENERIC_ACTION(action).state_set !=
@@ -284,16 +278,16 @@ static double cpu_share_resources_lazy(double now)
         GENERIC_ACTION(action).max_duration);
 
     if (min != -1) {
-      surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
-      surf_action_lmm_heap_insert(cpu_action_heap,(surf_action_lmm_t)action, min, max_dur_flag ? MAX_DURATION : NORMAL);
+      surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
+      surf_action_lmm_heap_insert(surf_cpu_model->action_heap,(surf_action_lmm_t)action, min, max_dur_flag ? MAX_DURATION : NORMAL);
       XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min,
                 now);
     } else DIE_IMPOSSIBLE;
   }
 
   //hereafter must have already the min value for this resource model
-  if (xbt_heap_size(cpu_action_heap) > 0)
-    min = xbt_heap_maxkey(cpu_action_heap) - now;
+  if (xbt_heap_size(surf_cpu_model->action_heap) > 0)
+    min = xbt_heap_maxkey(surf_cpu_model->action_heap) - now;
   else
     min = -1;
 
@@ -310,22 +304,22 @@ static double cpu_share_resources_full(double now)
                                         xbt_swag_offset(action,
                                                         generic_lmm_action.
                                                         variable),
-                                        cpu_maxmin_system, lmm_solve);
+                                        surf_cpu_model->maxmin_system, lmm_solve);
 }
 
 static void cpu_update_actions_state_lazy(double now, double delta)
 {
   surf_action_cpu_Cas01_t action;
-  while ((xbt_heap_size(cpu_action_heap) > 0)
-         && (double_equals(xbt_heap_maxkey(cpu_action_heap), now))) {
-    action = xbt_heap_pop(cpu_action_heap);
+  while ((xbt_heap_size(surf_cpu_model->action_heap) > 0)
+         && (double_equals(xbt_heap_maxkey(surf_cpu_model->action_heap), now))) {
+    action = xbt_heap_pop(surf_cpu_model->action_heap);
     XBT_DEBUG("Action %p: finish", action);
     GENERIC_ACTION(action).finish = surf_get_clock();
 #ifdef HAVE_TRACING
     if (TRACE_is_enabled()) {
       cpu_Cas01_t cpu =
           lmm_constraint_id(lmm_get_cnst_from_var
-                            (cpu_maxmin_system,
+                            (surf_cpu_model->maxmin_system,
                              GENERIC_LMM_ACTION(action).variable, 0));
       TRACE_surf_host_set_utilization(cpu->generic_resource.name,
                                       ((surf_action_t)action)->category,
@@ -337,7 +331,7 @@ static void cpu_update_actions_state_lazy(double now, double delta)
     /* set the remains to 0 due to precision problems when updating the remaining amount */
     GENERIC_ACTION(action).remains = 0;
     cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
-    surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); //FIXME: strange call since action was already popped
+    surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action); //FIXME: strange call since action was already popped
   }
 #ifdef HAVE_TRACING
   if (TRACE_is_enabled()) {
@@ -372,7 +366,7 @@ static void cpu_update_actions_state_full(double now, double delta)
     if (TRACE_is_enabled()) {
       cpu_Cas01_t x =
           lmm_constraint_id(lmm_get_cnst_from_var
-                            (cpu_maxmin_system,
+                            (surf_cpu_model->maxmin_system,
                              GENERIC_LMM_ACTION(action).variable, 0));
 
       TRACE_surf_host_set_utilization(x->generic_resource.name,
@@ -415,7 +409,7 @@ static void cpu_update_resource_state(void *id,
 
   if (event_type == cpu->power_event) {
     cpu->power_scale = value;
-    lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
+    lmm_update_constraint_bound(surf_cpu_model->maxmin_system, cpu->constraint,
                                 cpu->core * cpu->power_scale *
                                 cpu->power_peak);
 #ifdef HAVE_TRACING
@@ -424,9 +418,9 @@ static void cpu_update_resource_state(void *id,
                               cpu->power_peak);
 #endif
     while ((var = lmm_get_var_from_cnst
-            (cpu_maxmin_system, cpu->constraint, &elem))) {
+            (surf_cpu_model->maxmin_system, cpu->constraint, &elem))) {
       surf_action_cpu_Cas01_t action = lmm_variable_id(var);
-      lmm_update_variable_bound(cpu_maxmin_system,
+      lmm_update_variable_bound(surf_cpu_model->maxmin_system,
                                 GENERIC_LMM_ACTION(action).variable,
                                 cpu->power_scale * cpu->power_peak);
     }
@@ -440,7 +434,7 @@ static void cpu_update_resource_state(void *id,
 
       cpu->state_current = SURF_RESOURCE_OFF;
 
-      while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) {
+      while ((var = lmm_get_var_from_cnst(surf_cpu_model->maxmin_system, cnst, &elem))) {
         surf_action_t action = lmm_variable_id(var);
 
         if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
@@ -477,15 +471,15 @@ static surf_action_t cpu_execute(void *cpu, double size)
                                                    calloc but it seems to help valgrind... */
 
   GENERIC_LMM_ACTION(action).variable =
-      lmm_variable_new(cpu_maxmin_system, action,
+      lmm_variable_new(surf_cpu_model->maxmin_system, action,
                        GENERIC_ACTION(action).priority,
                        CPU->power_scale * CPU->power_peak, 1);
-  if (cpu_update_mechanism == UM_LAZY) {
+  if (surf_cpu_model->update_mechanism == UM_LAZY) {
     GENERIC_LMM_ACTION(action).index_heap = -1;
     GENERIC_LMM_ACTION(action).last_update = surf_get_clock();
     GENERIC_LMM_ACTION(action).last_value = 0.0;
   }
-  lmm_expand(cpu_maxmin_system, CPU->constraint,
+  lmm_expand(surf_cpu_model->maxmin_system, CPU->constraint,
              GENERIC_LMM_ACTION(action).variable, 1.0);
   XBT_OUT();
   return (surf_action_t) action;
@@ -512,14 +506,14 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration)
     xbt_swag_insert(action, ((surf_action_t) action)->state_set);
   }
 
-  lmm_update_variable_weight(cpu_maxmin_system,
+  lmm_update_variable_weight(surf_cpu_model->maxmin_system,
                              GENERIC_LMM_ACTION(action).variable, 0.0);
-  if (cpu_update_mechanism == UM_LAZY) {     // remove action from the heap
-    surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
+  if (surf_cpu_model->update_mechanism == UM_LAZY) {     // remove action from the heap
+    surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
     // this is necessary for a variable with weight 0 since such
     // variables are ignored in lmm and we need to set its max_duration
     // correctly at the next call to share_resources
-    xbt_swag_insert_at_head(action,cpu_modified_set);
+    xbt_swag_insert_at_head(action,surf_cpu_model->modified_set);
   }
 
   XBT_OUT();
@@ -530,12 +524,12 @@ static void cpu_action_suspend(surf_action_t action)
 {
   XBT_IN("(%p)", action);
   if (((surf_action_lmm_t) action)->suspended != 2) {
-    lmm_update_variable_weight(cpu_maxmin_system,
+    lmm_update_variable_weight(surf_cpu_model->maxmin_system,
                                ((surf_action_lmm_t) action)->variable,
                                0.0);
     ((surf_action_lmm_t) action)->suspended = 1;
-    if (cpu_update_mechanism == UM_LAZY)
-      surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
+    if (surf_cpu_model->update_mechanism == UM_LAZY)
+      surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
   }
   XBT_OUT();
 }
@@ -545,12 +539,12 @@ static void cpu_action_resume(surf_action_t action)
 
   XBT_IN("(%p)", action);
   if (((surf_action_lmm_t) action)->suspended != 2) {
-    lmm_update_variable_weight(cpu_maxmin_system,
+    lmm_update_variable_weight(surf_cpu_model->maxmin_system,
                                ((surf_action_lmm_t) action)->variable,
                                action->priority);
     ((surf_action_lmm_t) action)->suspended = 0;
-    if (cpu_update_mechanism == UM_LAZY)
-      surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
+    if (surf_cpu_model->update_mechanism == UM_LAZY)
+      surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
   }
   XBT_OUT();
 }
@@ -566,8 +560,8 @@ static void cpu_action_set_max_duration(surf_action_t action,
   XBT_IN("(%p,%g)", action, duration);
 
   action->max_duration = duration;
-  if (cpu_update_mechanism == UM_LAZY)
-    surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
+  if (surf_cpu_model->update_mechanism == UM_LAZY)
+    surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
   XBT_OUT();
 }
 
@@ -575,12 +569,12 @@ static void cpu_action_set_priority(surf_action_t action, double priority)
 {
   XBT_IN("(%p,%g)", action, priority);
   action->priority = priority;
-  lmm_update_variable_weight(cpu_maxmin_system,
+  lmm_update_variable_weight(surf_cpu_model->maxmin_system,
                              ((surf_action_lmm_t) action)->variable,
                              priority);
 
-  if (cpu_update_mechanism == UM_LAZY)
-    surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
+  if (surf_cpu_model->update_mechanism == UM_LAZY)
+    surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
   XBT_OUT();
 }
 
@@ -598,7 +592,7 @@ static double cpu_action_get_remains(surf_action_t action)
 {
   XBT_IN("(%p)", action);
   /* update remains before return it */
-  if (cpu_update_mechanism == UM_LAZY)
+  if (surf_cpu_model->update_mechanism == UM_LAZY)
     cpu_update_action_remaining_lazy((surf_action_cpu_Cas01_t)action,
         surf_get_clock());
   XBT_OUT();
@@ -623,17 +617,18 @@ static double cpu_get_available_speed(void *cpu)
 
 static void cpu_finalize(void)
 {
-  lmm_system_free(cpu_maxmin_system);
-  cpu_maxmin_system = NULL;
+  lmm_system_free(surf_cpu_model->maxmin_system);
+  surf_cpu_model->maxmin_system = NULL;
+
+  if (surf_cpu_model->action_heap)
+    xbt_heap_free(surf_cpu_model->action_heap);
+  xbt_swag_free(surf_cpu_model->modified_set);
 
   surf_model_exit(surf_cpu_model);
   surf_cpu_model = NULL;
 
   xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked);
   cpu_running_action_set_that_does_not_need_being_checked = NULL;
-  if (cpu_action_heap)
-    xbt_heap_free(cpu_action_heap);
-  xbt_swag_free(cpu_modified_set);
 }
 
 static void surf_cpu_model_init_internal()
@@ -641,8 +636,27 @@ static void surf_cpu_model_init_internal()
   s_surf_action_t action;
   s_surf_action_cpu_Cas01_t comp;
 
+  char *optim = xbt_cfg_get_string(_surf_cfg_set, "cpu/optim");
+  int select =
+      xbt_cfg_get_int(_surf_cfg_set, "cpu/maxmin_selective_update");
+
   surf_cpu_model = surf_model_init();
 
+  if (!strcmp(optim, "Full")) {
+    surf_cpu_model->update_mechanism = UM_FULL;
+    surf_cpu_model->selective_update = select;
+  } else if (!strcmp(optim, "Lazy")) {
+    surf_cpu_model->update_mechanism = UM_LAZY;
+    surf_cpu_model->selective_update = 1;
+    xbt_assert((select == 1)
+               ||
+               (xbt_cfg_is_default_value
+                (_surf_cfg_set, "cpu/maxmin_selective_update")),
+               "Disabling selective update while using the lazy update mechanism is dumb!");
+  } else {
+    xbt_die("Unsupported optimization (%s) for this model", optim);
+  }
+
   cpu_running_action_set_that_does_not_need_being_checked =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
@@ -654,18 +668,18 @@ static void surf_cpu_model_init_internal()
 
   surf_cpu_model->model_private->resource_used = cpu_resource_used;
 
-  if (cpu_update_mechanism == UM_LAZY) {
+  if (surf_cpu_model->update_mechanism == UM_LAZY) {
     surf_cpu_model->model_private->share_resources =
         cpu_share_resources_lazy;
     surf_cpu_model->model_private->update_actions_state =
         cpu_update_actions_state_lazy;
-  } else if (cpu_update_mechanism == UM_FULL) {
+  } else if (surf_cpu_model->update_mechanism == UM_FULL) {
     surf_cpu_model->model_private->share_resources =
         cpu_share_resources_full;
     surf_cpu_model->model_private->update_actions_state =
         cpu_update_actions_state_full;
   } else
-    xbt_die("Invalid update mechanism!");
+    xbt_die("Invalid cpu update mechanism!");
 
   surf_cpu_model->model_private->update_resource_state =
       cpu_update_resource_state;
@@ -691,16 +705,16 @@ static void surf_cpu_model_init_internal()
   surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
   surf_cpu_model->extension.cpu.add_traces = cpu_add_traces_cpu;
 
-  if (!cpu_maxmin_system) {
-    cpu_maxmin_system = lmm_system_new(cpu_selective_update);
+  if (!surf_cpu_model->maxmin_system) {
+    surf_cpu_model->maxmin_system = lmm_system_new(surf_cpu_model->selective_update);
   }
-  if (cpu_update_mechanism == UM_LAZY) {
-    cpu_action_heap = xbt_heap_new(8, NULL);
-    xbt_heap_set_update_callback(cpu_action_heap,
+  if (surf_cpu_model->update_mechanism == UM_LAZY) {
+    surf_cpu_model->action_heap = xbt_heap_new(8, NULL);
+    xbt_heap_set_update_callback(surf_cpu_model->action_heap,
         surf_action_lmm_update_index_heap);
-    cpu_modified_set =
+    surf_cpu_model->modified_set =
         xbt_swag_new(xbt_swag_offset(comp, generic_lmm_action.action_list_hookup));
-    cpu_maxmin_system->keep_track = cpu_modified_set;
+    surf_cpu_model->maxmin_system->keep_track = surf_cpu_model->modified_set;
   }
 }
 
@@ -723,29 +737,15 @@ static void surf_cpu_model_init_internal()
 void surf_cpu_model_init_Cas01()
 {
   char *optim = xbt_cfg_get_string(_surf_cfg_set, "cpu/optim");
-  int select =
-      xbt_cfg_get_int(_surf_cfg_set, "cpu/maxmin_selective_update");
 
-  if (!strcmp(optim, "Full")) {
-    cpu_update_mechanism = UM_FULL;
-    cpu_selective_update = select;
-  } else if (!strcmp(optim, "Lazy")) {
-    cpu_update_mechanism = UM_LAZY;
-    cpu_selective_update = 1;
-    xbt_assert((select == 1)
-               ||
-               (xbt_cfg_is_default_value
-                (_surf_cfg_set, "cpu/maxmin_selective_update")),
-               "Disabling selective update while using the lazy update mechanism is dumb!");
-  } else if (!strcmp(optim, "TI")) {
+  if (surf_cpu_model)
+    return;
+
+  if (!strcmp(optim, "TI")) {
     surf_cpu_model_init_ti();
     return;
-  } else {
-    xbt_die("Unsupported optimization (%s) for this model", optim);
   }
 
-  if (surf_cpu_model)
-    return;
   surf_cpu_model_init_internal();
   cpu_define_callbacks();
   xbt_dynar_push(model_list, &surf_cpu_model);
diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c
index b168b1070d..b1c3d1d04e 100644
--- a/src/surf/cpu_ti.c
+++ b/src/surf/cpu_ti.c
@@ -804,8 +804,7 @@ static void surf_cpu_ti_model_init_internal(void)
 
 void surf_cpu_model_init_ti()
 {
-  if (surf_cpu_model)
-    return;
+  xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
   surf_cpu_ti_model_init_internal();
   cpu_ti_define_callbacks();
   xbt_dynar_push(model_list, &surf_cpu_model);
diff --git a/src/surf/network.c b/src/surf/network.c
index 7bb180362a..603474748f 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -33,7 +33,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
                                 "Logging specific to the SURF network module");
 
 surf_model_t surf_network_model = NULL;
-static lmm_system_t network_maxmin_system = NULL;
 static void (*network_solve) (lmm_system_t) = NULL;
 
 xbt_dynar_t smpi_bw_factor = NULL;
@@ -56,16 +55,9 @@ int sg_network_crosstraffic = 0;
 
 xbt_dict_t gap_lookup = NULL;
 
-e_UM_t network_update_mechanism = UM_UNDEFINED;
-static int net_selective_update = 0;
-
 static int net_action_is_suspended(surf_action_t action);
 static void net_update_action_remaining_lazy(surf_action_network_CM02_t action, double now);
 
-static xbt_swag_t net_modified_set = NULL;
-static xbt_heap_t net_action_heap = NULL;
-
-
 /******************************************************************************/
 /*                           Factors callbacks                                */
 /******************************************************************************/
@@ -181,7 +173,7 @@ static void *net_create_resource(const char *name,
   link_CM02_t nw_link = (link_CM02_t)
       surf_resource_lmm_new(sizeof(s_link_CM02_t),
                             surf_network_model, name, properties,
-                            network_maxmin_system,
+                            surf_network_model->maxmin_system,
                             sg_bandwidth_factor * bw_initial,
                             history,
                             state_initial, state_trace,
@@ -300,7 +292,7 @@ static void net_define_callbacks(void)
 
 static int net_resource_used(void *resource_id)
 {
-  return lmm_constraint_used(network_maxmin_system, ((surf_resource_lmm_t)
+  return lmm_constraint_used(surf_network_model->maxmin_system, ((surf_resource_lmm_t)
                                                      resource_id)->
                              constraint);
 }
@@ -311,12 +303,12 @@ static int net_action_unref(surf_action_t action)
   if (!action->refcount) {
     xbt_swag_remove(action, action->state_set);
     if (((surf_action_lmm_t)action)->variable) {
-      lmm_variable_free(network_maxmin_system,
+      lmm_variable_free(surf_network_model->maxmin_system,
                         ((surf_action_lmm_t) action)->variable);
     }
-    if (network_update_mechanism == UM_LAZY) {  // remove action from the heap
-      surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t) action);
-      xbt_swag_remove(action, net_modified_set);
+    if (surf_network_model->update_mechanism == UM_LAZY) {  // remove action from the heap
+      surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t) action);
+      xbt_swag_remove(action, surf_network_model->modified_set);
     }
 #ifdef HAVE_TRACING
     if (action->category) xbt_free (action->category);
@@ -333,9 +325,9 @@ static void net_action_cancel(surf_action_t action)
 {
   XBT_DEBUG("cancel action %p", action);
   surf_network_model->action_state_set(action, SURF_ACTION_FAILED);
-  if (network_update_mechanism == UM_LAZY) {    // remove action from the heap
-    xbt_swag_remove(action, net_modified_set);
-    surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t) action);
+  if (surf_network_model->update_mechanism == UM_LAZY) {    // remove action from the heap
+    xbt_swag_remove(action, surf_network_model->modified_set);
+    surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t) action);
   }
 }
 
@@ -355,7 +347,7 @@ double net_action_get_remains(surf_action_t action)
 {
   XBT_IN("(%p)", action);
   /* update remains before return it */
-  if (network_update_mechanism == UM_LAZY)      /* update remains before return it */
+  if (surf_network_model->update_mechanism == UM_LAZY)      /* update remains before return it */
     net_update_action_remaining_lazy((surf_action_network_CM02_t)action,
         surf_get_clock());
   XBT_OUT();
@@ -383,13 +375,13 @@ static void net_update_action_remaining_lazy(surf_action_network_CM02_t action,
     surf_network_model->action_state_set((surf_action_t) action,
         SURF_ACTION_DONE);
 
-    surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
+    surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
   } else if (((((surf_action_t)action)->max_duration != NO_MAX_DURATION)
       && (((surf_action_t)action)->max_duration <= 0))) {
     ((surf_action_t)action)->finish = surf_get_clock();
     surf_network_model->action_state_set((surf_action_t) action,
         SURF_ACTION_DONE);
-    surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
+    surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
   }
 
   GENERIC_LMM_ACTION(action).last_update = now;
@@ -407,7 +399,7 @@ static double net_share_resources_full(double now)
   min = generic_maxmin_share_resources(running_actions,
                                        xbt_swag_offset(s_action,
                                                        variable),
-                                       network_maxmin_system,
+                                                       surf_network_model->maxmin_system,
                                        network_solve);
 
 #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable)  )))
@@ -438,15 +430,15 @@ static double net_share_resources_lazy(double now)
 
   XBT_DEBUG
       ("Before share resources, the size of modified actions set is %d",
-       xbt_swag_size(net_modified_set));
+       xbt_swag_size(surf_network_model->modified_set));
 
-  lmm_solve(network_maxmin_system);
+  lmm_solve(surf_network_model->maxmin_system);
 
   XBT_DEBUG
       ("After share resources, The size of modified actions set is %d",
-       xbt_swag_size(net_modified_set));
+       xbt_swag_size(surf_network_model->modified_set));
 
-  while((action = xbt_swag_extract(net_modified_set))) {
+  while((action = xbt_swag_extract(surf_network_model->modified_set))) {
     int max_dur_flag = 0;
 
     if (GENERIC_ACTION(action).state_set !=
@@ -485,16 +477,16 @@ static double net_share_resources_lazy(double now)
               GENERIC_ACTION(action).max_duration);
 
     if (min != -1) {
-      surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
-      surf_action_lmm_heap_insert(net_action_heap,(surf_action_lmm_t)action, min, max_dur_flag ? MAX_DURATION : NORMAL);
+      surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
+      surf_action_lmm_heap_insert(surf_network_model->action_heap,(surf_action_lmm_t)action, min, max_dur_flag ? MAX_DURATION : NORMAL);
       XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min,
                 now);
     } else DIE_IMPOSSIBLE;
   }
 
   //hereafter must have already the min value for this resource model
-  if (xbt_heap_size(net_action_heap) > 0)
-    min = xbt_heap_maxkey(net_action_heap) - now;
+  if (xbt_heap_size(surf_network_model->action_heap) > 0)
+    min = xbt_heap_maxkey(surf_network_model->action_heap) - now;
   else
     min = -1;
 
@@ -526,7 +518,7 @@ static void net_update_actions_state_full(double now, double delta)
         action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(GENERIC_LMM_ACTION(action).suspended))
-        lmm_update_variable_weight(network_maxmin_system, GENERIC_LMM_ACTION(action).variable,
+        lmm_update_variable_weight(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                                    action->weight);
     }
 #ifdef HAVE_TRACING
@@ -550,7 +542,7 @@ static void net_update_actions_state_full(double now, double delta)
     }
 #endif
     if (!lmm_get_number_of_cnst_from_var
-        (network_maxmin_system, GENERIC_LMM_ACTION(action).variable)) {
+        (surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable)) {
       /* There is actually no link used, hence an infinite bandwidth.
        * This happens often when using models like vivaldi.
        * In such case, just make sure that the action completes immediately.
@@ -588,9 +580,9 @@ static void net_update_actions_state_lazy(double now, double delta)
 {
   surf_action_network_CM02_t action = NULL;
 
-  while ((xbt_heap_size(net_action_heap) > 0)
-         && (double_equals(xbt_heap_maxkey(net_action_heap), now))) {
-    action = xbt_heap_pop(net_action_heap);
+  while ((xbt_heap_size(surf_network_model->action_heap) > 0)
+         && (double_equals(xbt_heap_maxkey(surf_network_model->action_heap), now))) {
+    action = xbt_heap_pop(surf_network_model->action_heap);
     XBT_DEBUG("Action %p: finish", action);
     GENERIC_ACTION(action).finish = surf_get_clock();
 #ifdef HAVE_TRACING
@@ -616,9 +608,9 @@ static void net_update_actions_state_lazy(double now, double delta)
 
     // if I am wearing a latency hat
     if (GENERIC_LMM_ACTION(action).hat == LATENCY) {
-      lmm_update_variable_weight(network_maxmin_system, GENERIC_LMM_ACTION(action).variable,
+      lmm_update_variable_weight(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                                  action->weight);
-      surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
+      surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
       GENERIC_LMM_ACTION(action).last_update = surf_get_clock();
 
       // if I am wearing a max_duration or normal hat
@@ -630,7 +622,7 @@ static void net_update_actions_state_lazy(double now, double delta)
       ((surf_action_t)action)->finish = surf_get_clock();
       surf_network_model->action_state_set((surf_action_t) action,
                                            SURF_ACTION_DONE);
-      surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
+      surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
     }
   }
   return;
@@ -655,7 +647,7 @@ static void net_update_resource_state(void *id,
     surf_action_network_CM02_t action = NULL;
 
     nw_link->lmm_resource.power.peak = value;
-    lmm_update_constraint_bound(network_maxmin_system,
+    lmm_update_constraint_bound(surf_network_model->maxmin_system,
                                 nw_link->lmm_resource.constraint,
                                 sg_bandwidth_factor *
                                 (nw_link->lmm_resource.power.peak *
@@ -671,12 +663,12 @@ static void net_update_resource_state(void *id,
 #endif
     if (sg_weight_S_parameter > 0) {
       while ((var = lmm_get_var_from_cnst
-              (network_maxmin_system, nw_link->lmm_resource.constraint,
+              (surf_network_model->maxmin_system, nw_link->lmm_resource.constraint,
                &elem))) {
         action = lmm_variable_id(var);
         action->weight += delta;
         if (!(GENERIC_LMM_ACTION(action).suspended))
-          lmm_update_variable_weight(network_maxmin_system,
+          lmm_update_variable_weight(surf_network_model->maxmin_system,
                                      GENERIC_LMM_ACTION(action).variable, action->weight);
       }
     }
@@ -690,17 +682,17 @@ static void net_update_resource_state(void *id,
 
     nw_link->lat_current = value;
     while ((var = lmm_get_var_from_cnst
-            (network_maxmin_system, nw_link->lmm_resource.constraint,
+            (surf_network_model->maxmin_system, nw_link->lmm_resource.constraint,
              &elem))) {
       action = lmm_variable_id(var);
       action->lat_current += delta;
       action->weight += delta;
       if (action->rate < 0)
-        lmm_update_variable_bound(network_maxmin_system, GENERIC_LMM_ACTION(action).variable,
+        lmm_update_variable_bound(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                                   sg_tcp_gamma / (2.0 *
                                                   action->lat_current));
       else {
-        lmm_update_variable_bound(network_maxmin_system, GENERIC_LMM_ACTION(action).variable,
+        lmm_update_variable_bound(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                                   min(action->rate,
                                       sg_tcp_gamma / (2.0 *
                                                       action->
@@ -714,7 +706,7 @@ static void net_update_resource_state(void *id,
         }
       }
       if (!(GENERIC_LMM_ACTION(action).suspended))
-        lmm_update_variable_weight(network_maxmin_system, GENERIC_LMM_ACTION(action).variable,
+        lmm_update_variable_weight(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                                    action->weight);
 
     }
@@ -730,7 +722,7 @@ static void net_update_resource_state(void *id,
 
       nw_link->lmm_resource.state_current = SURF_RESOURCE_OFF;
       while ((var = lmm_get_var_from_cnst
-              (network_maxmin_system, cnst, &elem))) {
+              (surf_network_model->maxmin_system, cnst, &elem))) {
         surf_action_t action = lmm_variable_id(var);
 
         if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
@@ -802,7 +794,7 @@ static surf_action_t net_communicate(sg_routing_edge_t src,
 
   xbt_swag_insert(action, ((surf_action_t)action)->state_set);
   action->rate = rate;
-  if (network_update_mechanism == UM_LAZY) {
+  if (surf_network_model->update_mechanism == UM_LAZY) {
     GENERIC_LMM_ACTION(action).index_heap = -1;
     GENERIC_LMM_ACTION(action).last_update = surf_get_clock();
   }
@@ -843,27 +835,27 @@ static surf_action_t net_communicate(sg_routing_edge_t src,
 
   if (action->latency > 0) {
     GENERIC_LMM_ACTION(action).variable =
-        lmm_variable_new(network_maxmin_system, action, 0.0, -1.0,
+        lmm_variable_new(surf_network_model->maxmin_system, action, 0.0, -1.0,
                          constraints_per_variable);
-    if (network_update_mechanism == UM_LAZY) {
+    if (surf_network_model->update_mechanism == UM_LAZY) {
       // add to the heap the event when the latency is payed
       XBT_DEBUG("Added action (%p) one latency event at date %f", action,
                 action->latency + GENERIC_LMM_ACTION(action).last_update);
-      surf_action_lmm_heap_insert(net_action_heap,(surf_action_lmm_t)action, action->latency + GENERIC_LMM_ACTION(action).last_update,
+      surf_action_lmm_heap_insert(surf_network_model->action_heap,(surf_action_lmm_t)action, action->latency + GENERIC_LMM_ACTION(action).last_update,
                   xbt_dynar_is_empty(route) ? NORMAL : LATENCY);
     }
   } else
     GENERIC_LMM_ACTION(action).variable =
-        lmm_variable_new(network_maxmin_system, action, 1.0, -1.0,
+        lmm_variable_new(surf_network_model->maxmin_system, action, 1.0, -1.0,
                          constraints_per_variable);
 
   if (action->rate < 0) {
-    lmm_update_variable_bound(network_maxmin_system, GENERIC_LMM_ACTION(action).variable,
+    lmm_update_variable_bound(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                               (action->lat_current > 0) ?
                               sg_tcp_gamma / (2.0 *
                                               action->lat_current) : -1.0);
   } else {
-    lmm_update_variable_bound(network_maxmin_system, GENERIC_LMM_ACTION(action).variable,
+    lmm_update_variable_bound(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                               (action->lat_current > 0) ?
                               min(action->rate,
                                   sg_tcp_gamma / (2.0 *
@@ -872,14 +864,14 @@ static surf_action_t net_communicate(sg_routing_edge_t src,
   }
 
   xbt_dynar_foreach(route, i, link) {
-    lmm_expand(network_maxmin_system, link->lmm_resource.constraint,
+    lmm_expand(surf_network_model->maxmin_system, link->lmm_resource.constraint,
                GENERIC_LMM_ACTION(action).variable, 1.0);
   }
 
   if (sg_network_crosstraffic == 1) {
     XBT_DEBUG("Fullduplex active adding backward flow using 5%%");
     xbt_dynar_foreach(back_route, i, link) {
-      lmm_expand(network_maxmin_system, link->lmm_resource.constraint,
+      lmm_expand(surf_network_model->maxmin_system, link->lmm_resource.constraint,
                  GENERIC_LMM_ACTION(action).variable, .05);
     }
   }
@@ -917,25 +909,25 @@ static int net_link_shared(const void *link)
 static void net_action_suspend(surf_action_t action)
 {
   ((surf_action_network_CM02_t) action)->generic_lmm_action.suspended = 1;
-  lmm_update_variable_weight(network_maxmin_system,
+  lmm_update_variable_weight(surf_network_model->maxmin_system,
                              ((surf_action_network_CM02_t)
                               action)->generic_lmm_action.variable, 0.0);
 
-  if (network_update_mechanism == UM_LAZY)      // remove action from the heap
-    surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
+  if (surf_network_model->update_mechanism == UM_LAZY)      // remove action from the heap
+    surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
 }
 
 static void net_action_resume(surf_action_t action)
 {
   if (((surf_action_network_CM02_t) action)->generic_lmm_action.suspended) {
-    lmm_update_variable_weight(network_maxmin_system,
+    lmm_update_variable_weight(surf_network_model->maxmin_system,
                                ((surf_action_network_CM02_t)
                                 action)->generic_lmm_action.variable,
                                ((surf_action_network_CM02_t)
                                 action)->weight);
     ((surf_action_network_CM02_t) action)->generic_lmm_action.suspended = 0;
-    if (network_update_mechanism == UM_LAZY)    // remove action from the heap
-      surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
+    if (surf_network_model->update_mechanism == UM_LAZY)    // remove action from the heap
+      surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
   }
 }
 
@@ -947,8 +939,8 @@ static int net_action_is_suspended(surf_action_t action)
 void net_action_set_max_duration(surf_action_t action, double duration)
 {
   action->max_duration = duration;
-  if (network_update_mechanism == UM_LAZY)      // remove action from the heap
-    surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
+  if (surf_network_model->update_mechanism == UM_LAZY)      // remove action from the heap
+    surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
 }
 
 #ifdef HAVE_TRACING
@@ -961,17 +953,17 @@ static void net_action_set_category(surf_action_t action,
 
 static void net_finalize(void)
 {
-  surf_model_exit(surf_network_model);
-  surf_network_model = NULL;
-
-  lmm_system_free(network_maxmin_system);
-  network_maxmin_system = NULL;
+  lmm_system_free(surf_network_model->maxmin_system);
+  surf_network_model->maxmin_system = NULL;
 
-  if (network_update_mechanism == UM_LAZY) {
-    xbt_heap_free(net_action_heap);
-    xbt_swag_free(net_modified_set);
+  if (surf_network_model->update_mechanism == UM_LAZY) {
+    xbt_heap_free(surf_network_model->action_heap);
+    xbt_swag_free(surf_network_model->modified_set);
   }
 
+  surf_model_exit(surf_network_model);
+  surf_network_model = NULL;
+
   if (smpi_bw_factor)
     xbt_dynar_free(&smpi_bw_factor);
   if (smpi_lat_factor)
@@ -1040,11 +1032,35 @@ static void smpi_gap_remove(surf_action_network_CM02_t action)
   }
 }
 
+static void set_update_mechanism(void)
+{
+  char *optim = xbt_cfg_get_string(_surf_cfg_set, "network/optim");
+  int select =
+      xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update");
+
+  if (!strcmp(optim, "Full")) {
+    surf_network_model->update_mechanism = UM_FULL;
+    surf_network_model->selective_update = select;
+  } else if (!strcmp(optim, "Lazy")) {
+    surf_network_model->update_mechanism = UM_LAZY;
+    surf_network_model->selective_update = 1;
+    xbt_assert((select == 1)
+               ||
+               (xbt_cfg_is_default_value
+                (_surf_cfg_set, "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);
+  }
+}
+
 static void surf_network_model_init_internal(void)
 {
   s_surf_action_network_CM02_t comm;
   surf_network_model = surf_model_init();
 
+  set_update_mechanism();
+
   surf_network_model->name = "network";
   surf_network_model->action_unref = net_action_unref;
   surf_network_model->action_cancel = net_action_cancel;
@@ -1058,12 +1074,12 @@ static void surf_network_model_init_internal(void)
 #endif
 
   surf_network_model->model_private->resource_used = net_resource_used;
-  if (network_update_mechanism == UM_LAZY) {
+  if (surf_network_model->update_mechanism == UM_LAZY) {
     surf_network_model->model_private->share_resources =
         net_share_resources_lazy;
     surf_network_model->model_private->update_actions_state =
         net_update_actions_state_lazy;
-  } else if (network_update_mechanism == UM_FULL) {
+  } else if (surf_network_model->update_mechanism == UM_FULL) {
     surf_network_model->model_private->share_resources =
         net_share_resources_full;
     surf_network_model->model_private->update_actions_state =
@@ -1090,43 +1106,21 @@ static void surf_network_model_init_internal(void)
   surf_network_model->extension.network.create_resource =
       net_create_resource;
 
-  if (!network_maxmin_system)
-    network_maxmin_system = lmm_system_new(net_selective_update);
+  if (!surf_network_model->maxmin_system)
+    surf_network_model->maxmin_system = lmm_system_new(surf_network_model->selective_update);
 
   routing_model_create(net_create_resource("__loopback__",
                                            498000000, NULL, 0.000015, NULL,
                                            SURF_RESOURCE_ON, NULL,
                                            SURF_LINK_FATPIPE, NULL));
 
-  if (network_update_mechanism == UM_LAZY) {
-    net_action_heap = xbt_heap_new(8, NULL);
-    xbt_heap_set_update_callback(net_action_heap,
+  if (surf_network_model->update_mechanism == UM_LAZY) {
+    surf_network_model->action_heap = xbt_heap_new(8, NULL);
+    xbt_heap_set_update_callback(surf_network_model->action_heap,
                                  surf_action_lmm_update_index_heap);
-    net_modified_set =
+    surf_network_model->modified_set =
         xbt_swag_new(xbt_swag_offset(comm, generic_lmm_action.action_list_hookup));
-    network_maxmin_system->keep_track = net_modified_set;
-  }
-}
-
-static void set_update_mechanism(void)
-{
-  char *optim = xbt_cfg_get_string(_surf_cfg_set, "network/optim");
-  int select =
-      xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update");
-
-  if (!strcmp(optim, "Full")) {
-    network_update_mechanism = UM_FULL;
-    net_selective_update = select;
-  } else if (!strcmp(optim, "Lazy")) {
-    network_update_mechanism = UM_LAZY;
-    net_selective_update = 1;
-    xbt_assert((select == 1)
-               ||
-               (xbt_cfg_is_default_value
-                (_surf_cfg_set, "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);
+    surf_network_model->maxmin_system->keep_track = surf_network_model->modified_set;
   }
 }
 
@@ -1146,7 +1140,6 @@ void surf_network_model_init_SMPI(void)
 
   if (surf_network_model)
     return;
-  set_update_mechanism();
 
   surf_network_model_init_internal();
   latency_factor_callback = &smpi_latency_factor;
@@ -1181,8 +1174,6 @@ void surf_network_model_init_LegrandVelho(void)
   if (surf_network_model)
     return;
 
-  set_update_mechanism();
-
   surf_network_model_init_internal();
   net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
@@ -1212,7 +1203,6 @@ void surf_network_model_init_CM02(void)
   if (surf_network_model)
     return;
 
-  set_update_mechanism();
   surf_network_model_init_internal();
   net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
@@ -1239,7 +1229,6 @@ void surf_network_model_init_Reno(void)
   if (surf_network_model)
     return;
 
-  set_update_mechanism();
   surf_network_model_init_internal();
   net_define_callbacks();
 
@@ -1260,7 +1249,6 @@ void surf_network_model_init_Reno2(void)
   if (surf_network_model)
     return;
 
-  set_update_mechanism();
   surf_network_model_init_internal();
   net_define_callbacks();
 
@@ -1281,7 +1269,6 @@ void surf_network_model_init_Vegas(void)
   if (surf_network_model)
     return;
 
-  set_update_mechanism();
   surf_network_model_init_internal();
   net_define_callbacks();
 
diff --git a/src/surf/surf_model.c b/src/surf/surf_model.c
index 3b7a960b7f..3e387cd2b8 100644
--- a/src/surf/surf_model.c
+++ b/src/surf/surf_model.c
@@ -46,6 +46,10 @@ surf_model_t surf_model_init(void)
   model->action_get_finish_time = surf_action_get_finish_time;
   model->action_data_set = surf_action_data_set;
 
+  model->modified_set = NULL;
+  model->action_heap = NULL;
+  model->update_mechanism = UM_UNDEFINED;
+  model->selective_update = 0;
 
   return model;
 }
diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index f115c1256d..1fe0b9698f 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -17,12 +17,6 @@
 
 #define NO_MAX_DURATION -1.0
 
-typedef enum {
-  UM_FULL,
-  UM_LAZY,
-  UM_UNDEFINED
-} e_UM_t;
-
 /* user-visible parameters */
 extern double sg_tcp_gamma;
 extern double sg_sender_gap;