X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..a4fc28ec2b9c97fc5bff04e0e5f420703f5ab419:/teshsuite/simdag/network/p2p/test_latency_bound.c?ds=sidebyside

diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.c b/teshsuite/simdag/network/p2p/test_latency_bound.c
index 694a5c3de5..357c4cc84b 100644
--- a/teshsuite/simdag/network/p2p/test_latency_bound.c
+++ b/teshsuite/simdag/network/p2p/test_latency_bound.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"
 
 #define TASK_NUM 3
 
@@ -18,52 +16,37 @@
  * 3 flows exceed bandwidth
  * should be 10001.5
  * because the max tcp win size is 20000
- * 
- * @todo@ test assumes that max tcp win size is 20000
- * assert this
  */
 
 int main(int argc, char **argv)
 {
-  int i;
-  double time;
   double communication_amount[] = { 0.0, 1.0, 0.0, 0.0 };
   double no_cost[] = { 0.0, 0.0 };
-  xbt_dynar_t ret;
 
-  SD_task_t root;
   SD_task_t task[TASK_NUM];
 
   SD_init(&argc, argv);
   SD_create_environment(argv[1]);
 
-  // xbt_assert( check max tcp win size, "MAX TCP WIN SIZE is 20000");
-
-  root = SD_task_create("Root", NULL, 1.0);
-  SD_task_schedule(root, 1, SD_workstation_get_list(), no_cost, no_cost,
-                   -1.0);
+  SD_task_t root = SD_task_create("Root", NULL, 1.0);
+  SD_task_schedule(root, 1, sg_host_list(), no_cost, no_cost, -1.0);
 
-  for (i = 0; i < TASK_NUM; i++) {
+  for (int i = 0; i < TASK_NUM; i++) {
     task[i] = SD_task_create("Comm", NULL, 1.0);
-    SD_task_schedule(task[i], 2, SD_workstation_get_list(), no_cost,
-                     communication_amount, -1.0);
+    SD_task_schedule(task[i], 2, sg_host_list(), no_cost, communication_amount, -1.0);
     SD_task_dependency_add(NULL, NULL, root, task[i]);
   }
 
-  ret = SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_simulate(-1.0);
 
-  time = SD_get_clock();
-
-  printf("%g\n", time);
+  printf("%g\n", SD_get_clock());
   fflush(stdout);
 
-  for (i = 0; i < TASK_NUM; i++) {
+  for (int i = 0; i < TASK_NUM; i++) {
     SD_task_destroy(task[i]);
   }
   SD_task_destroy(root);
 
   SD_exit();
-
   return 0;
 }