X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4380e0882f6217380f8be9ca69547a315a1ef7ed..3d94612c68def9c6d9d1fddb5ab69411a189540e:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 8b9657363f..5bc5bab36f 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;
@@ -45,6 +44,7 @@ typedef struct s_smpi_factor {
   double value;
 } s_smpi_factor_t;
 
+
 double sg_sender_gap = 0.0;
 double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */
 double sg_bandwidth_factor = 1.0;       /* default value; can be set by model or from command line */
@@ -55,44 +55,6 @@ 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 update_action_remaining_lazy(double now);
-
-static xbt_swag_t net_modified_set = NULL;
-static xbt_heap_t net_action_heap = NULL;
-
-/* added to manage the communication action's heap */
-static void net_action_update_index_heap(void *action, int i)
-{
-  surf_action_network_CM02_t a = action;
-  GENERIC_LMM_ACTION(a).index_heap = i;
-}
-
-/* insert action on heap using a given key and a hat (heap_action_type)
- * a hat can be of three types for communications:
- *
- * NORMAL = this is a normal heap entry stating the date to finish transmitting
- * LATENCY = this is a heap entry to warn us when the latency is payed
- * MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached
- */
-static void heap_insert(surf_action_network_CM02_t action, double key,
-                        enum heap_action_type hat)
-{
-  GENERIC_LMM_ACTION(action).hat = hat;
-  xbt_heap_push(net_action_heap, action, key);
-}
-
-static void heap_remove(surf_action_network_CM02_t action)
-{
-  GENERIC_LMM_ACTION(action).hat = NOTSET;
-  if (GENERIC_LMM_ACTION(action).index_heap >= 0) {
-    xbt_heap_remove(net_action_heap, GENERIC_LMM_ACTION(action).index_heap);
-  }
-}
-
 /******************************************************************************/
 /*                           Factors callbacks                                */
 /******************************************************************************/
@@ -115,6 +77,13 @@ static double constant_bandwidth_constraint(double rate, double bound,
 /**********************/
 /*   SMPI callbacks   */
 /**********************/
+
+static int factor_cmp(const void *pa, const void *pb)
+{
+  return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor);
+}
+
+
 static xbt_dynar_t parse_factor(const char *smpi_coef_string)
 {
   char *value = NULL;
@@ -136,6 +105,12 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string)
     xbt_dynar_free(&radical_elements2);
   }
   xbt_dynar_free(&radical_elements);
+  iter=0;
+  xbt_dynar_sort(smpi_factor, &factor_cmp);
+  xbt_dynar_foreach(smpi_factor, iter, fact) {
+    XBT_DEBUG("ordered smpi_factor:\t%ld : %f", fact.factor, fact.value);
+
+  }
   return smpi_factor;
 }
 
@@ -147,9 +122,10 @@ static double smpi_bandwidth_factor(double size)
 
   unsigned int iter = 0;
   s_smpi_factor_t fact;
+
   xbt_dynar_foreach(smpi_bw_factor, iter, fact) {
-    if (size >= fact.factor) {
-      XBT_DEBUG("%lf >= %ld return %f", size, fact.factor, fact.value);
+    if (size < fact.factor) {
+      XBT_DEBUG("%lf < %ld return %f", size, fact.factor, fact.value);
       return fact.value;
     }
   }
@@ -165,11 +141,13 @@ static double smpi_latency_factor(double size)
 
   unsigned int iter = 0;
   s_smpi_factor_t fact;
+
   xbt_dynar_foreach(smpi_lat_factor, iter, fact) {
-    if (size >= fact.factor) {
-      XBT_DEBUG("%lf >= %ld return %f", size, fact.factor, fact.value);
+    if (size < fact.factor) {
+      XBT_DEBUG("%lf < %ld return %f", size, fact.factor, fact.value);
       return fact.value;
     }
+
   }
 
   return 1.0;
@@ -192,7 +170,6 @@ static double (*bandwidth_constraint_callback) (double, double, double) =
 
 static void (*gap_append) (double, const link_CM02_t,
                            surf_action_network_CM02_t) = NULL;
-static void (*gap_remove) (surf_action_network_CM02_t) = NULL;
 
 static void *net_create_resource(const char *name,
                                  double bw_initial,
@@ -208,7 +185,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->model_private->maxmin_system,
                             sg_bandwidth_factor * bw_initial,
                             history,
                             state_initial, state_trace,
@@ -227,6 +204,7 @@ static void *net_create_resource(const char *name,
     lmm_constraint_shared(nw_link->lmm_resource.constraint);
 
   xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link);
+  XBT_DEBUG("Create link '%s'",name);
 
   return nw_link;
 }
@@ -326,42 +304,11 @@ 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->model_private->maxmin_system, ((surf_resource_lmm_t)
                                                      resource_id)->
                              constraint);
 }
 
