Indent the rest of the code (examples, buildtools, doc...) except for examples/SMPI...

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

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index 442fe61..75c08d3 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -1,8 +1,7 @@
-/*     $Id$     */
-
 /* A few basic tests for the surf library                                   */
 
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
@@ -15,7 +14,8 @@
 #include "surf/surf.h"
 
 #include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
+                             "Messages specific for surf example");
 
 const char *string_action(e_surf_action_state_t state);
 const char *string_action(e_surf_action_state_t state)
@@ -59,12 +59,12 @@ void test(char *platform)
 
   /*********************** CPU ***********************************/
   DEBUG1("%p", surf_cpu_model);
-  cpuA = surf_model_resource_by_name(surf_cpu_model,"Cpu A");
-  cpuB = surf_model_resource_by_name(surf_cpu_model,"Cpu B");
+  cpuA = surf_model_resource_by_name(surf_cpu_model, "Cpu A");
+  cpuB = surf_model_resource_by_name(surf_cpu_model, "Cpu B");
 
   /* Let's check that those two processors exist */
-  DEBUG2("%s : %p",surf_resource_name(cpuA), cpuA);
-  DEBUG2("%s : %p",surf_resource_name(cpuB), cpuB);
+  DEBUG2("%s : %p", surf_resource_name(cpuA), cpuA);
+  DEBUG2("%s : %p", surf_resource_name(cpuB), cpuB);
 
   /* Let's do something on it */
   actionA = surf_cpu_model->extension.cpu.execute(cpuA, 1000.0);
@@ -72,9 +72,9 @@ void test(char *platform)
   actionC = surf_cpu_model->extension.cpu.sleep(cpuB, 7.32);
 
   /* Use whatever calling style you want... */
-  stateActionA = surf_cpu_model->action_state_get(actionA);      /* When you know actionA model type */
-  stateActionB = actionB->model_type->action_state_get(actionB); /* If you're unsure about it's model type */
-  stateActionC = surf_cpu_model->action_state_get(actionC);      /* When you know actionA model type */
+  stateActionA = surf_cpu_model->action_state_get(actionA);     /* When you know actionA model type */
+  stateActionB = actionB->model_type->action_state_get(actionB);        /* If you're unsure about it's model type */
+  stateActionC = surf_cpu_model->action_state_get(actionC);     /* When you know actionA model type */
 
   /* And just look at the state of these tasks */
   DEBUG2("actionA : %p (%s)", actionA, string_action(stateActionA));
@@ -83,8 +83,8 @@ void test(char *platform)
 
   /*********************** Network *******************************/
   DEBUG1("%p", surf_network_model);
-  cardA = surf_model_resource_by_name(surf_network_model,"Cpu A");
-  cardB = surf_model_resource_by_name(surf_network_model,"Cpu B");
+  cardA = surf_model_resource_by_name(surf_network_model, "Cpu A");
+  cardB = surf_model_resource_by_name(surf_network_model, "Cpu B");
 
   /* Let's check that those two processors exist */
   DEBUG2("%s : %p", surf_resource_name(cardA), cardA);
@@ -92,8 +92,8 @@ void test(char *platform)
 
   /* Let's do something on it */
   commAB =
-    surf_network_model->extension.network.communicate(cardA, cardB,
-                                                      150.0, -1.0);
+      surf_network_model->extension.network.communicate("Cpu A", "Cpu B",
+                                                        150.0, -1.0);
 
   surf_solve();                 /* Takes traces into account. Returns 0.0 */
   do {
@@ -113,17 +113,21 @@ void test(char *platform)
     }
     DEBUG0("\t Network actions");
     while ((action =
-            xbt_swag_extract(surf_network_model->states.failed_action_set))) {
+            xbt_swag_extract(surf_network_model->states.
+                             failed_action_set))) {
       DEBUG1("\t * Failed : %p", action);
       action->model_type->action_unref(action);
     }
     while ((action =
-            xbt_swag_extract(surf_network_model->states.done_action_set))) {
+            xbt_swag_extract(surf_network_model->states.
+                             done_action_set))) {
       DEBUG1("\t * Done : %p", action);
       action->model_type->action_unref(action);
     }
 
-  } while (surf_solve() >= 0.0);
+  } while ((xbt_swag_size(surf_network_model->states.running_action_set) ||
+            xbt_swag_size(surf_cpu_model->states.running_action_set)) &&
+           surf_solve() >= 0.0);
 
   DEBUG0("Simulation Terminated");
 }