memory cleanups

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

diff --git a/examples/simdag/sd_seq_access.c b/examples/simdag/sd_seq_access.c
index ba45eb4..c1157cb 100644 (file)
--- a/examples/simdag/sd_seq_access.c
+++ b/examples/simdag/sd_seq_access.c
@@ -20,7 +20,7 @@ int main(int argc, char **argv)
   const SD_workstation_t *workstations;
   int kind;
   SD_task_t task, taskA, taskB, taskC;
-  SD_task_t *changed_tasks;
+  xbt_dynar_t changed_tasks;
   SD_workstation_t workstation_list[2];
   double computation_amount[2];
   double communication_amount[4] = { 0 };
@@ -33,8 +33,8 @@ int main(int argc, char **argv)
   /*  xbt_log_control_set("sd.thres=debug"); */
 
   if (argc < 2) {
-    INFO1("Usage: %s platform_file", argv[0]);
-    INFO1("example: %s sd_platform.xml", argv[0]);
+    XBT_INFO("Usage: %s platform_file", argv[0]);
+    XBT_INFO("example: %s sd_platform.xml", argv[0]);
     exit(1);
   }
 
@@ -46,13 +46,13 @@ int main(int argc, char **argv)
   workstations = SD_workstation_get_list();
   w1 = workstations[0];
   w2 = workstations[1];
-  for(i=0;i<2; i++){
-    SD_workstation_set_access_mode(workstations[i], 
-                                  SD_WORKSTATION_SEQUENTIAL_ACCESS);
-    INFO2("Access mode of %s is %s", 
-         SD_workstation_get_name(workstations[i]), 
-         (SD_workstation_get_access_mode(workstations[i]) == 
-          SD_WORKSTATION_SEQUENTIAL_ACCESS) ? "sequential" : "shared");
+  for (i = 0; i < 2; i++) {
+    SD_workstation_set_access_mode(workstations[i],
+                                   SD_WORKSTATION_SEQUENTIAL_ACCESS);
+    XBT_INFO("Access mode of %s is %s",
+          SD_workstation_get_name(workstations[i]),
+          (SD_workstation_get_access_mode(workstations[i]) ==
+           SD_WORKSTATION_SEQUENTIAL_ACCESS) ? "sequential" : "shared");
   }
 
   /* creation of the tasks and their dependencies */
@@ -86,46 +86,47 @@ int main(int argc, char **argv)
                    &(computation_amount[1]), SD_SCHED_NO_COST, rate);
 
   /* let's launch the simulation! */
-  while(*(changed_tasks = SD_simulate(-1.0))){
-    for(i=0;i<2; i++){
+  while (xbt_dynar_length(changed_tasks = SD_simulate(-1.0)) > 0) {
+    for (i = 0; i < 2; i++) {
       task = SD_workstation_get_current_task(workstations[i]);
       if (task)
-       kind = SD_task_get_kind(task);
-      else{
-       INFO1("There is no task running on %s",
-             SD_workstation_get_name(workstations[i]));
-       continue;
+        kind = SD_task_get_kind(task);
+      else {
+        XBT_INFO("There is no task running on %s",
+              SD_workstation_get_name(workstations[i]));
+        continue;
       }
 
-      switch (kind){
+      switch (kind) {
       case SD_TASK_COMP_SEQ:
-       INFO2("%s is currently running on %s (SD_TASK_COMP_SEQ)",
-             SD_task_get_name(task),
-             SD_workstation_get_name(workstations[i]));
-       break;
+        XBT_INFO("%s is currently running on %s (SD_TASK_COMP_SEQ)",
+              SD_task_get_name(task),
+              SD_workstation_get_name(workstations[i]));
+        break;
       case SD_TASK_COMM_E2E:
-       INFO2("%s is currently running on %s (SD_TASK_COMM_E2E)",
-             SD_task_get_name(task),
-             SD_workstation_get_name(workstations[i]));
-       break;
+        XBT_INFO("%s is currently running on %s (SD_TASK_COMM_E2E)",
+              SD_task_get_name(task),
+              SD_workstation_get_name(workstations[i]));
+        break;
       case SD_TASK_NOT_TYPED:
-       INFO1("Task running on %s has no type",
-             SD_workstation_get_name(workstations[i]));
-       break;
+        XBT_INFO("Task running on %s has no type",
+              SD_workstation_get_name(workstations[i]));
+        break;
       default:
-       ERROR0("Shouldn't be here");
+        XBT_ERROR("Shouldn't be here");
       }
     }
-    xbt_free(changed_tasks);
+    xbt_dynar_free(&changed_tasks);
   }
+  xbt_dynar_free(&changed_tasks);
 
-  DEBUG0("Destroying tasks...");
+  XBT_DEBUG("Destroying tasks...");
 
   SD_task_destroy(taskA);
   SD_task_destroy(taskB);
   SD_task_destroy(taskC);
 
-  DEBUG0("Tasks destroyed. Exiting SimDag...");
+  XBT_DEBUG("Tasks destroyed. Exiting SimDag...");
 
   SD_exit();
   return 0;