Try again, with a reduced size.

[simgrid.git] / testsuite / surf / surf_usage2.c

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 9ff6cb8..2e633a9 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -1,10 +1,11 @@
 /* A few basic tests for the surf library                                   */
 
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
@@ -80,15 +81,15 @@ void test(char *platform)
 
     xbt_dynar_foreach(model_list, iter, model) {
       XBT_DEBUG("\t %s actions", surf_model_name(model));
-      while ((action = xbt_swag_extract(surf_model_failed_action_set((surf_model_t)model)))) {
+      while ((action = surf_model_extract_failed_action_set((surf_model_t)model))) {
         XBT_DEBUG("\t * Failed : %p", action);
         surf_action_unref(action);
       }
-      while ((action = xbt_swag_extract(surf_model_done_action_set((surf_model_t)model)))) {
+      while ((action = surf_model_extract_done_action_set((surf_model_t)model))) {
         XBT_DEBUG("\t * Done : %p", action);
         surf_action_unref(action);
       }
-      if (xbt_swag_size(surf_model_running_action_set((surf_model_t)model))) {
+      if (surf_model_running_action_set_size((surf_model_t)model)) {
         XBT_DEBUG("running %s", surf_model_name(model));
         running = 1;
       }