X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce04ed35abb51f42ca6b6b778ee3f6b08f9ab445..6961ee4e0cb867ed6100e487a584fccc703ada4f:/teshsuite/simdag/basic4.c?ds=sidebyside

diff --git a/teshsuite/simdag/basic4.c b/teshsuite/simdag/basic4.c
index 1155970eb2..ac09265344 100644
--- a/teshsuite/simdag/basic4.c
+++ b/teshsuite/simdag/basic4.c
@@ -1,35 +1,61 @@
+/* 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(basic4, sd, "SimDag test basic4");
+
+int main(int argc, char **argv)
+{
+  /* creation of the tasks and their dependencies */
+
+  SD_task_t taskInit;
+  SD_task_t taskA;
+  SD_task_t taskFin;
+  xbt_dynar_t ret;
+
+  /* scheduling parameters */
+
+  double no_cost[] = { 0., 0., 0., 0. };
+  double amount[] = { 0., 1., 0., 0. };
 
-int main(int argc, char **argv) {
-    /* initialisation of SD */
-    SD_init(&argc, argv);
+  /* initialisation of SD */
+  SD_init(&argc, argv);
 
-    /* creation of the environment */
-    SD_create_environment(argv[1]);
+  /* creation of the environment */
+  SD_create_environment(argv[1]);
 
-    /* creation of the tasks and their dependencies */
-    SD_task_t taskInit = SD_task_create("Task Init",NULL,1.0);
-    SD_task_t taskA = SD_task_create("Task A", NULL, 1.0);
-    SD_task_t taskFin = SD_task_create("Task Fin", NULL, 1.0);
+  /* creation of the tasks and their dependencies */
+  taskInit = SD_task_create("Task Init", NULL, 1.0);
+  taskA = SD_task_create("Task A", NULL, 1.0);
+  taskFin = SD_task_create("Task Fin", NULL, 1.0);
 
 
-    /* scheduling parameters */
+  /* let's launch the simulation! */
+  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(taskFin, 1, SD_workstation_get_list(), no_cost, no_cost,
+                   -1.0);
 
-    double no_cost[] = { 0., 0., 0., 0. };
-    double amount[] = { 0., 1., 0., 0.};
+  SD_task_dependency_add(NULL, NULL, taskInit, taskA);
+  SD_task_dependency_add(NULL, NULL, taskA, taskFin);
 
-    /* let's launch the simulation! */
-    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(taskFin, 1, SD_workstation_get_list(), no_cost, no_cost, -1.0);
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+  SD_task_destroy(taskInit);
+  SD_task_destroy(taskA);
+  SD_task_destroy(taskFin);
 
-    SD_task_dependency_add(NULL, NULL, taskInit, taskA);
-    SD_task_dependency_add(NULL, NULL, taskA, taskFin);
-    
-    SD_simulate(-1.0);
+  XBT_INFO("Simulation time: %f", SD_get_clock());
 
-    SD_exit();
-    return 0;
+  SD_exit();
+  return 0;
 }