Put those variables private

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 04530c6..2d4e5b4 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -22,12 +22,6 @@
 SG_BEGIN_DECL()
 /* Actions and models are highly connected structures... */
 
 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 */
 typedef enum {
   SURF_NETWORK_ELEMENT_NULL = 0,        /* NULL */
   SURF_NETWORK_ELEMENT_HOST,    /* host type */


@@ -323,13 +317,6 @@ typedef struct surf_model {
 
   surf_model_private_t model_private;
 
 
   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;
   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 56aebc1..406c531 100644 (file)
--- a/src/surf/cpu_cas01.c
+++ b/src/surf/cpu_cas01.c
@@ -74,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 =
         tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
 
   cpu->constraint =

-      lmm_constraint_new(surf_cpu_model->maxmin_system, cpu,
+      lmm_constraint_new(surf_cpu_model->model_private->maxmin_system, cpu,

                          cpu->core * cpu->power_scale * cpu->power_peak);
 
   xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
                          cpu->core * cpu->power_scale * cpu->power_peak);
 
   xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);


@@ -135,7 +135,7 @@ static void cpu_define_callbacks()
 
 static int cpu_resource_used(void *resource)
 {
 
 static int cpu_resource_used(void *resource)
 {

-  return lmm_constraint_used(surf_cpu_model->maxmin_system,
+  return lmm_constraint_used(surf_cpu_model->model_private->maxmin_system,

                              ((cpu_Cas01_t) resource)->constraint);
 }
 
                              ((cpu_Cas01_t) resource)->constraint);
 }
 


@@ -145,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)
   if (!action->refcount) {
     xbt_swag_remove(action, action->state_set);
     if (((surf_action_lmm_t) action)->variable)

-      lmm_variable_free(surf_cpu_model->maxmin_system,
+      lmm_variable_free(surf_cpu_model->model_private->maxmin_system,

                         ((surf_action_lmm_t) action)->variable);
                         ((surf_action_lmm_t) action)->variable);

-    if (surf_cpu_model->update_mechanism == UM_LAZY) {
+    if (surf_cpu_model->model_private->update_mechanism == UM_LAZY) {

       /* remove from heap */
       /* remove from heap */

-      surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
-      xbt_swag_remove(action, surf_cpu_model->modified_set);
+      surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action);
+      xbt_swag_remove(action, surf_cpu_model->model_private->modified_set);

     }
 #ifdef HAVE_TRACING
     xbt_free(action->category);
     }
 #ifdef HAVE_TRACING
     xbt_free(action->category);


@@ -164,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);
 static void cpu_action_cancel(surf_action_t action)
 {
   surf_action_state_set(action, SURF_ACTION_FAILED);

-  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);
+  if (surf_cpu_model->model_private->update_mechanism == UM_LAZY) {
+    xbt_swag_remove(action, surf_cpu_model->model_private->modified_set);
+    surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action);

   }
   return;
 }
   }
   return;
 }


