X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8541e8d1bb3ddb1cd5e36a16d0ea095a71fd7f6..e99158dd85fe789ea5e1a40c29f196fa6c715bcf:/examples/simdag/sd_test2.c

diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c
index 018486021a..ce4f739dda 100644
--- 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 */
@@ -18,16 +18,15 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test,
 
 static int nameCompareHosts(const void *n1, const void *n2)
 {
-  return strcmp(SD_workstation_get_name(*((SD_workstation_t *) n1)),
-                SD_workstation_get_name(*((SD_workstation_t *) n2)));
+  return strcmp(sg_host_get_name(*((sg_host_t *) n1)),
+                sg_host_get_name(*((sg_host_t *) n2)));
 }
 
 int main(int argc, char **argv)
 {
   int i, j;
-  xbt_dynar_t changed_tasks;
   int n_hosts;
-  const SD_workstation_t *hosts;
+  const sg_host_t *hosts;
   SD_task_t taskInit;
   SD_task_t PtoPComm1;
   SD_task_t PtoPComm2;
@@ -37,38 +36,42 @@ int main(int argc, char **argv)
   SD_task_t InterRedist;
   SD_task_t taskFinal;
   SD_task_t ParComp_wcomm2;
-  SD_workstation_t PtoPcomm1_hosts[2];
-  SD_workstation_t PtoPcomm2_hosts[2];
+  sg_host_t PtoPcomm1_hosts[2];
+  sg_host_t PtoPcomm2_hosts[2];
   double PtoPcomm1_table[] = { 0, 12500000, 0, 0 };     /* 100Mb */
   double PtoPcomm2_table[] = { 0, 1250000, 0, 0 };      /* 10Mb */
   double ParComp_wocomm_cost[] = { 1e+9, 1e+9, 1e+9, 1e+9, 1e+9 };      /* 1 Gflop per Proc */
   double *ParComp_wocomm_table;
-  SD_workstation_t ParComp_wocomm_hosts[5];
+  sg_host_t ParComp_wocomm_hosts[5];
   double *IntraRedist_cost;
   double *IntraRedist_table;
-  SD_workstation_t IntraRedist_hosts[5];
+  sg_host_t IntraRedist_hosts[5];
   double ParComp_wcomm1_cost[] = { 1e+9, 1e+9, 1e+9, 1e+9, 1e+9 };      /* 1 Gflop per Proc */
   double *ParComp_wcomm1_table;
-  SD_workstation_t ParComp_wcomm1_hosts[5];
+  sg_host_t ParComp_wcomm1_hosts[5];
   double *InterRedist_cost;
   double *InterRedist_table;
   double ParComp_wcomm2_cost[] = { 1e+8, 1e+8, 1e+8, 1e+8, 1e+8 };      /* 1 Gflop per Proc (0.02sec duration) */
-  SD_workstation_t ParComp_wcomm2_hosts[5];
+  sg_host_t ParComp_wcomm2_hosts[5];
   double final_cost = 5e+9;
   double *ParComp_wcomm2_table;
 
-  /* initialisation of SD */
+  /* SD initialization */
   SD_init(&argc, argv);
 
   /* creation of the environment */
+  xbt_assert(strstr(argv[1],".xml"), 
+       "Unsupported platform description style (not XML): %s",
+       argv[1]);
   SD_create_environment(argv[1]);
 
   /* getting platform infos */
-  n_hosts = SD_workstation_get_number();
-  hosts = SD_workstation_get_list();
+  n_hosts = sg_host_count();
+  hosts = sg_host_list();
 
   /* sorting hosts by hostname */
-  qsort((void *) hosts, n_hosts, sizeof(SD_workstation_t), nameCompareHosts);
+  qsort((void *) hosts, n_hosts, sizeof(sg_host_t),
+        nameCompareHosts);
 
   /* creation of the tasks */
   taskInit = SD_task_create("Initial", NULL, 1.0);
@@ -176,11 +179,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,14 +195,14 @@ 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);
+  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);
 
   free(ParComp_wocomm_table);
   free(IntraRedist_cost);