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
Merge branch 'master' of github.com:mquinson/simgrid
[simgrid.git]
/
examples
/
simdag
/
sd_test.c
diff --git
a/examples/simdag/sd_test.c
b/examples/simdag/sd_test.c
index
3d8acc7
..
caeee55
100644
(file)
--- a/
examples/simdag/sd_test.c
+++ b/
examples/simdag/sd_test.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006
, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2006
-2015
. 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
@@
-6,7
+6,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "sim
dag
/simdag.h"
+#include "sim
grid
/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/ex.h"
#include "xbt/log.h"
@@
-95,6
+95,10
@@
int main(int argc, char **argv)
taskC = SD_task_create("Task C", NULL, 30.0);
taskD = SD_task_create("Task D", NULL, 60.0);
taskC = SD_task_create("Task C", NULL, 30.0);
taskD = SD_task_create("Task D", NULL, 60.0);
+ /* try to attach and retrieve user data to a task */
+ SD_task_set_data(taskA, (void*) &computation_amount1);
+ if (computation_amount1 != (*((double*) SD_task_get_data(taskA))))
+ XBT_ERROR("User data was corrupted by a simple set/get");
SD_task_dependency_add(NULL, NULL, taskB, taskA);
SD_task_dependency_add(NULL, NULL, taskC, taskA);
SD_task_dependency_add(NULL, NULL, taskB, taskA);
SD_task_dependency_add(NULL, NULL, taskC, taskA);
@@
-190,7
+194,7
@@
int main(int argc, char **argv)
xbt_dynar_get_cpy(changed_tasks, 0, &checkD);
xbt_dynar_get_cpy(changed_tasks, 1, &checkB);
xbt_dynar_get_cpy(changed_tasks, 0, &checkD);
xbt_dynar_get_cpy(changed_tasks, 1, &checkB);
- xbt_assert
0
(checkD == taskD &&
+ xbt_assert(checkD == taskD &&
checkB == taskB, "Unexpected simulation results");
xbt_dynar_free_container(&changed_tasks);
checkB == taskB, "Unexpected simulation results");
xbt_dynar_free_container(&changed_tasks);