X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d8d17cf1dc77c1fa006da88fb597985a9e14774..5a4767e64e45de2c17e9bbdcdf9c8588dbce80b0:/teshsuite/simdag/basic6.c

diff --git a/teshsuite/simdag/basic6.c b/teshsuite/simdag/basic6.c
index 1aa373c481..66e2d341a9 100644
--- a/teshsuite/simdag/basic6.c
+++ b/teshsuite/simdag/basic6.c
@@ -1,32 +1,55 @@
+/* Copyright (c) 2007-2012. 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/asserts.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic6, sd, "SimDag test basic6");
+/* test scheduling 2 tasks at the same time without artificial dependencies */
 
-/*
- * test: scheduling 2 tasks at the same time
- * without artificial dependecies
- * 
- * author: sahu
+/* Basic SimDag Test 6
+ * Scenario:
+ *   - Schedule two parallel tasks concurrently on a P2P platform
+ *   - Hosts computes 1B per second
+ * Computing power is shared between tasks.
+ * Simulated time should be:
+ *          1/(1/2) = 2 seconds
  */
 
-int main(int argc, char **argv) {
-    double comm_cost[] = { 0.0, 0.0, 0.0, 0.0 };
-    double comp_cost[] = { 1.0 };
-	SD_task_t taskA, taskB;
-	
-	SD_init(&argc, argv);
-    SD_create_environment(argv[1]);
-
-    taskA = SD_task_create("Task A", NULL, 1.0);
-    taskB = SD_task_create("Task B", NULL, 1.0);
-
-    SD_task_schedule(taskA, 1, SD_workstation_get_list(), comp_cost, comm_cost,
-		     -1.0);
-    SD_task_schedule(taskB, 1, SD_workstation_get_list(), comp_cost, comm_cost,
-		     -1.0);
-	    
-    SD_simulate(-1.0);
-
-    SD_exit();
-    return 0;
+int main(int argc, char **argv)
+{
+  double comm_cost[] = { 0.0, 0.0, 0.0, 0.0 };
+  double comp_cost[] = { 1.0 };
+  SD_task_t taskA, taskB;
+  xbt_dynar_t ret;
+
+  SD_init(&argc, argv);
+  SD_create_environment(argv[1]);
+
+  taskA = SD_task_create("Task A", NULL, 1.0);
+  taskB = SD_task_create("Task B", NULL, 1.0);
+
+  SD_task_schedule(taskA, 1, SD_workstation_get_list(), comp_cost,
+                   comm_cost, -1.0);
+  SD_task_schedule(taskB, 1, SD_workstation_get_list(), comp_cost,
+                   comm_cost, -1.0);
+
+  ret = SD_simulate(-1.0);
+  xbt_assert(xbt_dynar_length(ret) == 2,
+      "I was expecting the terminaison of 2 tasks, but I got %lu instead",
+      xbt_dynar_length(ret));
+  xbt_dynar_free(&ret);
+  SD_task_destroy(taskA);
+  SD_task_destroy(taskB);
+
+  XBT_INFO("Simulation time: %f", SD_get_clock());
+
+  SD_exit();
+  return 0;
 }