@@ -207,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
     if (TRACE_is_enabled()) {
       cpu_Cas01_t cpu =
           lmm_constraint_id(lmm_get_cnst_from_var

-              (surf_cpu_model->maxmin_system,
+              (surf_cpu_model->model_private->maxmin_system,

                   GENERIC_LMM_ACTION(action).variable, 0));
       TRACE_surf_host_set_utilization(cpu->generic_resource.name,
           ((surf_action_t)action)->category,
                   GENERIC_LMM_ACTION(action).variable, 0));
       TRACE_surf_host_set_utilization(cpu->generic_resource.name,
           ((surf_action_t)action)->category,


@@ -231,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_DEBUG
       ("Before share resources, the size of modified actions set is %d",

-       xbt_swag_size(surf_cpu_model->modified_set));
+       xbt_swag_size(surf_cpu_model->model_private->modified_set));

 
 

-  lmm_solve(surf_cpu_model->maxmin_system);
+  lmm_solve(surf_cpu_model->model_private->maxmin_system);

 
   XBT_DEBUG
       ("After share resources, The size of modified actions set is %d",
 
   XBT_DEBUG
       ("After share resources, The size of modified actions set is %d",

-       xbt_swag_size(surf_cpu_model->modified_set));
+       xbt_swag_size(surf_cpu_model->model_private->modified_set));

 
 

-  while((action = xbt_swag_extract(surf_cpu_model->modified_set))) {
+  while((action = xbt_swag_extract(surf_cpu_model->model_private->modified_set))) {

     int max_dur_flag = 0;
 
     if (GENERIC_ACTION(action).state_set !=
     int max_dur_flag = 0;
 
     if (GENERIC_ACTION(action).state_set !=


@@ -278,16 +278,16 @@ static double cpu_share_resources_lazy(double now)
         GENERIC_ACTION(action).max_duration);
 
     if (min != -1) {
         GENERIC_ACTION(action).max_duration);
 
     if (min != -1) {

-      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);
+      surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action);
+      surf_action_lmm_heap_insert(surf_cpu_model->model_private->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
       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(surf_cpu_model->action_heap) > 0)
-    min = xbt_heap_maxkey(surf_cpu_model->action_heap) - now;
+  if (xbt_heap_size(surf_cpu_model->model_private->action_heap) > 0)
+    min = xbt_heap_maxkey(surf_cpu_model->model_private->action_heap) - now;

   else
     min = -1;
 
   else
     min = -1;
 


@@ -304,22 +304,22 @@ static double cpu_share_resources_full(double now)
                                         xbt_swag_offset(action,
                                                         generic_lmm_action.
                                                         variable),
                                         xbt_swag_offset(action,
                                                         generic_lmm_action.
                                                         variable),

-                                        surf_cpu_model->maxmin_system, lmm_solve);
+                                        surf_cpu_model->model_private->maxmin_system, lmm_solve);

 }
 
 static void cpu_update_actions_state_lazy(double now, double delta)
 {
   surf_action_cpu_Cas01_t action;
 }
 
 static void cpu_update_actions_state_lazy(double now, double delta)
 {
   surf_action_cpu_Cas01_t action;

-  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);
+  while ((xbt_heap_size(surf_cpu_model->model_private->action_heap) > 0)
+         && (double_equals(xbt_heap_maxkey(surf_cpu_model->model_private->action_heap), now))) {
+    action = xbt_heap_pop(surf_cpu_model->model_private->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
     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

-                            (surf_cpu_model->maxmin_system,
+                            (surf_cpu_model->model_private->maxmin_system,

                              GENERIC_LMM_ACTION(action).variable, 0));
       TRACE_surf_host_set_utilization(cpu->generic_resource.name,
                                       ((surf_action_t)action)->category,
                              GENERIC_LMM_ACTION(action).variable, 0));
       TRACE_surf_host_set_utilization(cpu->generic_resource.name,
                                       ((surf_action_t)action)->category,


@@ -331,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);
     /* 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(surf_cpu_model->action_heap,(surf_action_lmm_t)action); //FIXME: strange call since action was already popped
+    surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action); //FIXME: strange call since action was already popped

   }
 #ifdef HAVE_TRACING
   if (TRACE_is_enabled()) {
   }
 #ifdef HAVE_TRACING
   if (TRACE_is_enabled()) {


@@ -366,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
     if (TRACE_is_enabled()) {
       cpu_Cas01_t x =
           lmm_constraint_id(lmm_get_cnst_from_var

-                            (surf_cpu_model->maxmin_system,
+                            (surf_cpu_model->model_private->maxmin_system,

                              GENERIC_LMM_ACTION(action).variable, 0));
 
       TRACE_surf_host_set_utilization(x->generic_resource.name,
                              GENERIC_LMM_ACTION(action).variable, 0));
 
       TRACE_surf_host_set_utilization(x->generic_resource.name,


@@ -409,7 +409,7 @@ static void cpu_update_resource_state(void *id,
 
   if (event_type == cpu->power_event) {
     cpu->power_scale = value;
 
   if (event_type == cpu->power_event) {
     cpu->power_scale = value;

-    lmm_update_constraint_bound(surf_cpu_model->maxmin_system, cpu->constraint,
+    lmm_update_constraint_bound(surf_cpu_model->model_private->maxmin_system, cpu->constraint,

                                 cpu->core * cpu->power_scale *
                                 cpu->power_peak);
 #ifdef HAVE_TRACING
                                 cpu->core * cpu->power_scale *
                                 cpu->power_peak);
 #ifdef HAVE_TRACING


@@ -418,9 +418,9 @@ static void cpu_update_resource_state(void *id,
                               cpu->power_peak);
 #endif
     while ((var = lmm_get_var_from_cnst
                               cpu->power_peak);
 #endif
     while ((var = lmm_get_var_from_cnst

-            (surf_cpu_model->maxmin_system, cpu->constraint, &elem))) {
+            (surf_cpu_model->model_private->maxmin_system, cpu->constraint, &elem))) {

       surf_action_cpu_Cas01_t action = lmm_variable_id(var);
       surf_action_cpu_Cas01_t action = lmm_variable_id(var);

-      lmm_update_variable_bound(surf_cpu_model->maxmin_system,
+      lmm_update_variable_bound(surf_cpu_model->model_private->maxmin_system,

                                 GENERIC_LMM_ACTION(action).variable,
                                 cpu->power_scale * cpu->power_peak);
     }
                                 GENERIC_LMM_ACTION(action).variable,
                                 cpu->power_scale * cpu->power_peak);
     }


@@ -434,7 +434,7 @@ static void cpu_update_resource_state(void *id,
 
       cpu->state_current = SURF_RESOURCE_OFF;
 
 
       cpu->state_current = SURF_RESOURCE_OFF;
 

-      while ((var = lmm_get_var_from_cnst(surf_cpu_model->maxmin_system, cnst, &elem))) {
+      while ((var = lmm_get_var_from_cnst(surf_cpu_model->model_private->maxmin_system, cnst, &elem))) {

         surf_action_t action = lmm_variable_id(var);
 
         if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
         surf_action_t action = lmm_variable_id(var);
 
         if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||


@@ -471,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 =
                                                    calloc but it seems to help valgrind... */
 
   GENERIC_LMM_ACTION(action).variable =

-      lmm_variable_new(surf_cpu_model->maxmin_system, action,
+      lmm_variable_new(surf_cpu_model->model_private->maxmin_system, action,

                        GENERIC_ACTION(action).priority,
                        CPU->power_scale * CPU->power_peak, 1);
                        GENERIC_ACTION(action).priority,
                        CPU->power_scale * CPU->power_peak, 1);

-  if (surf_cpu_model->update_mechanism == UM_LAZY) {
+  if (surf_cpu_model->model_private->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;
   }
     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(surf_cpu_model->maxmin_system, CPU->constraint,
+  lmm_expand(surf_cpu_model->model_private->maxmin_system, CPU->constraint,

              GENERIC_LMM_ACTION(action).variable, 1.0);
   XBT_OUT();
   return (surf_action_t) action;
              GENERIC_LMM_ACTION(action).variable, 1.0);
   XBT_OUT();
   return (surf_action_t) action;


@@ -506,14 +506,14 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration)
     xbt_swag_insert(action, ((surf_action_t) action)->state_set);
   }
 
     xbt_swag_insert(action, ((surf_action_t) action)->state_set);
   }
 