-static int net_action_unref(surf_action_t action)
-{
-  action->refcount--;
-  if (!action->refcount) {
-    xbt_swag_remove(action, action->state_set);
-    if (((surf_action_lmm_t)action)->variable) {
-      lmm_variable_free(network_maxmin_system,
-                        ((surf_action_lmm_t) action)->variable);
-    }
-    if (network_update_mechanism == UM_LAZY) {  // remove action from the heap
-      heap_remove((surf_action_network_CM02_t) action);
-      xbt_swag_remove(action, net_modified_set);
-    }
-    surf_action_free(&action);
-    return 1;
-  }
-  return 0;
-}
-
-
-
-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);
-    heap_remove((surf_action_network_CM02_t) action);
-  }
-}
-
 void net_action_recycle(surf_action_t action)
 {
   return;
@@ -374,50 +321,6 @@ int net_get_link_latency_limited(surf_action_t action)
 }
 #endif
 
-double net_action_get_remains(surf_action_t action)
-{
-  if (network_update_mechanism == UM_LAZY)      /* update remains before return it */
-    update_action_remaining_lazy(surf_get_clock());
-  return action->remains;
-}
-
-static void update_action_remaining_lazy(double now)
-{
-  surf_action_network_CM02_t action = NULL;
-  double delta = 0.0;
-
-  xbt_swag_foreach(action, net_modified_set) {
-
-    if (GENERIC_LMM_ACTION(action).suspended != 0) {
-      continue;
-    }
-
-    delta = now - GENERIC_LMM_ACTION(action).last_update;
-
-    double_update(&(((surf_action_t)action)->remains),
-                  lmm_variable_getvalue(((surf_action_lmm_t) action)->variable) * delta);
-
-    if (((surf_action_t)action)->max_duration != NO_MAX_DURATION)
-      double_update(&(((surf_action_t)action)->max_duration), delta);
-
-    if ((((surf_action_t)action)->remains <= 0) &&
-        (lmm_get_variable_weight(((surf_action_lmm_t)action)->variable) > 0)) {
-      ((surf_action_t)action)->finish = surf_get_clock();
-      surf_network_model->action_state_set((surf_action_t) action,
-                                           SURF_ACTION_DONE);
-      heap_remove(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);
-      heap_remove(action);
-    }
-
-    GENERIC_LMM_ACTION(action).last_update = now;
-  }
-}
-
 static double net_share_resources_full(double now)
 {
   s_surf_action_lmm_t s_action;
@@ -429,17 +332,17 @@ 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->model_private->maxmin_system,
                                        network_solve);
 
 #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable)  )))
 
   xbt_swag_foreach(action, running_actions) {
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-    if (lmm_is_variable_limited_by_latency(action->variable)) {
-      GENERIC_LMM_ACTION(action).latency_limited = 1;
+    if (lmm_is_variable_limited_by_latency(GENERIC_LMM_ACTION(action).variable)) {
+      action->latency_limited = 1;
     } else {
-      GENERIC_LMM_ACTION(action).latency_limited = 0;
+      action->latency_limited = 0;
     }
 #endif
     if (action->latency > 0) {
@@ -454,184 +357,17 @@ static double net_share_resources_full(double now)
 
 static double net_share_resources_lazy(double now)
 {
-  surf_action_network_CM02_t action = NULL;
-  double min = -1;
-  double value;
-
-  XBT_DEBUG
-      ("Before share resources, the size of modified actions set is %d",
-       xbt_swag_size(net_modified_set));
-  update_action_remaining_lazy(now);
-
-  lmm_solve(network_maxmin_system);
-
-  XBT_DEBUG
-      ("After share resources, The size of modified actions set is %d",
-       xbt_swag_size(net_modified_set));
-
-  xbt_swag_foreach(action, net_modified_set) {
-    int max_dur_flag = 0;
-
-    if (GENERIC_ACTION(action).state_set !=
-        surf_network_model->states.running_action_set)
-      continue;
-
-    /* bogus priority, skip it */
-    if (GENERIC_ACTION(action).priority <= 0)
-      continue;
-
-    min = -1;
-    value = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
-    if (value > 0) {
-      if (GENERIC_ACTION(action).remains > 0) {
-        value = GENERIC_ACTION(action).remains / value;
-        min = now + value;
-      } else {
-        value = 0.0;
-        min = now;
-      }
-    }
-
-    if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION)
-        && (min == -1
-            || GENERIC_ACTION(action).start +
-            GENERIC_ACTION(action).max_duration < min)) {
-      min = GENERIC_ACTION(action).start +
-          GENERIC_ACTION(action).max_duration;
-      max_dur_flag = 1;
-    }
-
-    XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action,
-              GENERIC_ACTION(action).start, now + value,
-              GENERIC_ACTION(action).max_duration);
-
-    if (min != -1) {
-      heap_remove(action);
-      heap_insert(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;
-  else
-    min = -1;
-
-  XBT_DEBUG("The minimum with the HEAP %lf", min);
-
-  return min;
+  return generic_share_resources_lazy(now, surf_network_model);
 }
 
 static void net_update_actions_state_full(double now, double delta)
 {
-  double deltap = 0.0;
-  surf_action_network_CM02_t action = NULL;
-  surf_action_network_CM02_t next_action = NULL;
-  xbt_swag_t running_actions =
-      surf_network_model->states.running_action_set;
-  /*
-     xbt_swag_t failed_actions =
-     surf_network_model->states.failed_action_set;
-   */
-
-  xbt_swag_foreach_safe(action, next_action, running_actions) {
-    deltap = delta;
-    if (action->latency > 0) {
-      if (action->latency > deltap) {
-        double_update(&(action->latency), deltap);
-        deltap = 0.0;
-      } else {
-        double_update(&(deltap), action->latency);
-        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,
-                                   action->weight);
-    }
-#ifdef HAVE_TRACING
-    if (TRACE_is_enabled()) {
-      int n = lmm_get_number_of_cnst_from_var(network_maxmin_system, GENERIC_LMM_ACTION(action).variable);
-      unsigned int i;
-      for (i = 0; i < n; i++){
-        lmm_constraint_t constraint = lmm_get_cnst_from_var(network_maxmin_system,
-                                                            GENERIC_LMM_ACTION(action).variable,
-                                                            i);
-        link_CM02_t link = lmm_constraint_id(constraint);
-        TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
-                                        ((surf_action_t)action)->category,
-                                        lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
-                                        now - delta,
-                                        delta);
-      }
-    }
-#endif
-    if (!lmm_get_number_of_cnst_from_var
-        (network_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.
-       */
-      double_update(&(GENERIC_ACTION(action).remains),
-                    GENERIC_ACTION(action).remains);
-    }
-    double_update(&(GENERIC_ACTION(action).remains),
-                  lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * deltap);
-    if (((surf_action_t)action)->max_duration != NO_MAX_DURATION)
-      double_update(&(((surf_action_t)action)->max_duration), delta);
-
-    if ((GENERIC_ACTION(action).remains <= 0) &&
-        (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) {
-      ((surf_action_t)action)->finish = surf_get_clock();
-      surf_network_model->action_state_set((surf_action_t) action,
-                                           SURF_ACTION_DONE);
-
-      if (gap_remove)
-        gap_remove(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);
-      if (gap_remove)
-        gap_remove(action);
-    }
-  }
-
-  return;
+  generic_update_actions_state_full(now, delta, surf_network_model);
 }
 
 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);
-    XBT_DEBUG("Action %p: finish", action);
-    GENERIC_ACTION(action).finish = surf_get_clock();
-
-    // 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,
-                                 action->weight);
-      heap_remove(action);
-      GENERIC_LMM_ACTION(action).last_update = surf_get_clock();
-
-      // if I am wearing a max_duration or normal hat
-    } else if (GENERIC_LMM_ACTION(action).hat == MAX_DURATION ||
-        GENERIC_LMM_ACTION(action).hat == NORMAL) {
-      // no need to communicate anymore
-      // assume that flows that reached max_duration have remaining of 0
-      GENERIC_ACTION(action).remains = 0;
-      ((surf_action_t)action)->finish = surf_get_clock();
-      surf_network_model->action_state_set((surf_action_t) action,
-                                           SURF_ACTION_DONE);
-      heap_remove(action);
-    }
-  }
-  return;
+  generic_update_actions_state_lazy(now, delta, surf_network_model);
 }
 
 static void net_update_resource_state(void *id,
@@ -653,7 +389,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->model_private->maxmin_system,
                                 nw_link->lmm_resource.constraint,
                                 sg_bandwidth_factor *
                                 (nw_link->lmm_resource.power.peak *
@@ -669,12 +405,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->model_private->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->model_private->maxmin_system,
                                      GENERIC_LMM_ACTION(action).variable, action->weight);
       }
     }
