@@ -3,7 +3,8 @@
* Copyright (c) 2014-2020 Fujitsu Ltd.
* Author: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
*
- * Basic test for msgrcv(2) using MSG_EXCEPT, MSG_NOERROR
+ * Basic test for msgrcv(2) using MSG_EXCEPT, MSG_NOERROR and different
+ * msg_typ(zero,positive,negative).
*/
#define _GNU_SOURCE
@@ -33,13 +34,18 @@ static void cleanup(void)
SAFE_MSGCTL(queue_id, IPC_RMID, NULL);
}
-static void test_msg_except(void)
+static void prepare_queue(void)
{
queue_id = SAFE_MSGGET(msgkey, IPC_CREAT | IPC_EXCL | MSG_RW);
SAFE_MSGSND(queue_id, &snd_buf[0], MSGSIZE, 0);
SAFE_MSGSND(queue_id, &snd_buf[1], MSGSIZE, 0);
-
memset(&rcv_buf, 0, sizeof(rcv_buf));
+}
+
+static void test_msg_except(void)
+{
+ prepare_queue();
+
TEST(msgrcv(queue_id, &rcv_buf, MSGSIZE, MSGTYPE2, MSG_EXCEPT));
if (TST_RET == -1) {
tst_res(TFAIL | TTERRNO, "msgrcv(MSG_EXCEPT) failed");
@@ -77,12 +83,73 @@ static void test_msg_noerror(void)
SAFE_MSGCTL(queue_id, IPC_RMID, NULL);
}
+static void test_zero_msgtyp(void)
+{
+ prepare_queue();
+
+ TEST(msgrcv(queue_id, &rcv_buf, MSGSIZE, 0, 0));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "msgrcv(zero_msgtyp) failed");
+ cleanup();
+ return;
+ }
+ tst_res(TPASS, "msgrcv(zero_msgtyp) succeeded");
+ if (strcmp(rcv_buf.mtext, MSG1) == 0 && rcv_buf.type == MSGTYPE1)
+ tst_res(TPASS, "msgrcv(zero_msgtyp) got the first message");
+ else
+ tst_res(TFAIL, "msgrcv(zero_msgtyp) didn't get the first message");
+ SAFE_MSGCTL(queue_id, IPC_RMID, NULL);
+}
+
+static void test_positive_msgtyp(void)
+{
+ prepare_queue();
+
+ TEST(msgrcv(queue_id, &rcv_buf, MSGSIZE, MSGTYPE2, 0));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "msgrcv(positive_msgtyp) failed");
+ cleanup();
+ return;
+ }
+ tst_res(TPASS, "msgrcv(positive_msgtyp) succeeded");
+ if (strcmp(rcv_buf.mtext, MSG2) == 0 && rcv_buf.type == MSGTYPE2)
+ tst_res(TPASS, "msgrcv(positive_msgtyp) got the first message"
+ " in the queue of type msgtyp");
+ else
+ tst_res(TFAIL, "msgrcv(positive_msgtyp) didn't get the first "
+ "message in the queue of type msgtyp");
+ SAFE_MSGCTL(queue_id, IPC_RMID, NULL);
+}
+
+static void test_negative_msgtyp(void)
+{
+ prepare_queue();
+
+ TEST(msgrcv(queue_id, &rcv_buf, MSGSIZE, -MSGTYPE2, 0));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "msgrcv(negative_msgtyp) failed");
+ cleanup();
+ return;
+ }
+ tst_res(TPASS, "msgrcv(negative_msgtyp) succeeded");
+ if (strcmp(rcv_buf.mtext, MSG1) == 0 && rcv_buf.type == MSGTYPE1)
+ tst_res(TPASS, "msgrcv(negative_msgtyp) got the first message"
+ " in the queue with the lowest type");
+ else
+ tst_res(TFAIL, "msgrcv(negative_msgtyp) didn't get the first "
+ "message in the queue with the lowest type");
+ SAFE_MSGCTL(queue_id, IPC_RMID, NULL);
+}
+
+
static void setup(void)
{
msgkey = GETIPCKEY();
}
-static void (*testfunc[])(void) = {test_msg_except, test_msg_noerror};
+static void (*testfunc[])(void) = {test_msg_except, test_msg_noerror,
+ test_zero_msgtyp, test_positive_msgtyp,
+ test_negative_msgtyp};
static void verify_msgcrv(unsigned int n)
{
After lookging msgcrv(2) man-page, the different msgtyp has the following effect: 1) If msgtyp is 0, then the first message in the queue is read. 2) If msgtyp is greater than 0, then the first message in the queue of type msgtyp is read. 3) If msgtyp is less than 0, then the first message in the queue with the lowest type less than or equal to the absolute value of msgtyp will be read. Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> --- v1-v2: 1.remove useless change 2.add prepare_queque() function to make code more simple .../kernel/syscalls/ipc/msgrcv/msgrcv07.c | 75 ++++++++++++++++++- 1 file changed, 71 insertions(+), 4 deletions(-)