Today Martin Quinson wrote :

> You broke your SURF duude !
> 2 tests of 14 failed:
>   surf/surf_usage --surf-path=./surf/ platform.xml (returned 139)
>   surf/surf_usage2 --surf-path=./surf/ platform.xml (returned 139)

Thanks. It's fixed now. I can't believe it didn't failed while using MSG. Looking a little bit closer, it makes sense but it was really close...

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 31307f6..8e087a9 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -129,7 +129,7 @@ static void action_change_state(surf_action_t action,
 {
   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
     if(((surf_action_cpu_t)action)->variable) {
-      lmm_variable_free(maxmin_system, ((surf_action_cpu_t)action)->variable);
+      lmm_variable_disable(maxmin_system, ((surf_action_cpu_t)action)->variable);
       ((surf_action_cpu_t)action)->variable = NULL;
     }
 
@@ -185,9 +185,9 @@ static void update_actions_state(double now, double delta)
     }
   }
 
-  xbt_swag_foreach_safe(action, next_action, failed_actions) {
-    lmm_variable_disable(maxmin_system, action->variable);
-  }
+/*   xbt_swag_foreach_safe(action, next_action, failed_actions) { */
+/*     lmm_variable_disable(maxmin_system, action->variable); */
+/*   } */
 
   return;
 }

diff --git a/src/surf/network.c b/src/surf/network.c
index 0590f9a..a51d30c 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -233,7 +233,7 @@ static void action_change_state(surf_action_t action,
 {
   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
     if(((surf_action_network_t)action)->variable) {
-      lmm_variable_free(maxmin_system, ((surf_action_network_t)action)->variable);
+      lmm_variable_disable(maxmin_system, ((surf_action_network_t)action)->variable);
       ((surf_action_network_t)action)->variable = NULL;
     }
 
@@ -315,9 +315,9 @@ static void update_actions_state(double now, double delta)
     }
   }
 
-  xbt_swag_foreach_safe(action, next_action, failed_actions) {
-    lmm_variable_disable(maxmin_system, action->variable);
-  }
+/*   xbt_swag_foreach_safe(action, next_action, failed_actions) { */
+/*     lmm_variable_disable(maxmin_system, action->variable); */
+/*   } */
 
   return;
 }

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 8c13426..1514f84 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -396,7 +396,7 @@ static void action_network_KCCFLN05_change_state(surf_action_t action,
 {
   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
     if(((surf_action_network_KCCFLN05_t)action)->variable) {
-      lmm_variable_free(maxmin_system, ((surf_action_network_KCCFLN05_t)action)->variable);
+      lmm_variable_disable(maxmin_system, ((surf_action_network_KCCFLN05_t)action)->variable);
       ((surf_action_network_KCCFLN05_t)action)->variable = NULL;
     }
   surf_action_change_state(action, state);
@@ -430,9 +430,9 @@ static void update_actions_network_KCCFLN05_state(double now, double delta)
     }
   }
 
-  xbt_swag_foreach_safe(action, next_action, failed_actions) {
-    lmm_variable_disable(maxmin_system_network_KCCFLN05, action->variable);
-  }
+/*   xbt_swag_foreach_safe(action, next_action, failed_actions) { */
+/*     lmm_variable_disable(maxmin_system_network_KCCFLN05, action->variable); */
+/*   } */
 
   return;
 }
@@ -515,7 +515,7 @@ static void action_cpu_KCCFLN05_change_state(surf_action_t action,
 {
   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
     if(((surf_action_cpu_KCCFLN05_t)action)->variable) {
-      lmm_variable_free(maxmin_system, ((surf_action_cpu_KCCFLN05_t)action)->variable);
+      lmm_variable_disable(maxmin_system, ((surf_action_cpu_KCCFLN05_t)action)->variable);
       ((surf_action_cpu_KCCFLN05_t)action)->variable = NULL;
     }
 
@@ -635,9 +635,9 @@ static void update_actions_cpu_KCCFLN05_state(double now, double delta)
     }
   }
 
-  xbt_swag_foreach_safe(action, next_action, failed_actions) {
-    lmm_variable_disable(maxmin_system_cpu_KCCFLN05, action->variable);
-  }
+/*   xbt_swag_foreach_safe(action, next_action, failed_actions) { */
+/*     lmm_variable_disable(maxmin_system_cpu_KCCFLN05, action->variable); */
+/*   } */
 
   return;
 }