From 253f7f8389efaeb424f8a2cb1e1dda9bf9d17e27 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 6 Mar 2014 12:56:54 +0100 Subject: [PATCH] Reset task before each receive. --- teshsuite/msg/task_destroy_cancel.c | 3 ++- teshsuite/msg/task_destroy_cancel.tesh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/teshsuite/msg/task_destroy_cancel.c b/teshsuite/msg/task_destroy_cancel.c index 977aef277d..f3689f9594 100644 --- a/teshsuite/msg/task_destroy_cancel.c +++ b/teshsuite/msg/task_destroy_cancel.c @@ -73,7 +73,7 @@ static int worker_main(int argc, char *argv[]) /** Receiver function */ int slave(int argc, char *argv[]) { - msg_task_t task = NULL; + msg_task_t task; _XBT_GNUC_UNUSED int res; int id = -1; char mailbox[80]; @@ -82,6 +82,7 @@ int slave(int argc, char *argv[]) sprintf(mailbox, "jupi"); while (1) { + task = NULL; res = MSG_task_receive(&(task), mailbox); xbt_assert(res == MSG_OK, "MSG_task_get failed"); XBT_INFO("Handleling task \"%s\"", MSG_task_get_name(task)); diff --git a/teshsuite/msg/task_destroy_cancel.tesh b/teshsuite/msg/task_destroy_cancel.tesh index 4d62c23c1c..17c755989f 100644 --- a/teshsuite/msg/task_destroy_cancel.tesh +++ b/teshsuite/msg/task_destroy_cancel.tesh @@ -10,7 +10,6 @@ $ msg/task_destroy_cancel ${srcdir:=.}/msg/task_destroy_cancel.xml > [Jupiter:slave:(2) 0.709348] [msg_test/INFO] Handleling Task "cancel" > [Jupiter:worker1:(3) 0.709348] [msg_test/INFO] Start cancel > [Jupiter:slave:(2) 0.709348] [msg_test/INFO] Canceling task "cancel" -> [Jupiter:slave:(2) 0.709348] /home/bedaride/Boulot/simgrid/src/msg/msg_mailbox.c:129: [msg_mailbox/WARNING] Asked to write the received task in a non empty struct -- proceeding. > [Jupiter:worker1:(3) 0.710127] [msg_test/INFO] Task done > [Tremblay:master:(1) 0.736350] [msg_test/INFO] Goodbye now! > [Jupiter:slave:(2) 0.736350] [msg_test/INFO] Handleling Task "finalize" -- 2.20.1