coverage madness: use asserts here too

[simgrid.git] / examples / simdag / dot / ptg_test.c

diff --git a/examples/simdag/dot/ptg_test.c b/examples/simdag/dot/ptg_test.c
index f206fff..a313557 100644 (file)
--- a/examples/simdag/dot/ptg_test.c
+++ b/examples/simdag/dot/ptg_test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013. The SimGrid Team.
+/* Copyright (c) 2013-2016. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,14 +6,13 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 #include "xbt/log.h"
 #include "xbt/ex.h"
 #include <string.h>
 #include <libgen.h>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(test,
-                             "Logging specific to this SimDag example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this SimDag example");
 
 /* simple test trying to load a Parallel Task Graph (PTG) as a DOT file.    */
 int main(int argc, char **argv){
@@ -25,11 +24,7 @@ int main(int argc, char **argv){
   SD_init(&argc, argv);
 
   /* Check our arguments */
-  if (argc < 2) {
-    XBT_INFO("Usage: %s platform_file dot_file ", argv[0]);
-    XBT_INFO("example: %s ../2clusters.xml ptg.dot", argv[0]);
-    exit(1);
-  }
+  xbt_assert (argc > 1,"Usage: %s platform_file dot_file example: %s ../2clusters.xml ptg.dot", argv[0], argv[0]);
 
   /* creation of the environment */
   SD_create_environment(argv[1]);
@@ -42,8 +37,7 @@ int main(int argc, char **argv){
   }
 
   /* Display all the tasks */
-  XBT_INFO
-      ("------------------- Display all tasks of the loaded DAG ---------------------------");
+  XBT_INFO("------------------- Display all tasks of the loaded DAG ---------------------------");
   xbt_dynar_foreach(dot, cursor, task) {
     SD_task_dump(task);
   }
@@ -58,16 +52,15 @@ int main(int argc, char **argv){
 
   /* Schedule them all on all the first workstation */
   XBT_INFO("------------------- Schedule tasks ---------------------------");
-  const SD_workstation_t *ws_list = SD_workstation_get_list();
-  int count = SD_workstation_get_number();
+  const sg_host_t *ws_list = sg_host_list();
+  int count = sg_host_count();
   xbt_dynar_foreach(dot, cursor, task) {
     if (SD_task_get_kind(task) == SD_TASK_COMP_PAR_AMDAHL) {
         SD_task_schedulev(task, count, ws_list);
     }
   }
 
-  XBT_INFO
-      ("------------------- Run the schedule ---------------------------");
+  XBT_INFO("------------------- Run the schedule ---------------------------");
   SD_simulate(-1);
   XBT_INFO("Makespan: %f", SD_get_clock());
   xbt_dynar_foreach(dot, cursor, task) {