X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..3a4aac8b5878b4036d6abe02be7f3687e28d45ad:/teshsuite/simdag/network/p2p/test_latency3.c

diff --git a/teshsuite/simdag/network/p2p/test_latency3.c b/teshsuite/simdag/network/p2p/test_latency3.c
index cd85602894..c7ba9e45e2 100644
--- a/teshsuite/simdag/network/p2p/test_latency3.c
+++ b/teshsuite/simdag/network/p2p/test_latency3.c
@@ -1,30 +1,23 @@
 /* Latency tests                                                            */
-  
-/* Copyright (c) 2007, 2009, 2010. 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"
 
 /**
  * bw and latency test 3
  * same intention as test 2
  * sending 2 x 1 bytes at the same time 
  * this time in opposite direction
- * 
  */
 
 int main(int argc, char **argv)
 {
-  double time;
-  SD_task_t root;
-  SD_task_t task1;
-  SD_task_t task2;
   double communication_amount1[] = { 0.0, 1.0, 0.0, 0.0 };
   double communication_amount2[] = { 0.0, 0.0, 1.0, 0.0 };
   double no_cost1[] = { 0.0 };
@@ -33,25 +26,20 @@ int main(int argc, char **argv)
   SD_init(&argc, argv);
   SD_create_environment(argv[1]);
 
-  root = SD_task_create("Root", NULL, 1.0);
-  task1 = SD_task_create("Comm 1", NULL, 1.0);
-  task2 = SD_task_create("Comm 2", NULL, 1.0);
+  SD_task_t root = SD_task_create("Root", NULL, 1.0);
+  SD_task_t task1 = SD_task_create("Comm 1", NULL, 1.0);
+  SD_task_t task2 = SD_task_create("Comm 2", NULL, 1.0);
 
-  SD_task_schedule(root, 1, SD_workstation_get_list(), no_cost1,
-                   no_cost1, -1.0);
-  SD_task_schedule(task1, 2, SD_workstation_get_list(), no_cost,
-                   communication_amount1, -1.0);
-  SD_task_schedule(task2, 2, SD_workstation_get_list(), no_cost,
-                   communication_amount2, -1.0);
+  SD_task_schedule(root, 1, sg_host_list(), no_cost1, no_cost1, -1.0);
+  SD_task_schedule(task1, 2, sg_host_list(), no_cost, communication_amount1, -1.0);
+  SD_task_schedule(task2, 2, sg_host_list(), no_cost, communication_amount2, -1.0);
 
   SD_task_dependency_add(NULL, NULL, root, task1);
   SD_task_dependency_add(NULL, NULL, root, task2);
 
   SD_simulate(-1.0);
 
-  time = SD_get_clock();
-
-  printf("%g\n", time);
+  printf("%g\n", SD_get_clock());
   fflush(stdout);
 
   SD_task_destroy(root);
@@ -59,6 +47,5 @@ int main(int argc, char **argv)
   SD_task_destroy(task2);
 
   SD_exit();
-
   return 0;
 }