Use xbt_swag_reset wherever possible.

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 7a1a385..3f1ceb9 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -248,7 +248,7 @@ xbt_swag_t SD_simulate_swag(double how_long) {
 
   sd_global->watch_point_reached = 0;
 
-  while(xbt_swag_extract(sd_global->return_set)) {}
+  xbt_swag_reset(sd_global->return_set);
 
   /* explore the runnable tasks */
   xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) {

diff --git a/src/surf/fair_bottleneck.c b/src/surf/fair_bottleneck.c
index ce44b58..aa9c4fa 100644 (file)
--- a/src/surf/fair_bottleneck.c
+++ b/src/surf/fair_bottleneck.c
@@ -172,9 +172,7 @@ void bottleneck_solve(lmm_system_t sys)
     }
   } while (xbt_swag_size(var_list));
 
-  xbt_swag_foreach_safe(cnst, cnst_next, cnst_list) {
-    xbt_swag_remove(cnst, cnst_list);
-  }
+  xbt_swag_reset(cnst_list);
   sys->modified = 0;
   if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
     XBT_DEBUG("Fair bottleneck done");

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 34c6d4c..cf9b27d 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -808,11 +808,5 @@ static void lmm_update_modified_set(lmm_system_t sys,
  */
 static void lmm_remove_all_modified_set(lmm_system_t sys)
 {
-  xbt_swag_t modified_constraint_set = &sys->modified_constraint_set;
-  lmm_constraint_t cnst;
-  lmm_constraint_t cnst_next;
-
-  xbt_swag_foreach_safe(cnst, cnst_next, modified_constraint_set) {
-    xbt_swag_remove(cnst, modified_constraint_set);
-  }
+  xbt_swag_reset(&sys->modified_constraint_set);
 }