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 git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid
[simgrid.git]
/
teshsuite
/
msg
/
task_destroy_cancel
/
task_destroy_cancel.c
diff --git
a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
index
6dda8b5
..
0ba661d
100644
(file)
--- a/
teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
+++ b/
teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
@@
-5,7
+5,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdio.h>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdio.h>
-#include "
msg/msg.h" /* Yeah! If you want to use msg, you need to include msg
/msg.h */
+#include "
simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid
/msg.h */
#include "xbt/sysdep.h" /* calloc, printf */
/* Create a log channel to have nice outputs. */
#include "xbt/sysdep.h" /* calloc, printf */
/* Create a log channel to have nice outputs. */
@@
-114,6
+114,7
@@
int slave(int argc, char *argv[])
if (!strcmp(MSG_task_get_name(task), "cancel")) {
MSG_process_create("worker1", worker_main, task, MSG_host_self());
if (!strcmp(MSG_task_get_name(task), "cancel")) {
MSG_process_create("worker1", worker_main, task, MSG_host_self());
+ MSG_process_sleep(0.1);
XBT_INFO("Canceling task \"%s\"", task->name);
MSG_task_cancel(task);
continue;
XBT_INFO("Canceling task \"%s\"", task->name);
MSG_task_cancel(task);
continue;
@@
-125,7
+126,7
@@
int slave(int argc, char *argv[])
XBT_INFO("Task \"%s\" done in %f (amount %f)"
, MSG_task_get_name(task)
, end - start
XBT_INFO("Task \"%s\" done in %f (amount %f)"
, MSG_task_get_name(task)
, end - start
- , MSG_task_get_
remaining_computation
(task));
+ , MSG_task_get_
flops_amount
(task));
MSG_task_destroy(task);
task = NULL;
MSG_task_destroy(task);
task = NULL;