-  lmm_update_variable_weight(surf_cpu_model->maxmin_system,
+  lmm_update_variable_weight(surf_cpu_model->model_private->maxmin_system,

                              GENERIC_LMM_ACTION(action).variable, 0.0);
                              GENERIC_LMM_ACTION(action).variable, 0.0);

-  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);
+  if (surf_cpu_model->model_private->update_mechanism == UM_LAZY) {     // remove action from the heap
+    surf_action_lmm_heap_remove(surf_cpu_model->model_private->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
     // 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,surf_cpu_model->modified_set);
+    xbt_swag_insert_at_head(action,surf_cpu_model->model_private->modified_set);

   }
 
   XBT_OUT();
   }
 
   XBT_OUT();


@@ -524,12 +524,12 @@ static void cpu_action_suspend(surf_action_t action)
 {
   XBT_IN("(%p)", action);
   if (((surf_action_lmm_t) action)->suspended != 2) {
 {
   XBT_IN("(%p)", action);
   if (((surf_action_lmm_t) action)->suspended != 2) {

-    lmm_update_variable_weight(surf_cpu_model->maxmin_system,
+    lmm_update_variable_weight(surf_cpu_model->model_private->maxmin_system,

                                ((surf_action_lmm_t) action)->variable,
                                0.0);
     ((surf_action_lmm_t) action)->suspended = 1;
                                ((surf_action_lmm_t) action)->variable,
                                0.0);
     ((surf_action_lmm_t) action)->suspended = 1;

-    if (surf_cpu_model->update_mechanism == UM_LAZY)
-      surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
+    if (surf_cpu_model->model_private->update_mechanism == UM_LAZY)
+      surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action);

   }
   XBT_OUT();
 }
   }
   XBT_OUT();
 }


@@ -539,12 +539,12 @@ static void cpu_action_resume(surf_action_t action)
 
   XBT_IN("(%p)", action);
   if (((surf_action_lmm_t) action)->suspended != 2) {
 
   XBT_IN("(%p)", action);
   if (((surf_action_lmm_t) action)->suspended != 2) {

-    lmm_update_variable_weight(surf_cpu_model->maxmin_system,
+    lmm_update_variable_weight(surf_cpu_model->model_private->maxmin_system,

                                ((surf_action_lmm_t) action)->variable,
                                action->priority);
     ((surf_action_lmm_t) action)->suspended = 0;
                                ((surf_action_lmm_t) action)->variable,
                                action->priority);
     ((surf_action_lmm_t) action)->suspended = 0;

-    if (surf_cpu_model->update_mechanism == UM_LAZY)
-      surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
+    if (surf_cpu_model->model_private->update_mechanism == UM_LAZY)
+      surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action);

   }
   XBT_OUT();
 }
   }
   XBT_OUT();
 }


@@ -560,8 +560,8 @@ static void cpu_action_set_max_duration(surf_action_t action,
   XBT_IN("(%p,%g)", action, duration);
 
   action->max_duration = duration;
   XBT_IN("(%p,%g)", action, duration);
 
   action->max_duration = duration;

-  if (surf_cpu_model->update_mechanism == UM_LAZY)
-    surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
+  if (surf_cpu_model->model_private->update_mechanism == UM_LAZY)
+    surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action);

   XBT_OUT();
 }
 
   XBT_OUT();
 }
 


@@ -569,12 +569,12 @@ static void cpu_action_set_priority(surf_action_t action, double priority)
 {
   XBT_IN("(%p,%g)", action, priority);
   action->priority = priority;
 {
   XBT_IN("(%p,%g)", action, priority);
   action->priority = priority;

-  lmm_update_variable_weight(surf_cpu_model->maxmin_system,
+  lmm_update_variable_weight(surf_cpu_model->model_private->maxmin_system,

                              ((surf_action_lmm_t) action)->variable,
                              priority);
 
                              ((surf_action_lmm_t) action)->variable,
                              priority);
 

-  if (surf_cpu_model->update_mechanism == UM_LAZY)
-    surf_action_lmm_heap_remove(surf_cpu_model->action_heap,(surf_action_lmm_t)action);
+  if (surf_cpu_model->model_private->update_mechanism == UM_LAZY)
+    surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action);

   XBT_OUT();
 }
 
   XBT_OUT();
 }
 


