[LTP] [RFC PATCH 4/9] syscalls/ipc: Rewrite msgctl02 to new library.

Cyril Hrubis
2018-06-12T15:46:26Z

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
testcases/kernel/syscalls/ipc/msgctl/msgctl02.c | 207 +++++++-----------------
1 file changed, 58 insertions(+), 149 deletions(-)

diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
index 1b3909197..008fd4f71 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
@@ -1,175 +1,84 @@
/*
+ * Copyright (c) International Business Machines Corp., 2001
+ * 03/2001 - Written by Wayne Boyer
+ * Copyright (c) 2018 Cyril Hrubis <chrubis@suse.cz>
*
- * Copyright (c) International Business Machines Corp., 2001
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+ * the GNU General Public License for more details.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
/*
- * NAME
- * msgctl02.c
- *
- * DESCRIPTION
- * msgctl02 - create a message queue, then issue the IPC_SET command
- * to lower the msg_qbytes value.
- *
- * ALGORITHM
- * create a message queue
- * loop if that option was specified
- * call msgctl() with the IPC_SET command with a new msg_qbytes value
- * check the return code
- * if failure, issue a FAIL message and break remaining tests
- * otherwise,
- * if doing functionality testing
- * if the msg_qbytes value is the new value
- * issue a PASS message
- * otherwise
- * issue a FAIL message
- * else issue a PASS message
- * call cleanup
- *
- * USAGE: <for command-line>
- * msgctl02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -f : Turn off functionality Testing.
- * -i n : Execute test n times.
- * -I x : Execute test for x seconds.
- * -P x : Pause for x seconds between iterations.
- * -t : Turn on syscall timing.
- *
- * HISTORY
- * 03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- * none
+ * Create a message queue, then issue the IPC_SET command to lower the
+ * msg_qbytes value.
*/

-#include "test.h"
+#include <errno.h>

-#include "ipcmsg.h"
+#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
+#include "libnewipc.h"

-char *TCID = "msgctl02";
-int TST_TOTAL = 1;
+static int msg_id = -1;
+struct msqid_ds orig_buf;

-int msg_q_1 = -1; /* to hold the message queue id */
-
-struct msqid_ds qs_buf;
-
-unsigned long int new_bytes;
-
-int main(int ac, char **av)
+static void verify_msgctl(void)
{
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup(); /* global setup */
-
- /* The following loop checks looping state if -i option given */
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- /* reset tst_count in case we are looping */
- tst_count = 0;
-
- /*
- * Set the msqid_ds structure values for the queue
- */
-
- TEST(msgctl(msg_q_1, IPC_SET, &qs_buf));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TTERRNO, "msgctl() call failed");
- } else {
- /* do a stat to get current queue values */
- if ((msgctl(msg_q_1, IPC_STAT, &qs_buf) == -1)) {
- tst_resm(TBROK, "stat on queue failed");
- continue;
- }
-
- if (qs_buf.msg_qbytes == new_bytes) {
- tst_resm(TPASS, "qs_buf.msg_qbytes is"
- " the new value - %ld",
- qs_buf.msg_qbytes);
- } else {
- tst_resm(TFAIL, "qs_buf.msg_qbytes "
- "value is not expected");
- tst_resm(TINFO, "expected - %ld, "
- "received - %ld", new_bytes,
- qs_buf.msg_qbytes);
- }
- }
-
- /*
- * decrement by one the msq_qbytes value
- */
- qs_buf.msg_qbytes -= 1;
- new_bytes = qs_buf.msg_qbytes;
- }
+ struct msqid_ds buf = orig_buf;

- cleanup();
+ buf.msg_qbytes -= 1;

- tst_exit();
-}
+ TEST(msgctl(msg_id, IPC_SET, &buf));

-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
-{
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- /*
- * Create a temporary directory and cd into it.
- * This helps to ensure that a unique msgkey is created.
- * See ../lib/libipc.c for more information.
- */
- tst_tmpdir();
-
- /* get a message key */
- msgkey = getipckey();
+ if (TEST_RETURN != 0) {
+ tst_res(TFAIL | TTERRNO, "msgctl(IPC_SET) failed");
+ return;
+ }

- /* make sure the initial # of bytes is 0 in our buffer */
- qs_buf.msg_qbytes = 0x3000;
+ tst_res(TPASS, "msgctl(IPC_SET) msg_qbytes - 1");

- /* now we have a key, so let's create a message queue */
- if ((msg_q_1 = msgget(msgkey, IPC_CREAT | IPC_EXCL | MSG_RW)) == -1) {
- tst_brkm(TBROK, cleanup, "Can't create message queue");
- }
+ memset(&buf, 0, sizeof(buf));
+ SAFE_MSGCTL(msg_id, IPC_STAT, &buf);

- /* now stat the queue to get the default msg_qbytes value */
- if ((msgctl(msg_q_1, IPC_STAT, &qs_buf)) == -1) {
- tst_brkm(TBROK, cleanup, "Can't stat the message queue");
+ if (buf.msg_qbytes == orig_buf.msg_qbytes - 1) {
+ tst_res(TPASS, "msg_qbytes = %lu",
+ (unsigned long)buf.msg_qbytes);
+ } else {
+ tst_res(TFAIL, "msg_qbytes = %lu, expected %lu",
+ (unsigned long)buf.msg_qbytes,
+ (unsigned long)orig_buf.msg_qbytes - 1);
}

- /* decrement msg_qbytes and copy its value */
- qs_buf.msg_qbytes -= 1;
- new_bytes = qs_buf.msg_qbytes;
+ SAFE_MSGCTL(msg_id, IPC_SET, &orig_buf);
}

-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * or premature exit.
- */
-void cleanup(void)
+static void setup(void)
{
- /* if it exists, remove the message queue */
- rm_queue(msg_q_1);
+ key_t msgkey = GETIPCKEY();
+
+ msg_id = SAFE_MSGGET(msgkey, IPC_CREAT | IPC_EXCL | MSG_RW | 0660);

- tst_rmdir();
+ SAFE_MSGCTL(msg_id, IPC_STAT, &orig_buf);
+}

+static void cleanup(void)
+{
+ if (msg_id > 0)
+ SAFE_MSGCTL(msg_id, IPC_RMID, NULL);
}
+
+static struct tst_test test = {
+ .setup = setup,
+ .cleanup = cleanup,
+ .test_all = verify_msgctl,
+ .needs_tmpdir = 1
+};
--
2.13.6