From 2e0e295b51afb3b178515d7ad75debf8a8be6ebc Mon Sep 17 00:00:00 2001 From: Kinsbursky Stanislav Date: Fri, 10 Feb 2012 15:03:40 +0300 Subject: [PATCH] zdtm: don't wait in IPC queue on message operations Otherwise test will sleep in kernel in case of queue is emptry on read or queue is full on write. Signed-off-by: Stanislav Kinsbursky Signed-off-by: Andrey Vagin --- test/zdtm/live/static/msgque.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/zdtm/live/static/msgque.c b/test/zdtm/live/static/msgque.c index e56ac8db4..2fe53a36c 100644 --- a/test/zdtm/live/static/msgque.c +++ b/test/zdtm/live/static/msgque.c @@ -59,7 +59,7 @@ static int test_fn(int argc, char **argv) if (pid == 0) { test_waitsig(); - if (msgrcv(msg, &msgbuf, sizeof(TEST_STRING), MSG_TYPE, 0) == -1) { + if (msgrcv(msg, &msgbuf, sizeof(TEST_STRING), MSG_TYPE, IPC_NOWAIT) == -1) { fail("Child: msgrcv failed (%m)"); return -errno; } @@ -72,7 +72,7 @@ static int test_fn(int argc, char **argv) msgbuf.mtype = ANOTHER_MSG_TYPE; memcpy(msgbuf.mtext, ANOTHER_TEST_STRING, sizeof(ANOTHER_TEST_STRING)); - if (msgsnd(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), 0) != 0) { + if (msgsnd(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), IPC_NOWAIT) != 0) { fail("Child: msgsnd failed (%m)"); return -errno; }; @@ -81,7 +81,7 @@ static int test_fn(int argc, char **argv) } else { msgbuf.mtype = MSG_TYPE; memcpy(msgbuf.mtext, TEST_STRING, sizeof(TEST_STRING)); - if (msgsnd(msg, &msgbuf, sizeof(TEST_STRING), 0) != 0) { + if (msgsnd(msg, &msgbuf, sizeof(TEST_STRING), IPC_NOWAIT) != 0) { fail("Parent: msgsnd failed (%m)"); goto err_kill; }; @@ -99,7 +99,7 @@ static int test_fn(int argc, char **argv) goto out; } - if (msgrcv(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), ANOTHER_MSG_TYPE, 0) == -1) { + if (msgrcv(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), ANOTHER_MSG_TYPE, IPC_NOWAIT) == -1) { fail("Parent: msgrcv failed (%m)"); goto err; }