@@ -592,7 +592,7 @@ static double cpu_action_get_remains(surf_action_t action)
 {
   XBT_IN("(%p)", action);
   /* update remains before return it */
 {
   XBT_IN("(%p)", action);
   /* update remains before return it */

-  if (surf_cpu_model->update_mechanism == UM_LAZY)
+  if (surf_cpu_model->model_private->update_mechanism == UM_LAZY)

     cpu_update_action_remaining_lazy((surf_action_cpu_Cas01_t)action,
         surf_get_clock());
   XBT_OUT();
     cpu_update_action_remaining_lazy((surf_action_cpu_Cas01_t)action,
         surf_get_clock());
   XBT_OUT();


@@ -617,12 +617,12 @@ static double cpu_get_available_speed(void *cpu)
 
 static void cpu_finalize(void)
 {
 
 static void cpu_finalize(void)
 {

-  lmm_system_free(surf_cpu_model->maxmin_system);
-  surf_cpu_model->maxmin_system = NULL;
+  lmm_system_free(surf_cpu_model->model_private->maxmin_system);
+  surf_cpu_model->model_private->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);
+  if (surf_cpu_model->model_private->action_heap)
+    xbt_heap_free(surf_cpu_model->model_private->action_heap);
+  xbt_swag_free(surf_cpu_model->model_private->modified_set);

 
   surf_model_exit(surf_cpu_model);
   surf_cpu_model = NULL;
 
   surf_model_exit(surf_cpu_model);
   surf_cpu_model = NULL;


@@ -643,11 +643,11 @@ static void surf_cpu_model_init_internal()
   surf_cpu_model = surf_model_init();
 
   if (!strcmp(optim, "Full")) {
   surf_cpu_model = surf_model_init();
 
   if (!strcmp(optim, "Full")) {

-    surf_cpu_model->update_mechanism = UM_FULL;
-    surf_cpu_model->selective_update = select;
+    surf_cpu_model->model_private->update_mechanism = UM_FULL;
+    surf_cpu_model->model_private->selective_update = select;

   } else if (!strcmp(optim, "Lazy")) {
   } else if (!strcmp(optim, "Lazy")) {

-    surf_cpu_model->update_mechanism = UM_LAZY;
-    surf_cpu_model->selective_update = 1;
+    surf_cpu_model->model_private->update_mechanism = UM_LAZY;
+    surf_cpu_model->model_private->selective_update = 1;

     xbt_assert((select == 1)
                ||
                (xbt_cfg_is_default_value
     xbt_assert((select == 1)
                ||
                (xbt_cfg_is_default_value


@@ -668,12 +668,12 @@ static void surf_cpu_model_init_internal()
 
   surf_cpu_model->model_private->resource_used = cpu_resource_used;
 
 
   surf_cpu_model->model_private->resource_used = cpu_resource_used;
 

-  if (surf_cpu_model->update_mechanism == UM_LAZY) {
+  if (surf_cpu_model->model_private->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;
     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 (surf_cpu_model->update_mechanism == UM_FULL) {
+  } else if (surf_cpu_model->model_private->update_mechanism == UM_FULL) {

     surf_cpu_model->model_private->share_resources =
         cpu_share_resources_full;
     surf_cpu_model->model_private->update_actions_state =
     surf_cpu_model->model_private->share_resources =
         cpu_share_resources_full;
     surf_cpu_model->model_private->update_actions_state =


@@ -705,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;
 
   surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
   surf_cpu_model->extension.cpu.add_traces = cpu_add_traces_cpu;
 

-  if (!surf_cpu_model->maxmin_system) {
-    surf_cpu_model->maxmin_system = lmm_system_new(surf_cpu_model->selective_update);
+  if (!surf_cpu_model->model_private->maxmin_system) {
+    surf_cpu_model->model_private->maxmin_system = lmm_system_new(surf_cpu_model->model_private->selective_update);

   }
   }

-  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,
+  if (surf_cpu_model->model_private->update_mechanism == UM_LAZY) {
+    surf_cpu_model->model_private->action_heap = xbt_heap_new(8, NULL);
+    xbt_heap_set_update_callback(surf_cpu_model->model_private->action_heap,

         surf_action_lmm_update_index_heap);
         surf_action_lmm_update_index_heap);

-    surf_cpu_model->modified_set =
+    surf_cpu_model->model_private->modified_set =

         xbt_swag_new(xbt_swag_offset(comp, generic_lmm_action.action_list_hookup));
         xbt_swag_new(xbt_swag_offset(comp, generic_lmm_action.action_list_hookup));

-    surf_cpu_model->maxmin_system->keep_track = surf_cpu_model->modified_set;
+    surf_cpu_model->model_private->maxmin_system->keep_track = surf_cpu_model->model_private->modified_set;

   }
 }
 
   }
 }
 

diff --git a/src/surf/network.c b/src/surf/network.c
index 6034747..9ba7180 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -173,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,
   link_CM02_t nw_link = (link_CM02_t)
       surf_resource_lmm_new(sizeof(s_link_CM02_t),
                             surf_network_model, name, properties,

-                            surf_network_model->maxmin_system,
+                            surf_network_model->model_private->maxmin_system,

                             sg_bandwidth_factor * bw_initial,
                             history,
                             state_initial, state_trace,
                             sg_bandwidth_factor * bw_initial,
                             history,
                             state_initial, state_trace,


@@ -292,7 +292,7 @@ static void net_define_callbacks(void)
 
 static int net_resource_used(void *resource_id)
 {
 
 static int net_resource_used(void *resource_id)
 {

-  return lmm_constraint_used(surf_network_model->maxmin_system, ((surf_resource_lmm_t)
+  return lmm_constraint_used(surf_network_model->model_private->maxmin_system, ((surf_resource_lmm_t)

                                                      resource_id)->
                              constraint);
 }
                                                      resource_id)->
                              constraint);
 }


@@ -303,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) {
   if (!action->refcount) {
     xbt_swag_remove(action, action->state_set);
     if (((surf_action_lmm_t)action)->variable) {

-      lmm_variable_free(surf_network_model->maxmin_system,
+      lmm_variable_free(surf_network_model->model_private->maxmin_system,

                         ((surf_action_lmm_t) action)->variable);
     }
                         ((surf_action_lmm_t) action)->variable);
     }

-    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);
+    if (surf_network_model->model_private->update_mechanism == UM_LAZY) {  // remove action from the heap
+      surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t) action);
+      xbt_swag_remove(action, surf_network_model->model_private->modified_set);

     }
 #ifdef HAVE_TRACING
     if (action->category) xbt_free (action->category);
     }
 #ifdef HAVE_TRACING
     if (action->category) xbt_free (action->category);


@@ -325,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);
 {
   XBT_DEBUG("cancel action %p", action);
   surf_network_model->action_state_set(action, SURF_ACTION_FAILED);

-  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);
+  if (surf_network_model->model_private->update_mechanism == UM_LAZY) {    // remove action from the heap
+    xbt_swag_remove(action, surf_network_model->model_private->modified_set);
+    surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t) action);

   }
 }
 
   }
 }
 


