Merge pull request #2 from mquinson/master

[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 adc6b77..56d851e 100644 (file)
--- a/teshsuite/simdag/network/mxn/test_intra_independent_comm.c
+++ b/teshsuite/simdag/network/mxn/test_intra_independent_comm.c
@@ -1,15 +1,13 @@
 /* Latency tests                                                            */
 
-/* Copyright (c) 2007, 2009-2011. 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
@@ -23,40 +21,27 @@
 
 int main(int argc, char **argv)
 {
-  double time;
-  SD_task_t task;
-  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,
-  };
+                                    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);
   SD_create_environment(argv[1]);
 
-  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_task_t task = SD_task_create("Comm 1", 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;
 }