Add some peer traces.

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

diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c
index 893654c..e04bcfd 100644 (file)
--- a/examples/simdag/sd_test2.c
+++ b/examples/simdag/sd_test2.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2007, 2008, 2009, 2010. 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 <string.h>
@@ -19,7 +25,7 @@ static int nameCompareHosts(const void *n1, const void *n2)
 int main(int argc, char **argv)
 {
   int i, j;
-  SD_task_t *changed_tasks;
+  xbt_dynar_t changed_tasks;
   int n_hosts;
   const SD_workstation_t *hosts;
   SD_task_t taskInit;
@@ -31,7 +37,6 @@ int main(int argc, char **argv)
   SD_task_t InterRedist;
   SD_task_t taskFinal;
   SD_task_t ParComp_wcomm2;
-  const double no_cost[] = { 1.0, 1.0 };
   SD_workstation_t PtoPcomm1_hosts[2];
   SD_workstation_t PtoPcomm2_hosts[2];
   double PtoPcomm1_table[] = { 0, 12500000, 0, 0 };     /* 100Mb */
@@ -63,7 +68,8 @@ int main(int argc, char **argv)
   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);
@@ -171,11 +177,12 @@ int main(int argc, char **argv)
 
 
   /* scheduling the tasks */
-  SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0);
-  SD_task_schedule(PtoPComm1, 2, PtoPcomm1_hosts, no_cost, PtoPcomm1_table,
-                   -1.0);
-  SD_task_schedule(PtoPComm2, 2, PtoPcomm2_hosts, 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,
@@ -186,12 +193,15 @@ 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, 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);
 
-  free(changed_tasks);
+  XBT_INFO("Simulation time: %f", SD_get_clock());
+
+  xbt_dynar_free_container(&changed_tasks);
 
   free(ParComp_wocomm_table);
   free(IntraRedist_cost);