@@ -347,7 +347,7 @@ double net_action_get_remains(surf_action_t action)
 {
   XBT_IN("(%p)", action);
   /* update remains before return it */
 {
   XBT_IN("(%p)", action);
   /* update remains before return it */

-  if (surf_network_model->update_mechanism == UM_LAZY)      /* update remains before return it */
+  if (surf_network_model->model_private->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();
     net_update_action_remaining_lazy((surf_action_network_CM02_t)action,
         surf_get_clock());
   XBT_OUT();


@@ -375,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_network_model->action_state_set((surf_action_t) action,
         SURF_ACTION_DONE);
 

-    surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
+    surf_action_lmm_heap_remove(surf_network_model->model_private->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);
   } 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(surf_network_model->action_heap,(surf_action_lmm_t)action);
+    surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t)action);

   }
 
   GENERIC_LMM_ACTION(action).last_update = now;
   }
 
   GENERIC_LMM_ACTION(action).last_update = now;


@@ -399,7 +399,7 @@ static double net_share_resources_full(double now)
   min = generic_maxmin_share_resources(running_actions,
                                        xbt_swag_offset(s_action,
                                                        variable),
   min = generic_maxmin_share_resources(running_actions,
                                        xbt_swag_offset(s_action,
                                                        variable),

-                                                       surf_network_model->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)  )))
                                        network_solve);
 
 #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable)  )))


@@ -430,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_DEBUG
       ("Before share resources, the size of modified actions set is %d",

-       xbt_swag_size(surf_network_model->modified_set));
+       xbt_swag_size(surf_network_model->model_private->modified_set));

 
 

-  lmm_solve(surf_network_model->maxmin_system);
+  lmm_solve(surf_network_model->model_private->maxmin_system);

 
   XBT_DEBUG
       ("After share resources, The size of modified actions set is %d",
 
   XBT_DEBUG
       ("After share resources, The size of modified actions set is %d",

-       xbt_swag_size(surf_network_model->modified_set));
+       xbt_swag_size(surf_network_model->model_private->modified_set));

 
 

