New XBT module: file

[simgrid.git] / examples / simdag / sd_test2.c

diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c
index 0184860..9342bd8 100644 (file)
--- a/examples/simdag/sd_test2.c
+++ b/examples/simdag/sd_test2.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 #include "xbt/log.h"
 
 #include "xbt/sysdep.h"         /* calloc, printf */
@@ -57,18 +57,23 @@ int main(int argc, char **argv)
   double final_cost = 5e+9;
   double *ParComp_wcomm2_table;
 
-  /* initialisation of SD */
+  /* SD initialization */
   SD_init(&argc, argv);
 
   /* creation of the environment */
-  SD_create_environment(argv[1]);
+  if (strstr(argv[1],".xml"))
+    SD_create_environment(argv[1]);
+  else
+    xbt_die("Unsupported platform description style (not XML): %s",
+            argv[1]);
 
   /* getting platform infos */
   n_hosts = SD_workstation_get_number();
   hosts = SD_workstation_get_list();
 
   /* sorting hosts by hostname */
-  qsort((void *) hosts, n_hosts, sizeof(SD_workstation_t), nameCompareHosts);
+  qsort((void *) hosts, n_hosts, sizeof(SD_workstation_t),
+        nameCompareHosts);
 
   /* creation of the tasks */
   taskInit = SD_task_create("Initial", NULL, 1.0);
@@ -176,11 +181,12 @@ int main(int argc, char **argv)
 
 
   /* scheduling the tasks */
-  SD_task_schedule(taskInit, 1, hosts, SD_SCHED_NO_COST, SD_SCHED_NO_COST, -1.0);
-  SD_task_schedule(PtoPComm1, 2, PtoPcomm1_hosts, SD_SCHED_NO_COST, PtoPcomm1_table,
-                   -1.0);
-  SD_task_schedule(PtoPComm2, 2, PtoPcomm2_hosts, SD_SCHED_NO_COST, PtoPcomm2_table,
+  SD_task_schedule(taskInit, 1, hosts, SD_SCHED_NO_COST, SD_SCHED_NO_COST,
                    -1.0);
+  SD_task_schedule(PtoPComm1, 2, PtoPcomm1_hosts, SD_SCHED_NO_COST,
+                   PtoPcomm1_table, -1.0);
+  SD_task_schedule(PtoPComm2, 2, PtoPcomm2_hosts, SD_SCHED_NO_COST,
+                   PtoPcomm2_table, -1.0);
   SD_task_schedule(ParComp_wocomm, 5, ParComp_wocomm_hosts,
                    ParComp_wocomm_cost, ParComp_wocomm_table, -1.0);
   SD_task_schedule(IntraRedist, 5, IntraRedist_hosts, IntraRedist_cost,
@@ -191,12 +197,13 @@ int main(int argc, char **argv)
                    InterRedist_table, -1.0);
   SD_task_schedule(ParComp_wcomm2, 5, ParComp_wcomm2_hosts,
                    ParComp_wcomm2_cost, ParComp_wcomm2_table, -1.0);
-  SD_task_schedule(taskFinal, 1, &(hosts[9]), &final_cost, SD_SCHED_NO_COST, -1.0);
+  SD_task_schedule(taskFinal, 1, &(hosts[9]), &final_cost,
+                   SD_SCHED_NO_COST, -1.0);
 
   /* let's launch the simulation! */
   changed_tasks = SD_simulate(-1.0);
 
-  INFO1("Simulation time: %f", SD_get_clock());
+  XBT_INFO("Simulation time: %f", SD_get_clock());
 
   xbt_dynar_free_container(&changed_tasks);