A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-checker : new simcall MC_RANDOM
[simgrid.git]
/
teshsuite
/
simdag
/
basic6.c
diff --git
a/teshsuite/simdag/basic6.c
b/teshsuite/simdag/basic6.c
index
e2516dd
..
66e2d34
100644
(file)
--- a/
teshsuite/simdag/basic6.c
+++ b/
teshsuite/simdag/basic6.c
@@
-1,6
+1,4
@@
-/* test scheduling 2 tasks at the same time without artificial dependencies */
-
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2012. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,15
+7,27
@@
#include <stdio.h>
#include <stdlib.h>
#include "simdag/simdag.h"
#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");
#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 */
+
+/* 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;
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]);
SD_init(&argc, argv);
SD_create_environment(argv[1]);
@@
-30,9
+40,15
@@
int main(int argc, char **argv)
SD_task_schedule(taskB, 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);
+ 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);
-
INFO1
("Simulation time: %f", SD_get_clock());
+
XBT_INFO
("Simulation time: %f", SD_get_clock());
SD_exit();
return 0;
SD_exit();
return 0;