X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..94bd12b1cb7ddb932bb6dceeb098cfa236b31841:/src/surf/cpu_cas01.c

diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c
index 8de56eda93..6ba5ee425a 100644
--- a/src/surf/cpu_cas01.c
+++ b/src/surf/cpu_cas01.c
@@ -10,7 +10,7 @@
 surf_model_t surf_cpu_model = NULL;
 lmm_system_t cpu_maxmin_system = NULL;
 e_UM_t cpu_update_mechanism = UM_UNDEFINED;
-static int selective_update = 0;
+static int cpu_selective_update = 0;
 
 static xbt_swag_t cpu_modified_cpu = NULL;
 static xbt_heap_t cpu_action_heap = NULL;
@@ -305,9 +305,9 @@ static double cpu_share_resources_lazy(double now)
 }
 
 static double cpu_share_resources_full(double now) {
-  surf_action_cpu_Cas01_t action;
+  s_surf_action_cpu_Cas01_t action;
   return generic_maxmin_share_resources(surf_cpu_model->states.running_action_set,
-      xbt_swag_offset(*action, generic_lmm_action.variable),
+      xbt_swag_offset(action, generic_lmm_action.variable),
       cpu_maxmin_system, lmm_solve);
 }
 
@@ -434,8 +434,6 @@ static void cpu_update_resource_state(void *id,
       cpu->state_current = SURF_RESOURCE_ON;
     else {
       lmm_constraint_t cnst = cpu->constraint;
-      lmm_variable_t var = NULL;
-      lmm_element_t elem = NULL;
 
       cpu->state_current = SURF_RESOURCE_OFF;
 
@@ -702,7 +700,7 @@ static void surf_cpu_model_init_internal()
   surf_cpu_model->extension.cpu.add_traces = cpu_add_traces_cpu;
 
   if (!cpu_maxmin_system) {
-    cpu_maxmin_system = lmm_system_new(selective_update);
+    cpu_maxmin_system = lmm_system_new(cpu_selective_update);
   }
   if(cpu_update_mechanism == UM_LAZY){
     cpu_action_heap = xbt_heap_new(8, NULL);
@@ -736,10 +734,10 @@ void surf_cpu_model_init_Cas01()
 
   if(!strcmp(optim,"Full")) {
     cpu_update_mechanism = UM_FULL;
-    selective_update = select;
+    cpu_selective_update = select;
   } else if (!strcmp(optim,"Lazy")) {
     cpu_update_mechanism = UM_LAZY;
-    selective_update = 1;
+    cpu_selective_update = 1;
     xbt_assert((select==1) || (xbt_cfg_is_default_value(_surf_cfg_set,"cpu/maxmin_selective_update")),
         "Disabling selective update while using the lazy update mechanism is dumb!");
   } else if (!strcmp(optim,"TI")) {