Cosmetics: handle exception inside exception handler.

[simgrid.git] / teshsuite / simdag / basic5.c

diff --git a/teshsuite/simdag/basic5.c b/teshsuite/simdag/basic5.c
index 660b0a8..b400701 100644 (file)
--- a/teshsuite/simdag/basic5.c
+++ b/teshsuite/simdag/basic5.c
@@ -1,6 +1,15 @@
+/* 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 "simdag/simdag.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic5, sd, "SimDag test basic5");
 
 int main(int argc, char **argv)
 {
@@ -9,7 +18,7 @@ int main(int argc, char **argv)
   SD_task_t taskInit;
   SD_task_t taskA;
   SD_task_t taskB;
-
+  xbt_dynar_t ret;
 
   /* scheduling parameters */
 
@@ -17,7 +26,7 @@ int main(int argc, char **argv)
   double amount[] = { 0., 100000., 0., 0. };
   double comput[] = { 10000000. };
 
-  /* initialisation of SD */
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -29,8 +38,8 @@ int main(int argc, char **argv)
   taskB = SD_task_create("Task B", NULL, 1.0);
 
   /* let's launch the simulation! */
-  SD_task_schedule(taskInit, 1, SD_workstation_get_list(), no_cost, no_cost,
-                   -1.0);
+  SD_task_schedule(taskInit, 1, SD_workstation_get_list(), no_cost,
+                   no_cost, -1.0);
   SD_task_schedule(taskA, 2, SD_workstation_get_list(), no_cost, amount,
                    -1.0);
   SD_task_schedule(taskB, 1, SD_workstation_get_list(), comput, no_cost,
@@ -39,7 +48,13 @@ int main(int argc, char **argv)
   SD_task_dependency_add(NULL, NULL, taskInit, taskA);
   SD_task_dependency_add(NULL, NULL, taskInit, taskB);
 
-  SD_simulate(-1.0);
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+  SD_task_destroy(taskInit);
+  SD_task_destroy(taskA);
+  SD_task_destroy(taskB);
+
+  XBT_INFO("Simulation time: %f", SD_get_clock());
 
   SD_exit();
   return 0;