X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..347996b4a10c4e8579080692afa60e0afb88b60a:/teshsuite/simdag/network/mxn/test_intra_all2all.c

diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.c b/teshsuite/simdag/network/mxn/test_intra_all2all.c
index e864eb5ab4..7e746af047 100644
--- a/teshsuite/simdag/network/mxn/test_intra_all2all.c
+++ b/teshsuite/simdag/network/mxn/test_intra_all2all.c
@@ -1,15 +1,13 @@
 /* Latency tests                                                            */
 
-/* Copyright (c) 2007, 2009-2011, 2013-2014. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2011, 2013-2015. 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>
-
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 
 /*
  * intra communication test
@@ -18,45 +16,31 @@
  * send 1 byte from all to all
  * + 2 secs latency
  * should be 8  (platform_4p_1switch.xml)
- * 
  */
 
 int main(int argc, char **argv)
 {
-  double time;
-  SD_task_t task;
-  xbt_dynar_t ret;
-
   double communication_amount[] = { 0.0, 1.0, 1.0, 1.0,
-    1.0, 0.0, 1.0, 1.0,
-    1.0, 1.0, 0.0, 1.0,
-    1.0, 1.0, 1.0, 0.0,
-  };
+                                    1.0, 0.0, 1.0, 1.0,
+                                    1.0, 1.0, 0.0, 1.0,
+                                    1.0, 1.0, 1.0, 0.0 };
 
   double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
 
-
-  /***************************************/
-
   SD_init(&argc, argv);
   SD_create_environment(argv[1]);
 
-  task = SD_task_create("All2all task", NULL, 1.0);
-
-  SD_task_schedule(task, 4, SD_workstation_get_list(), no_cost,
-                   communication_amount, -1.0);
+  SD_task_t task = SD_task_create("All2all task", NULL, 1.0);
 
-  ret = SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_task_schedule(task, 4, sg_host_list(), no_cost, communication_amount, -1.0);
 
-  time = SD_get_clock();
+  SD_simulate(-1.0);
 
-  printf("%g\n", time);
+  printf("%g\n", SD_get_clock());
   fflush(stdout);
 
   SD_task_destroy(task);
 
   SD_exit();
-
   return 0;
 }