Merge branch 'mc' into mc++

[simgrid.git] / teshsuite / simdag / network / mxn / test_intra_independent_comm.c

diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.c b/teshsuite/simdag/network/mxn/test_intra_independent_comm.c
index a201a84..e7baa31 100644 (file)
--- a/teshsuite/simdag/network/mxn/test_intra_independent_comm.c
+++ b/teshsuite/simdag/network/mxn/test_intra_independent_comm.c
@@ -1,10 +1,10 @@
+/* Latency tests                                                            */
 
-/*
- * SimDag
- * Latency tests
- * Copyright (C) 2007 
- * Sascha Hunold, Frederic Suter
- */
+/* Copyright (c) 2007, 2009-2011, 2013-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. */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,20 +21,21 @@
  * should be 1 + 2 latency = 3
  */
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
   double time;
   SD_task_t task;
-  
-  double communication_amount[] = 
-       {     0.0, 1.0, 0.0, 0.0,
-                 0.0, 0.0, 0.0, 0.0,
-                 0.0, 0.0, 0.0, 1.0,
-                 0.0, 0.0, 0.0, 0.0,
-       };
-  
+  xbt_dynar_t ret;
+
+  double communication_amount[] = { 0.0, 1.0, 0.0, 0.0,
+    0.0, 0.0, 0.0, 0.0,
+    0.0, 0.0, 0.0, 1.0,
+    0.0, 0.0, 0.0, 0.0,
+  };
+
   double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
 
-  
+
   /***************************************/
 
   SD_init(&argc, argv);
@@ -42,19 +43,20 @@ int main(int argc, char **argv) {
 
   task = SD_task_create("Comm 1", NULL, 1.0);
 
-  SD_task_schedule(task, 4, SD_workstation_get_list(), no_cost, communication_amount, -1.0);
-  
-  SD_simulate(-1.0);
-  
+  SD_task_schedule(task, 4, SD_workstation_get_list(), no_cost,
+                   communication_amount, -1.0);
+
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+
   time = SD_get_clock();
 
   printf("%g\n", time);
   fflush(stdout);
 
   SD_task_destroy(task);
-  
+
   SD_exit();
-  
+
   return 0;
 }
-