-  while((action = xbt_swag_extract(surf_network_model->modified_set))) {
+  while((action = xbt_swag_extract(surf_network_model->model_private->modified_set))) {

     int max_dur_flag = 0;
 
     if (GENERIC_ACTION(action).state_set !=
     int max_dur_flag = 0;
 
     if (GENERIC_ACTION(action).state_set !=


@@ -477,16 +477,16 @@ static double net_share_resources_lazy(double now)
               GENERIC_ACTION(action).max_duration);
 
     if (min != -1) {
               GENERIC_ACTION(action).max_duration);
 
     if (min != -1) {

-      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);
+      surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t)action);
+      surf_action_lmm_heap_insert(surf_network_model->model_private->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
       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(surf_network_model->action_heap) > 0)
-    min = xbt_heap_maxkey(surf_network_model->action_heap) - now;
+  if (xbt_heap_size(surf_network_model->model_private->action_heap) > 0)
+    min = xbt_heap_maxkey(surf_network_model->model_private->action_heap) - now;

   else
     min = -1;
 
   else
     min = -1;
 


@@ -518,22 +518,22 @@ 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))
         action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(GENERIC_LMM_ACTION(action).suspended))

-        lmm_update_variable_weight(surf_network_model->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);
     }
 #ifdef HAVE_TRACING
     if (TRACE_is_enabled()) {
                                    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);
+      int n = lmm_get_number_of_cnst_from_var(surf_network_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable);

       unsigned int i;
       for (i = 0; i < n; i++){
       unsigned int i;
       for (i = 0; i < n; i++){

-        lmm_constraint_t constraint = lmm_get_cnst_from_var(network_maxmin_system,
+        lmm_constraint_t constraint = lmm_get_cnst_from_var(surf_network_model->model_private->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)*
                                                             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)*

-                                        lmm_get_cnst_weight_from_var(network_maxmin_system,
+                                        lmm_get_cnst_weight_from_var(surf_network_model->model_private->maxmin_system,

                                             GENERIC_LMM_ACTION(action).variable,
                                             i)),
                                         now - delta,
                                             GENERIC_LMM_ACTION(action).variable,
                                             i)),
                                         now - delta,


