X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce04ed35abb51f42ca6b6b778ee3f6b08f9ab445..de131ab8e9bcad3dba7e6b23150db24f64259024:/teshsuite/simdag/basic0.c

diff --git a/teshsuite/simdag/basic0.c b/teshsuite/simdag/basic0.c
index c43adf6c7f..69c5821d17 100644
--- a/teshsuite/simdag/basic0.c
+++ b/teshsuite/simdag/basic0.c
@@ -1,38 +1,59 @@
+/* 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(basic0, sd, "SimDag test basic0");
+
+int main(int argc, char **argv)
+{
+
+  SD_task_t taskInit;
+  SD_task_t taskA;
+  SD_task_t taskB;
 
-int main(int argc, char **argv) {
-  /* initialisation of SD */
+  /* scheduling parameters */
+
+  double communication_amount1[] = { 0, 100000000, 0, 0 };
+  double communication_amount2[] = { 0, 1, 0, 0 };
+  const double no_cost[] = { 0.0, 0.0 };
+
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* creation of the environment */
   SD_create_environment(argv[1]);
 
   /* creation of the tasks and their dependencies */
-  SD_task_t taskInit = SD_task_create(NULL,NULL,1.0);
-  SD_task_t taskA = SD_task_create("Task Comm 1", NULL, 1.0);
-  SD_task_t taskB = SD_task_create("Task Comm 2", NULL, 1.0);
-  
+  taskInit = SD_task_create("Init", NULL, 1.0);
+  taskA = SD_task_create("Task Comm 1", NULL, 1.0);
+  taskB = SD_task_create("Task Comm 2", NULL, 1.0);
+
+
 
-  /* scheduling parameters */
 
-  double communication_amount1[] = { 0, 100000000, 0, 0 };
-  double communication_amount2[] = { 0, 1, 0, 0 };
-  const double no_cost[] = {1.0, 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(taskA, 2, SD_workstation_get_list(), no_cost, communication_amount1, -1.0);
-  SD_task_schedule(taskB, 2, SD_workstation_get_list(), no_cost, communication_amount2, -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,
+                   communication_amount1, -1.0);
+  SD_task_schedule(taskB, 2, SD_workstation_get_list(), no_cost,
+                   communication_amount2, -1.0);
 
   SD_task_dependency_add(NULL, NULL, taskInit, taskA);
   SD_task_dependency_add(NULL, NULL, taskInit, taskB);
 
   SD_simulate(-1.0);
 
+  INFO1("Simulation time: %f", SD_get_clock());
+
   SD_exit();
   return 0;
 }
-