@@ -688,17 +424,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->model_private->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->model_private->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->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                                   min(action->rate,
                                       sg_tcp_gamma / (2.0 *
                                                       action->
@@ -712,7 +448,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->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                                    action->weight);
 
     }
@@ -728,7 +464,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->model_private->maxmin_system, cnst, &elem))) {
         surf_action_t action = lmm_variable_id(var);
 
         if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
@@ -752,9 +488,9 @@ static void net_update_resource_state(void *id,
 }
 
 
-static surf_action_t net_communicate(const char *src_name,
-                                     const char *dst_name, double size,
-                                     double rate)
+static surf_action_t net_communicate(sg_routing_edge_t src,
+                                     sg_routing_edge_t dst,
+                                     double size, double rate)
 {
   unsigned int i;
   link_CM02_t link;
@@ -765,14 +501,14 @@ static surf_action_t net_communicate(const char *src_name,
   xbt_dynar_t back_route = NULL;
   int constraints_per_variable = 0;
 
-  xbt_dynar_t route = xbt_dynar_new(global_routing->size_of_link, NULL);
+  xbt_dynar_t route = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
 
-  XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
+  XBT_IN("(%s,%s,%g,%g)", src->name, dst->name, size, rate);
 
-  routing_get_route_and_latency(src_name, dst_name, &route, &latency);
+  routing_get_route_and_latency(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.",
-             src_name, dst_name);
+             src->name, dst->name);
 
   xbt_dynar_foreach(route, i, link) {
     if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) {
@@ -781,7 +517,7 @@ static surf_action_t net_communicate(const char *src_name,
     }
   }
   if (sg_network_crosstraffic == 1) {
-    routing_get_route_and_latency(dst_name, src_name, &back_route, NULL);
+    routing_get_route_and_latency(dst, src, &back_route, NULL);
     xbt_dynar_foreach(back_route, i, link) {
       if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) {
         failed = 1;
@@ -794,13 +530,13 @@ static surf_action_t net_communicate(const char *src_name,
       surf_action_new(sizeof(s_surf_action_network_CM02_t), size,
                       surf_network_model, failed);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-  (GENERIC_LMM_ACTION(action)).latency_limited = 0;
+  action->latency_limited = 0;
 #endif
   action->weight = action->latency = latency;
 
   xbt_swag_insert(action, ((surf_action_t)action)->state_set);
   action->rate = rate;
-  if (network_update_mechanism == UM_LAZY) {
+  if (surf_network_model->model_private->update_mechanism == UM_LAZY) {
     GENERIC_LMM_ACTION(action).index_heap = -1;
     GENERIC_LMM_ACTION(action).last_update = surf_get_clock();
   }
@@ -831,7 +567,7 @@ static surf_action_t net_communicate(const char *src_name,
     link = *(link_CM02_t *) xbt_dynar_get_ptr(route, 0);
     gap_append(size, link, action);
     XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)",
-              action, src_name, dst_name, action->sender.gap,
+              action, src->name, dst->name, action->sender.gap,
               action->latency);
   }
 
@@ -841,27 +577,27 @@ static surf_action_t net_communicate(const char *src_name,
 
   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->model_private->maxmin_system, action, 0.0, -1.0,
                          constraints_per_variable);
-    if (network_update_mechanism == UM_LAZY) {
+    if (surf_network_model->model_private->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);
-      heap_insert(action, action->latency + GENERIC_LMM_ACTION(action).last_update,
+      surf_action_lmm_heap_insert(surf_network_model->model_private->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->model_private->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->model_private->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->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable,
                               (action->lat_current > 0) ?
                               min(action->rate,
                                   sg_tcp_gamma / (2.0 *
@@ -870,14 +606,14 @@ static surf_action_t net_communicate(const char *src_name,
   }
 
   xbt_dynar_foreach(route, i, link) {
-    lmm_expand(network_maxmin_system, link->lmm_resource.constraint,
+    lmm_expand(surf_network_model->model_private->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->model_private->maxmin_system, link->lmm_resource.constraint,
                  GENERIC_LMM_ACTION(action).variable, .05);
     }
   }
@@ -888,7 +624,7 @@ static surf_action_t net_communicate(const char *src_name,
   return (surf_action_t) action;
 }
 
-static xbt_dynar_t net_get_route(const char *src, const char *dst)
+static xbt_dynar_t net_get_route(void *src, void *dst)
 {
   xbt_dynar_t route = NULL;
   routing_get_route_and_latency(src, dst, &route, NULL);
@@ -912,64 +648,19 @@ static int net_link_shared(const void *link)
       lmm_constraint_is_shared(((surf_resource_lmm_t) link)->constraint);
 }
 
-static void net_action_suspend(surf_action_t action)
+static void net_finalize(void)
 {
-  ((surf_action_network_CM02_t) action)->generic_lmm_action.suspended = 1;
-  lmm_update_variable_weight(network_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
-    heap_remove((surf_action_network_CM02_t) action);
-}
+  lmm_system_free(surf_network_model->model_private->maxmin_system);
+  surf_network_model->model_private->maxmin_system = NULL;
 
-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,
-                               ((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
-      heap_remove((surf_action_network_CM02_t) action);
+  if (surf_network_model->model_private->update_mechanism == UM_LAZY) {
+    xbt_heap_free(surf_network_model->model_private->action_heap);
+    xbt_swag_free(surf_network_model->model_private->modified_set);
   }
-}
-
-static int net_action_is_suspended(surf_action_t action)
-{
-  return ((surf_action_network_CM02_t) action)->generic_lmm_action.suspended;
-}
 
-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
-    heap_remove((surf_action_network_CM02_t) action);
-}
-
-#ifdef HAVE_TRACING
-static void net_action_set_category(surf_action_t action,
-                                    const char *category)
-{
-  action->category = xbt_strdup(category);
-}
-#endif
-
-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;
-
-  if (network_update_mechanism == UM_LAZY) {
-    xbt_heap_free(net_action_heap);
-    xbt_swag_free(net_modified_set);
-  }
-
   if (smpi_bw_factor)
     xbt_dynar_free(&smpi_bw_factor);
   if (smpi_lat_factor)
@@ -997,8 +688,7 @@ static void smpi_gap_append(double size, const link_CM02_t link,
           xbt_fifo_get_item_content(xbt_fifo_get_last_item(fifo));
       bw = net_get_link_bandwidth(link);
       action->sender.gap =
-          last_action->sender.gap + max(sg_sender_gap,
-                                        last_action->sender.size / bw);
+          max(sg_sender_gap,last_action->sender.size / bw);
       action->latency += action->sender.gap;
     }
     /* Append action as last send */
@@ -1015,10 +705,11 @@ static void smpi_gap_append(double size, const link_CM02_t link,
   }
 }
 
-static void smpi_gap_remove(surf_action_network_CM02_t action)
+static void smpi_gap_remove(surf_action_lmm_t lmm_action)
 {
   xbt_fifo_t fifo;
   size_t size;
+  surf_action_network_CM02_t action = (surf_action_network_CM02_t)(lmm_action);
 
   if (sg_sender_gap > 0.0 && action->sender.link_name
       && action->sender.fifo_item) {
@@ -1038,30 +729,56 @@ 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->model_private->update_mechanism = UM_FULL;
+    surf_network_model->model_private->selective_update = select;
+  } else if (!strcmp(optim, "Lazy")) {
+    surf_network_model->model_private->update_mechanism = UM_LAZY;
+    surf_network_model->model_private->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;
+  surf_network_model->action_unref = surf_action_unref;
+  surf_network_model->action_cancel = surf_action_cancel;
   surf_network_model->action_recycle = net_action_recycle;
-  surf_network_model->get_remains = net_action_get_remains;
+
+  surf_network_model->get_remains = surf_action_get_remains;
+
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   surf_network_model->get_latency_limited = net_get_link_latency_limited;
 #endif
 #ifdef HAVE_TRACING
-  surf_network_model->set_category = net_action_set_category;
+  surf_network_model->set_category = surf_action_set_category;
 #endif
 
   surf_network_model->model_private->resource_used = net_resource_used;
-  if (network_update_mechanism == UM_LAZY) {
+  if (surf_network_model->model_private->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->model_private->update_mechanism == UM_FULL) {
     surf_network_model->model_private->share_resources =
         net_share_resources_full;
     surf_network_model->model_private->update_actions_state =
@@ -1072,10 +789,10 @@ static void surf_network_model_init_internal(void)
       net_update_resource_state;
   surf_network_model->model_private->finalize = net_finalize;
 
-  surf_network_model->suspend = net_action_suspend;
-  surf_network_model->resume = net_action_resume;
-  surf_network_model->is_suspended = net_action_is_suspended;
-  surf_cpu_model->set_max_duration = net_action_set_max_duration;
+  surf_network_model->suspend = surf_action_suspend;
+  surf_network_model->resume = surf_action_resume;
+  surf_network_model->is_suspended = surf_action_is_suspended;
+  surf_cpu_model->set_max_duration = surf_action_set_max_duration;
 
   surf_network_model->extension.network.communicate = net_communicate;
   surf_network_model->extension.network.get_route = net_get_route;
@@ -1088,45 +805,24 @@ 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->model_private->maxmin_system)
+    surf_network_model->model_private->maxmin_system = lmm_system_new(surf_network_model->model_private->selective_update);
 
-  routing_model_create(sizeof(link_CM02_t),
-                       net_create_resource("__loopback__",
+  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,
-                                 net_action_update_index_heap);
-    net_modified_set =
+  if (surf_network_model->model_private->update_mechanism == UM_LAZY) {
+    surf_network_model->model_private->action_heap = xbt_heap_new(8, NULL);
+    xbt_heap_set_update_callback(surf_network_model->model_private->action_heap,
+                                 surf_action_lmm_update_index_heap);
+    surf_network_model->model_private->modified_set =
         xbt_swag_new(xbt_swag_offset(comm, generic_lmm_action.action_list_hookup));
-    network_maxmin_system->keep_track = net_modified_set;
+    surf_network_model->model_private->maxmin_system->keep_track = surf_network_model->model_private->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->gap_remove = NULL;
 }
 
 /************************************************************************/
@@ -1145,14 +841,13 @@ 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;
   bandwidth_factor_callback = &smpi_bandwidth_factor;
   bandwidth_constraint_callback = &smpi_bandwidth_constraint;
   gap_append = &smpi_gap_append;
-  gap_remove = &smpi_gap_remove;
+  surf_network_model->gap_remove = &smpi_gap_remove;
   net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = lmm_solve;
@@ -1180,8 +875,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);
@@ -1211,7 +904,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);
@@ -1238,7 +930,6 @@ void surf_network_model_init_Reno(void)
   if (surf_network_model)
     return;
 
-  set_update_mechanism();
   surf_network_model_init_internal();
   net_define_callbacks();
 
@@ -1259,7 +950,6 @@ void surf_network_model_init_Reno2(void)
   if (surf_network_model)
     return;
 
-  set_update_mechanism();
   surf_network_model_init_internal();
   net_define_callbacks();
 
@@ -1280,7 +970,6 @@ void surf_network_model_init_Vegas(void)
   if (surf_network_model)
     return;
 
-  set_update_mechanism();
   surf_network_model_init_internal();
   net_define_callbacks();