@@ -542,7 +542,7 @@ static void net_update_actions_state_full(double now, double delta)
     }
 #endif
     if (!lmm_get_number_of_cnst_from_var
     }
 #endif
     if (!lmm_get_number_of_cnst_from_var

-        (surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable)) {
+        (surf_network_model->model_private->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.
       /* 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.


@@ -580,24 +580,24 @@ static void net_update_actions_state_lazy(double now, double delta)
 {
   surf_action_network_CM02_t action = NULL;
 
 {
   surf_action_network_CM02_t action = NULL;
 

-  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);
+  while ((xbt_heap_size(surf_network_model->model_private->action_heap) > 0)
+         && (double_equals(xbt_heap_maxkey(surf_network_model->model_private->action_heap), now))) {
+    action = xbt_heap_pop(surf_network_model->model_private->action_heap);

     XBT_DEBUG("Action %p: finish", action);
     GENERIC_ACTION(action).finish = surf_get_clock();
 #ifdef HAVE_TRACING
     if (TRACE_is_enabled()) {
     XBT_DEBUG("Action %p: finish", action);
     GENERIC_ACTION(action).finish = surf_get_clock();
 #ifdef HAVE_TRACING
     if (TRACE_is_enabled()) {

-      int n = lmm_get_number_of_cnst_from_var(network_maxmin_system, GENERIC_LMM_ACTION(action).variable);
+      int n = lmm_get_number_of_cnst_from_var(surf_network_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable);

       unsigned int i;
       for (i = 0; i < n; i++){
       unsigned int i;
       for (i = 0; i < n; i++){

-        lmm_constraint_t constraint = lmm_get_cnst_from_var(network_maxmin_system,
+        lmm_constraint_t constraint = lmm_get_cnst_from_var(surf_network_model->model_private->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)*
                                                             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)*

-                                            lmm_get_cnst_weight_from_var(network_maxmin_system,
+                                            lmm_get_cnst_weight_from_var(surf_network_model->model_private->maxmin_system,

                                                 GENERIC_LMM_ACTION(action).variable,
                                                 i)),
                                         GENERIC_LMM_ACTION(action).last_update,
                                                 GENERIC_LMM_ACTION(action).variable,
                                                 i)),
                                         GENERIC_LMM_ACTION(action).last_update,


@@ -608,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) {
 
     // if I am wearing a latency hat
     if (GENERIC_LMM_ACTION(action).hat == LATENCY) {

-      lmm_update_variable_weight(surf_network_model->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);
                                  action->weight);

-      surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
+      surf_action_lmm_heap_remove(surf_network_model->model_private->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
       GENERIC_LMM_ACTION(action).last_update = surf_get_clock();
 
       // if I am wearing a max_duration or normal hat


@@ -622,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_t)action)->finish = surf_get_clock();
       surf_network_model->action_state_set((surf_action_t) action,
                                            SURF_ACTION_DONE);

-      surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action);
+      surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t)action);

     }
   }
   return;
     }
   }
   return;


@@ -647,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;
     surf_action_network_CM02_t action = NULL;
 
     nw_link->lmm_resource.power.peak = value;

-    lmm_update_constraint_bound(surf_network_model->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 *
                                 nw_link->lmm_resource.constraint,
                                 sg_bandwidth_factor *
                                 (nw_link->lmm_resource.power.peak *


@@ -663,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
 #endif
     if (sg_weight_S_parameter > 0) {
       while ((var = lmm_get_var_from_cnst

-              (surf_network_model->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))
                &elem))) {
         action = lmm_variable_id(var);
         action->weight += delta;
         if (!(GENERIC_LMM_ACTION(action).suspended))

-          lmm_update_variable_weight(surf_network_model->maxmin_system,
+          lmm_update_variable_weight(surf_network_model->model_private->maxmin_system,

                                      GENERIC_LMM_ACTION(action).variable, action->weight);
       }
     }
                                      GENERIC_LMM_ACTION(action).variable, action->weight);
       }
     }


@@ -682,17 +682,17 @@ static void net_update_resource_state(void *id,
 
     nw_link->lat_current = value;
     while ((var = lmm_get_var_from_cnst
 
     nw_link->lat_current = value;
     while ((var = lmm_get_var_from_cnst

-            (surf_network_model->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)
              &elem))) {
       action = lmm_variable_id(var);
       action->lat_current += delta;
       action->weight += delta;
       if (action->rate < 0)

-        lmm_update_variable_bound(surf_network_model->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 {
                                   sg_tcp_gamma / (2.0 *
                                                   action->lat_current));
       else {

-        lmm_update_variable_bound(surf_network_model->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->
                                   min(action->rate,
                                       sg_tcp_gamma / (2.0 *
                                                       action->


@@ -706,7 +706,7 @@ static void net_update_resource_state(void *id,
         }
       }
       if (!(GENERIC_LMM_ACTION(action).suspended))
         }
       }
       if (!(GENERIC_LMM_ACTION(action).suspended))

-        lmm_update_variable_weight(surf_network_model->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);
 
     }
                                    action->weight);
 
     }


@@ -722,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
 
       nw_link->lmm_resource.state_current = SURF_RESOURCE_OFF;
       while ((var = lmm_get_var_from_cnst

-              (surf_network_model->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 ||
         surf_action_t action = lmm_variable_id(var);
 
         if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||


@@ -794,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;
 
   xbt_swag_insert(action, ((surf_action_t)action)->state_set);
   action->rate = rate;

-  if (surf_network_model->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();
   }
     GENERIC_LMM_ACTION(action).index_heap = -1;
     GENERIC_LMM_ACTION(action).last_update = surf_get_clock();
   }


@@ -835,27 +835,27 @@ static surf_action_t net_communicate(sg_routing_edge_t src,
 
   if (action->latency > 0) {
     GENERIC_LMM_ACTION(action).variable =
 
   if (action->latency > 0) {
     GENERIC_LMM_ACTION(action).variable =

-        lmm_variable_new(surf_network_model->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);
                          constraints_per_variable);

-    if (surf_network_model->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);
       // 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(surf_network_model->action_heap,(surf_action_lmm_t)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 =
                   xbt_dynar_is_empty(route) ? NORMAL : LATENCY);
     }
   } else
     GENERIC_LMM_ACTION(action).variable =

-        lmm_variable_new(surf_network_model->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) {
                          constraints_per_variable);
 
   if (action->rate < 0) {

-    lmm_update_variable_bound(surf_network_model->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 {
                               (action->lat_current > 0) ?
                               sg_tcp_gamma / (2.0 *
                                               action->lat_current) : -1.0);
   } else {

-    lmm_update_variable_bound(surf_network_model->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 *
                               (action->lat_current > 0) ?
                               min(action->rate,
                                   sg_tcp_gamma / (2.0 *


@@ -864,14 +864,14 @@ static surf_action_t net_communicate(sg_routing_edge_t src,
   }
 
   xbt_dynar_foreach(route, i, link) {
   }
 
   xbt_dynar_foreach(route, i, link) {

-    lmm_expand(surf_network_model->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) {
                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(surf_network_model->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);
     }
   }
                  GENERIC_LMM_ACTION(action).variable, .05);
     }
   }


@@ -909,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;
 static void net_action_suspend(surf_action_t action)
 {
   ((surf_action_network_CM02_t) action)->generic_lmm_action.suspended = 1;

-  lmm_update_variable_weight(surf_network_model->maxmin_system,
+  lmm_update_variable_weight(surf_network_model->model_private->maxmin_system,

                              ((surf_action_network_CM02_t)
                               action)->generic_lmm_action.variable, 0.0);
 
                              ((surf_action_network_CM02_t)
                               action)->generic_lmm_action.variable, 0.0);
 

-  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);
+  if (surf_network_model->model_private->update_mechanism == UM_LAZY)      // remove action from the heap
+    surf_action_lmm_heap_remove(surf_network_model->model_private->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) {
 }
 
 static void net_action_resume(surf_action_t action)
 {
   if (((surf_action_network_CM02_t) action)->generic_lmm_action.suspended) {

-    lmm_update_variable_weight(surf_network_model->maxmin_system,
+    lmm_update_variable_weight(surf_network_model->model_private->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;
                                ((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 (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);
+    if (surf_network_model->model_private->update_mechanism == UM_LAZY)    // remove action from the heap
+      surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t)action);

   }
 }
 
   }
 }
 


@@ -939,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;
 void net_action_set_max_duration(surf_action_t action, double duration)
 {
   action->max_duration = duration;

-  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);
+  if (surf_network_model->model_private->update_mechanism == UM_LAZY)      // remove action from the heap
+    surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t)action);

 }
 
 #ifdef HAVE_TRACING
 }
 
 #ifdef HAVE_TRACING


@@ -953,12 +953,12 @@ static void net_action_set_category(surf_action_t action,
 
 static void net_finalize(void)
 {
 
 static void net_finalize(void)
 {

-  lmm_system_free(surf_network_model->maxmin_system);
-  surf_network_model->maxmin_system = NULL;
+  lmm_system_free(surf_network_model->model_private->maxmin_system);
+  surf_network_model->model_private->maxmin_system = NULL;

 
 

-  if (surf_network_model->update_mechanism == UM_LAZY) {
-    xbt_heap_free(surf_network_model->action_heap);
-    xbt_swag_free(surf_network_model->modified_set);
+  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);

   }
 
   surf_model_exit(surf_network_model);
   }
 
   surf_model_exit(surf_network_model);


@@ -1039,11 +1039,11 @@ static void set_update_mechanism(void)
       xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update");
 
   if (!strcmp(optim, "Full")) {
       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;
+    surf_network_model->model_private->update_mechanism = UM_FULL;
+    surf_network_model->model_private->selective_update = select;

   } else if (!strcmp(optim, "Lazy")) {
   } else if (!strcmp(optim, "Lazy")) {

-    surf_network_model->update_mechanism = UM_LAZY;
-    surf_network_model->selective_update = 1;
+    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
     xbt_assert((select == 1)
                ||
                (xbt_cfg_is_default_value


@@ -1074,12 +1074,12 @@ static void surf_network_model_init_internal(void)
 #endif
 
   surf_network_model->model_private->resource_used = net_resource_used;
 #endif
 
   surf_network_model->model_private->resource_used = net_resource_used;

-  if (surf_network_model->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;
     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 (surf_network_model->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 =
     surf_network_model->model_private->share_resources =
         net_share_resources_full;
     surf_network_model->model_private->update_actions_state =


@@ -1106,21 +1106,21 @@ static void surf_network_model_init_internal(void)
   surf_network_model->extension.network.create_resource =
       net_create_resource;
 
   surf_network_model->extension.network.create_resource =
       net_create_resource;
 

-  if (!surf_network_model->maxmin_system)
-    surf_network_model->maxmin_system = lmm_system_new(surf_network_model->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(net_create_resource("__loopback__",
                                            498000000, NULL, 0.000015, NULL,
                                            SURF_RESOURCE_ON, NULL,
                                            SURF_LINK_FATPIPE, NULL));
 
 
   routing_model_create(net_create_resource("__loopback__",
                                            498000000, NULL, 0.000015, NULL,
                                            SURF_RESOURCE_ON, NULL,
                                            SURF_LINK_FATPIPE, NULL));
 

-  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,
+  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_action_lmm_update_index_heap);

-    surf_network_model->modified_set =
+    surf_network_model->model_private->modified_set =

         xbt_swag_new(xbt_swag_offset(comm, generic_lmm_action.action_list_hookup));
         xbt_swag_new(xbt_swag_offset(comm, generic_lmm_action.action_list_hookup));

-    surf_network_model->maxmin_system->keep_track = surf_network_model->modified_set;
+    surf_network_model->model_private->maxmin_system->keep_track = surf_network_model->model_private->modified_set;

   }
 }
 
   }
 }
 

diff --git a/src/surf/surf_model.c b/src/surf/surf_model.c
index 3e387cd..da1bdd7 100644 (file)
--- a/src/surf/surf_model.c
+++ b/src/surf/surf_model.c
@@ -46,10 +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->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;
+  model->model_private->modified_set = NULL;
+  model->model_private->action_heap = NULL;
+  model->model_private->update_mechanism = UM_UNDEFINED;
+  model->model_private->selective_update = 0;

 
   return model;
 }
 
   return model;
 }

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 1fe0b96..e714b8d 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -33,6 +33,12 @@ extern int sg_gtnets_jitter_seed;
 
 extern const char *surf_action_state_names[6];
 
 
 extern const char *surf_action_state_names[6];
 

+typedef enum {
+  UM_FULL,
+  UM_LAZY,
+  UM_UNDEFINED
+} e_UM_t;
+

 typedef struct surf_model_private {
   int (*resource_used) (void *resource_id);
   /* Share the resources to the actions and return in how much time
 typedef struct surf_model_private {
   int (*resource_used) (void *resource_id);
   /* Share the resources to the actions and return in how much time


@@ -43,6 +49,13 @@ typedef struct surf_model_private {
   void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
                                  double value, double time);
   void (*finalize) (void);
   void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
                                  double value, double time);
   void (*finalize) (void);

+
+  lmm_system_t maxmin_system;
+  e_UM_t update_mechanism;
+  xbt_swag_t modified_set;
+  xbt_heap_t action_heap;
+  int selective_update;
+

 } s_surf_model_private_t;
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
 } s_surf_model_private_t;
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,