ipc/lib: add header files for new API

testcases/kernel/syscalls/ipc/msgget/msgget01.c +2 -12

 	}
 
-	cleanup();
-	tst_exit();
+	rm_queue(msg_q_1);
 }
 
-/*
- * check_functionality() - check the functionality of the tested system call.
- */
-void check_functionality(void)
+static void check_functionality(void)
 {
-	int i = 0;
 	MSGBUF snd_buf, rcv_buf;
 
-	/* EAGLE: Houston, Tranquility Base here. The Eagle has landed! */
 	char *queue_msg =
 	    "Qston, check_functionality here.  The message has queued!";
 
-	/*
-	 * copy our message into the buffer and then set the type.
-	 */
-	do {

"check_functionality() routine.");

testcases/kernel/syscalls/ipc/msgget/msgget01.c +2 -24

 	}
 
 	if (strcmp(snd_buf.mtext, rcv_buf.mtext) == 0) {
-		tst_resm(TPASS, "message received = message sent");
+		tst_res(TPASS, "message received = message sent");
 	} else {
-		tst_resm(TFAIL, "message received != message sent");
+		tst_res(TFAIL, "message received != message sent");
 	}
 }
 
-/*
- * 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();
-
-	msgkey = getipckey();
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion

testcases/kernel/syscalls/ipc/msgget/msgget01.c +5 -0

+static struct tst_test test = {
+	.tid = "msgget01",
+	.test_all = verify_msgget,
+	.needs_tmpdir = 1
+};

Signature · 7 lines

1.8.3.1




-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

testcases/kernel/syscalls/ipc/msgget/msgget02.c +49 -97

index be9bc61..85104e8 100644
@@ -1,176 +1,119 @@
 /*
+ * Copyright (c) International Business Machines  Corp., 2001
  *
- *   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.
  */
 
 /*
- * NAME
- *	msgget02.c
+ * NAME: msgget02.c
  *
  * DESCRIPTION
- *	msgget02 - test for EEXIST and ENOENT errors
- *
- * ALGORITHM
- *	create a message queue
- *	loop if that option was specified
- *	try to recreate the same queue - test #1
- *	try to access a queue that doesn't exist - tests #2 & #3
- *	check the errno value
- *	  issue a PASS message if we get EEXIST or ENOENT depening on test
- *	otherwise, the tests fails
- *	  issue a FAIL message
- *	  break any remaining tests
- *	  call cleanup
- *
- * USAGE:  <for command-line>
- *  msgget02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -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
+ * 1) msgget(2) fails if a message queue exists for key and msgflg
+ *    specified both IPC_CREAT and IPC_EXCL.
+ * 2) msgget(2) fails if no message queue exists for key and msgflg
+ *    did not specify IPC_CREAT.
+ * 3) msgget(2) fails if a message queue exists for key, but the
+ *    calling process does not have permission to access the queue,
+ *    and does not have the CAP_IPC_OWNER capability.
  *
- *      28/03/2008 Renaud Lottiaux ([email protected])
- *      - Fix concurrency issue. The second key used for this test was
- *        sometime conflicting with the key from another task.
- *        Generate a valid second key through getipckey to avoid conflicts.
- *
- * RESTRICTIONS
- *	none
  */
 
-#include "test.h"
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <pwd.h>
 
-#include "ipcmsg.h"
+#include "tst_ipcmsg.h"
+#include "tst_test.h"
 
-char *TCID = "msgget02";
-int TST_TOTAL = 3;
+static key_t msgkey1;
+static int msg_q_1 = -1;
 
-struct test_case_t {
-	int error;
-	int msgkey;
+static struct tcase {
+	int *key;
 	int flags;
-} TC[] = {
-	{
-	EEXIST, 0, IPC_CREAT | IPC_EXCL}, {
-	ENOENT, 1, IPC_PRIVATE}, {
-	ENOENT, 1, IPC_EXCL}
+	int exp_err;
+} tcases[] = {
+	{&msgkey, IPC_CREAT | IPC_EXCL, EEXIST},
+	{&msgkey1, IPC_PRIVATE, ENOENT},
+	{&msgkey1, IPC_EXCL, ENOENT},
+	{&msgkey, MSG_RD, EACCES},
+	{&msgkey, MSG_WR, EACCES},
+	{&msgkey, MSG_RD | MSG_WR, EACCES}
 };
 
-key_t msgkey1;
-int msg_q_1 = -1;		/* The message queue id created in setup */
-
-int main(int ac, char **av)
+static void verify_msgget(struct tcase *tc)
 {
-	int lc;
-	int i;
-	key_t key;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();		/* global setup */
+	TEST(msgget(*tc->key, tc->flags));
 
-	/* 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;
-
-		/* loop through the test cases */
-
-		for (i = 0; i < TST_TOTAL; i++) {
-
-			if (TC[i].msgkey == 0)
-				key = msgkey;
-			else
-				key = msgkey1;
-
-			TEST(msgget(key, TC[i].flags));
+	if (TEST_RETURN != -1) {
+		tst_res(TFAIL, "msgget() succeeded unexpectedly");
+		return;
+	}
 
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "msgget() call succeeded "
-					 "on expected fail");
-				continue;
-			}
+	if (TEST_ERRNO == tc->exp_err)
+		tst_res(TPASS | TTERRNO, "msgget() failed as expected");
+	else
+		tst_res(TFAIL | TTERRNO, "msgget() failed unexpectedly,"
+			" expected %s", tst_strerrno(tc->exp_err));
+}
 
-			switch (TEST_ERRNO) {
-			case ENOENT:
-			 /*FALLTHROUGH*/ case EEXIST:
-				if (TEST_ERRNO == TC[i].error) {
-					tst_resm(TPASS, "expected failure - "
-						 "errno = %d : %s", TEST_ERRNO,

testcases/kernel/syscalls/ipc/msgget/msgget02.c +4 -26

 		}
 	}
-
-	cleanup();
-
-	tst_exit();
 }
 
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
+static 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();
-
 	msgkey = getipckey();
 	msgkey1 = getipckey();
 
-	/* now we have a key, so let's create a message queue */
-	if ((msg_q_1 = msgget(msgkey, IPC_CREAT | IPC_EXCL)) == -1) {
-		system("ipcs > /tmp/toto");
-		system("ps -aux >> /tmp/toto");
-		tst_brkm(TBROK, cleanup, "Can't create message queue");
-	}
+	msg_q_1 = msgget(msgkey, IPC_CREAT | IPC_EXCL);
+	if (msg_q_1 == -1)
+		tst_brk(TBROK, "Can't create message queue");
 }

+ * NAME: msgget03.c

* DESCRIPTION
- * msgget03 - test for an ENOSPC error by using up all available
- * message queues.
- *
- * ALGORITHM
- * Get all the message queues that can be allocated
- * loop if that option was specified
- * Try to get one more message queue
- * check the errno value
- * issue a PASS message if we get ENOSPC
- * otherwise, the tests fails

- *	  issue a FAIL message
- *	  break any remaining tests
- *	  call cleanup

- *
- * USAGE: <for command-line>
- * msgget03 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.

- *	       -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.

+ * test for an ENOSPC error by using up all available
+ * message queues.
*
- * HISTORY
- * 03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- * none
*/

testcases/kernel/syscalls/ipc/msgget/msgget03.c +19 -70

-#include "test.h"
-
-#include "ipcmsg.h"
-
-char *TCID = "msgget03";
-int TST_TOTAL = 1;
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <stdlib.h>
 
-int maxmsgs = 0;
+#include "tst_ipcmsg.h"
+#include "tst_test.h"
 
-int *msg_q_arr = NULL;		/* hold the id's that we create */
-int num_queue = 0;		/* count the queues created */
+static int maxmsgs;
+static int *msg_q_arr;
 
-int main(int ac, char **av)
+static void verify_msgget(void)
 {
-	int lc;
-	int msg_q;
-
-	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;
-
-		/*
-		 * Use a while loop to create the maximum number of queues.
-		 * When we get an error, check for ENOSPC.
-		 */
-		while ((msg_q =
-			msgget(msgkey + num_queue,
-			       IPC_CREAT | IPC_EXCL)) != -1) {
-			msg_q_arr[num_queue] = msg_q;
-			if (num_queue == maxmsgs) {
-				tst_resm(TINFO, "The maximum number of message"
-					 " queues (%d) has been reached",
-					 maxmsgs);
-				break;
-			}
-			num_queue++;
-		}
-
-		switch (errno) {
-		case ENOSPC:
-			tst_resm(TPASS, "expected failure - errno = %d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-			break;
-		default:
-			tst_resm(TFAIL, "call failed with an "
-				 "unexpected error - %d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-			break;
-		}
-	}
-
-	cleanup();
-
-	tst_exit();
+	TEST(msgget(msgkey + maxmsgs, IPC_CREAT | IPC_EXCL));
+	if (TEST_RETURN != -1)
+		tst_res(TFAIL, "msgget() succeeded unexpectedly");
+
+	if (TEST_ERRNO == ENOSPC)
+		tst_res(TPASS | TTERRNO, "msgget() failed as expected");
+	else
+		tst_res(TFAIL | TTERRNO, "msgget() failed unexpectedly,"
+			" expected %s", tst_strerrno(ENOSPC));
 }
 
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
+static 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.
-	 */

testcases/kernel/syscalls/ipc/msgget/msgget03.c +11 -8

+	for (num = 0; num < maxmsgs; num++) {
+		msg_q_arr[num] = -1;
+
+		res = msgget(msgkey + num, IPC_CREAT | IPC_EXCL);
+		if (res != -1)
+			msg_q_arr[num] = res;
+	}
+
+	tst_res(TINFO, "The maximum number of message queues (%d) has been reached", maxmsgs);
 }
 
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void cleanup(void)
+static void cleanup(void)
 {
-	int i;
+	int num;
 
-	/*
-	 * remove the message queues if they were created

1) add tst_ipcmsg.h for new API
2) add tst_ipcsem.h for new API
3???add tst_ipcshm.h for new API

4) fix libipc.c for new API

Signed-off-by Xiao Yang <[email protected]>

---
 testcases/kernel/syscalls/ipc/lib/libipc.c     |  6 +--
 testcases/kernel/syscalls/ipc/lib/tst_ipcmsg.h | 61 ++++++++++++++++++++++++++
 testcases/kernel/syscalls/ipc/lib/tst_ipcsem.h | 52 ++++++++++++++++++++++
 testcases/kernel/syscalls/ipc/lib/tst_ipcshm.h | 47 ++++++++++++++++++++
 4 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 testcases/kernel/syscalls/ipc/lib/tst_ipcmsg.h
 create mode 100644 testcases/kernel/syscalls/ipc/lib/tst_ipcsem.h
 create mode 100644 testcases/kernel/syscalls/ipc/lib/tst_ipcshm.h

testcases/kernel/syscalls/ipc/lib/libipc.c +2 -2

index 4de7faa..856bfdb 100644
@@ -58,7 +58,7 @@ key_t getipckey(void)
 	static int count = 0;
 
 	if (NULL == (curdir = getcwd(curdir, size))) {
-		tst_brkm(TBROK, cleanup, "Can't get current directory "
+		tst_brkm(TBROK, NULL, "Can't get current directory "
 			 "in getipckey()");
 	}
 

@@ -72,7 +72,7 @@ key_t getipckey(void)
 	count++;
 
 	if ((ipc_key = ftok(curdir, proj_id)) == -1) {
-		tst_brkm(TBROK, cleanup, "Can't get msgkey from ftok()");
+		tst_brkm(TBROK, NULL, "Can't get msgkey from ftok()");
 	}
 
 	return (ipc_key);

testcases/kernel/syscalls/ipc/lib/tst_ipcmsg.h new file +61 -0

new file mode 100644
index 0000000..ec80e31
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016 Xiao Yang <[email protected]>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ */
+
+/*
+ * ipcmsg.h - common definitions for the IPC message tests.
+ */
+
+#ifndef __IPCMSG_H
+#define __IPCMSG_H	1
+
+#include <errno.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/types.h>
+
+#define MSG_RD  0400            /* read permission for the queue */
+#define MSG_WR  0200            /* write permission for the queue */
+#define MSG_RW	(MSG_RD | MSG_WR)
+
+#define MSGSIZE	1024		/* a resonable size for a message */
+#define MSGTYPE 1		/* a type ID for a message */
+
+#define NR_MSGQUEUES	16	/* MSGMNI as defined in linux/msg.h */
+
+#define min(a, b)	(((a) < (b)) ? @ : (b))
+
+typedef struct mbuf {		/* a generic message structure */
+	long mtype;
+	char mtext[MSGSIZE + 1];  /* add 1 here so the message can be 1024   */
+} MSGBUF;			  /* characters long with a '\0' termination */
+
+#ifdef LIBIPC
+key_t msgkey;                   /* the ftok() generated message key */
+#else
+extern key_t msgkey;                   /* the ftok() generated message key */
+#endif
+
+void init_buf(MSGBUF *m_buf, int type, int size);
+void rm_queue(int queue_id);
+
+key_t getipckey(void);
+int getuserid(char *user);
+
+int get_max_msgqueues(void);
+int get_used_msgqueues(void);
+
+#endif /* ipcmsg.h */

testcases/kernel/syscalls/ipc/lib/tst_ipcsem.h new file +52 -0

new file mode 100644
index 0000000..d9be9ab
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016 Xiao Yang <[email protected]>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ */
+
+/*
+ * ipcsem.h - common definitions for the IPC semaphore tests
+ */
+
+#ifndef __IPCSEM_H
+#define __IPCSEM_H
+
+#include <errno.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+
+#include "lapi/semun.h"
+
+#define SEM_RD	0400
+#define SEM_ALT	0200
+#define SEM_RA	(SEM_RD | SEM_ALT)
+
+/*
+ * a reasonable value for the number of
+ * "primitive semaphores" per ID
+ */
+#define PSEMS	10
+
+#ifdef LIBIPC
+key_t semkey;			/* an IPC key generated by ftok() */
+#else
+extern key_t semkey;		/* an IPC key generated by ftok() */
+#endif
+
+void rm_sema(int sem_id);
+
+int getipckey(void);
+int getuserid(char *user);
+
+#endif /* ipcsem.h */

testcases/kernel/syscalls/ipc/lib/tst_ipcshm.h new file +47 -0

new file mode 100644
index 0000000..c5876d4
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016 Xiao Yang <[email protected]>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ */
+
+/*
+ * ipcshm.h - common definitions for the IPC shared memory tests
+ */
+
+#ifndef __IPCSHM_H
+#define __IPCSHM_H
+
+#include <errno.h>
+#include <wait.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
+#define SHM_RD	0400
+#define SHM_WR	0200
+#define SHM_RW	(SHM_RD | SHM_WR)
+
+#define SHM_SIZE	2048	/* a resonable size for a memory segment */
+#define INT_SIZE	4	/* instead of sizeof(int) */
+
+#define MODE_MASK	0x01FF	/* to get the lower nine permission bits */
+				/* from shmid_ds.ipc_perm.mode		 */
+
+key_t shmkey;			/* an IPC key generated by ftok() */
+
+void rm_shm(int shm_id);
+
+int getipckey(void);
+int getuserid(char *user);
+
+#endif /* ipcshm.h */

Signature · 7 lines

1.8.3.1




-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

include $(top_srcdir)/include/mk/generic_trunk_target.mk

testcases/kernel/syscalls/ipc/libnewipc/Makefile new file +12 -0

new file mode 100644
index 0000000..e5190f9
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2016 Xiao Yang <[email protected]>
+#
+# 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.

testcases/kernel/syscalls/ipc/libnewipc/Makefile new file +1 -0

+include $(top_srcdir)/include/mk/lib.mk

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c new file +18 -0

new file mode 100644
index 0000000..5e27662
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2016 Xiao Yang <[email protected]>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ */
+
+/*

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c new file +12 -0

+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdlib.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/shm.h>
+#include <sys/sem.h>
+
+#include "libnewipc.h"

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c new file +4 -0

+	key = ftok(buf, id);
+	if (key == -1)
+		tst_brk(TBROK | TERRNO, "ftok() failed");
+

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c new file +4 -0

+		tst_res(TINFO, "This could lead to IPC resource problems.");
+		tst_res(TINFO, "id = %d", queue_id);
+	}
+}

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c new file +4 -0

+int get_used_msgqueues(void)
+{
+	FILE *f;
+	int used_queues;

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c new file +10 -0

+	if (used_queues < 0) {
+		tst_brk(TBROK, "Could not read output of 'ipcs' to "
+			"calculate used message queues");
+	}
+
+	return used_queues;
+}
+
+int get_max_msgqueues(void)
+{

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c new file +1 -0

+}

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.h new file +13 -0

new file mode 100644
index 0000000..6a3064d
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016 Xiao Yang <[email protected]>
+ *
+ * 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.
+ *

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.h new file +28 -0

+#define MSG_RD	0400
+#define MSG_WR	0200
+#define MSG_RW	(MSG_RD | MSG_WR)
+#define MSGSIZE	1024
+#define MSGTYPE	1
+#define NR_MSGQUEUES	16
+#define min(a, b)	(((a) < (b)) ? @ : (b))
+
+#define SEM_RD	0400
+#define SEM_ALT	0200
+#define SEM_RA	(SEM_RD | SEM_ALT)
+#define PSEMS	10
+
+#define SHM_RD	0400
+#define SHM_WR	0200
+#define SHM_RW	(SHM_RD | SHM_WR)
+#define SHM_SIZE	2048
+#define INT_SIZE	4
+#define MODE_MASK	0x01FF
+
+key_t getipckey(void);
+void rm_queue(int queue_id);
+void rm_sem(int sem_id);
+void rm_shm(int shm_id);
+int get_used_msgqueues(void);
+int get_max_msgqueues(void);
+
+#endif /* newlibipc.h */

Signature · 1 line

1.8.3.1

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c line 78

Quoted 7 lines

testcases/kernel/syscalls/ipc/libnewipc/libnewipc.c new file +7 -0

+void rm_queue(int queue_id)
+{
+	if (queue_id == -1)
+		return;
+
+	if (msgctl(queue_id, IPC_RMID, NULL) == -1) {
+		tst_res(TINFO, "WARNING: message queue deletion failed.");

^
This really should be TWARN, even the message includes 'WARNING' in the string. And we should include errno with TERRNO as well.

Or even better we should exit the test with TBROK here.

include $(top_srcdir)/include/mk/generic_leaf_target.mk

testcases/kernel/syscalls/ipc/msgget/msgget01.c +42 -140

index e8208b7..bc6c73a 100644
@@ -1,186 +1,85 @@
 /*
+ * Copyright (c) International Business Machines  Corp., 2001
  *
- *   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.
  */
 
 /*
- * NAME
- *	msgget01.c
- *
  * DESCRIPTION
- *	msgget01 - create a message queue, write a message to it and
- *		   read it back.
- *
- * ALGORITHM
- *	loop if that option was specified
- *	create a message queue
- *	check the return code
- *	  if failure, issue a FAIL message.
- *	otherwise,
- *	  if doing functionality testing by writting a message to the queue,
- *	  reading it back and comparing the two.
- *	  	if the messages are the same,
- *			issue a PASS message
- *		otherwise
- *			issue a FAIL message
- *	call cleanup
- *
- * USAGE:  <for command-line>
- *  msgget01 [-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, write a message to it and
+ * read it back.
  */
 
-#include "ipcmsg.h"
-
+#include <errno.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
 
-char *TCID = "msgget01";
-int TST_TOTAL = 1;
+#include "libnewipc.h"
+#include "tst_test.h"
 
-int msg_q_1 = -1;		/* to hold the message queue ID */
+static int msg_q_1 = -1;
+static key_t msgkey;
 
-int main(int ac, char **av)
+static struct buf {
+	long type;
+	char text[MSGSIZE + 1];
+} snd_buf, rcv_buf;
+
+static void verify_msgget(void)
 {
-	int lc;
-	void check_functionality(void);
-
-	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;
-
-		/*
-		 * Use TEST macro to make the call to create the message queue
-		 */
-
-		TEST(msgget(msgkey, IPC_CREAT | IPC_EXCL | MSG_RD | MSG_WR));
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "%s call failed - errno = %d : %s",
-				 TCID, TEST_ERRNO, strerror(TEST_ERRNO));
-		} else {
-			msg_q_1 = TEST_RETURN;
-			/*
-			 * write a message to the queue.
-			 * read back the message.
-			 * PASS the test if they are the same.
-			 */
-			check_functionality();
-		}
-
-		/*
-		 * remove the message queue that was created and mark the ID
-		 * as invalid.
-		 */
-		if (msg_q_1 != -1) {
-			rm_queue(msg_q_1);
-			msg_q_1 = -1;
-		}
+	TEST(msgget(msgkey, IPC_CREAT | MSG_RW));
+	if (TEST_RETURN == -1) {
+		tst_res(TFAIL | TTERRNO, "msgget() failed");
+		return;
 	}
 
-	cleanup();
-	tst_exit();
-}
+	msg_q_1 = TEST_RETURN;
 
-/*
- * check_functionality() - check the functionality of the tested system call.
- */
-void check_functionality(void)
-{
-	int i = 0;
-	MSGBUF snd_buf, rcv_buf;
-
-	/* EAGLE: Houston, Tranquility Base here. The Eagle has landed! */
-	char *queue_msg =
-	    "Qston, check_functionality here.  The message has queued!";
-
-	/*
-	 * copy our message into the buffer and then set the type.
-	 */
-	do {
-		snd_buf.mtext[i++] = *queue_msg;
-	} while (*queue_msg++ != '\0');
-
-	snd_buf.mtype = MSGTYPE;
-
-	/* send the message */
-	if (msgsnd(msg_q_1, &snd_buf, MSGSIZE, 0) == -1) {
-		tst_brkm(TBROK, cleanup, "Could not send a message in the "
-			 "check_functionality() routine.");
-	}
+	if (msgsnd(msg_q_1, &snd_buf, MSGSIZE, 0) == -1)
+		tst_brk(TBROK | TERRNO, "msgsnd() failed");
 
-	/* receive the message */
-	if (msgrcv(msg_q_1, &rcv_buf, MSGSIZE, MSGTYPE, IPC_NOWAIT) == -1) {
-		tst_brkm(TBROK, cleanup, "Could not read a messages in the "
-			 "check_functionality() routine.");
-	}
+	if (msgrcv(msg_q_1, &rcv_buf, MSGSIZE, MSGTYPE, IPC_NOWAIT) == -1)
+		tst_brk(TBROK | TERRNO, "msgrcv() failed");
 
-	if (strcmp(snd_buf.mtext, rcv_buf.mtext) == 0) {
-		tst_resm(TPASS, "message received = message sent");
-	} else {
-		tst_resm(TFAIL, "message received != message sent");
-	}
+	if (strcmp(snd_buf.text, rcv_buf.text) == 0)
+		tst_res(TPASS, "message received = message sent");
+	else
+		tst_res(TFAIL, "message received != message sent");
 }
 
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
+static void setup(void)
 {
+	msgkey = getipckey();
 
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-

testcases/kernel/syscalls/ipc/msgget/msgget01.c +0 -3

 }
 
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.

testcases/kernel/syscalls/ipc/msgget/msgget01.c +8 -0

 }
+
+static struct tst_test test = {
+	.tid = "msgget01",
+	.setup = setup,
+	.cleanup = cleanup,
+	.test_all = verify_msgget,
+	.needs_tmpdir = 1
+};

Signature · 1 line

1.8.3.1

}

testcases/kernel/syscalls/ipc/msgget/msgget03.c +16 -27

-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
+static 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();
+	int res, num;
 
 	msgkey = getipckey();
 
 	maxmsgs = get_max_msgqueues();
 	if (maxmsgs < 0)
-		tst_brkm(TBROK, cleanup, "get_max_msgqueues failed");
+		tst_brk(TBROK, "get_max_msgqueues failed");
 
-	msg_q_arr = (int *)calloc(maxmsgs, sizeof(int));
-	if (msg_q_arr == NULL) {
-		tst_brkm(TBROK, cleanup, "Couldn't allocate memory "
-			 "for msg_q_arr: calloc() failed");
+	msg_q_arr = SAFE_MALLOC(maxmsgs * sizeof(int));
+
+	for (num = 0; num < maxmsgs; num++) {
+		msg_q_arr[num] = -1;
+
+		res = msgget(msgkey + num, IPC_CREAT | IPC_EXCL);
+		if (res != -1)
+			msg_q_arr[num] = res;
 	}
+
+	tst_res(TINFO, "The maximum number of message queues (%d) reached",
+		maxmsgs);
 }
 
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void cleanup(void)
+static void cleanup(void)
 {
-	int i;
+	int num;
 
-	/*

Move test result description to tst_res.h so that we can use them independently for new ipc.

testcases/kernel/syscalls/ipc/Makefile +16 -19

@@ -1,19 +1,18 @@
 #
-#  Copyright (c) International Business Machines  Corp., 2001
+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
+# You should have received a copy of the GNU General Public License
+# along with this program.
 #
 
 top_srcdir		?= ../../../..

@@ -21,20 +20,19 @@ top_srcdir		?= ../../../..
 include $(top_srcdir)/include/mk/env_pre.mk
 
 LIBDIR			:= lib
-FILTER_OUT_DIRS		:= $(LIBDIR)
-LIB			:= $(LIBDIR)/libipc.a $(LIBDIR)/libmsgctl.a
+NEWLIBDIR		:= libnewipc
+LIB			:= $(LIBDIR)/libipc.a $(LIBDIR)/libmsgctl.a $(NEWLIBDIR)/libnewipc.a
 
-$(LIBDIR):
-	mkdir -p "$@"
-
-$(LIB): $(LIBDIR)
-	$(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all
+$(LIB): $(LIBDIR) $(NEWLIBDIR)
+	$(MAKE) -C $(LIBDIR) -f "$(abs_srcdir)/$(LIBDIR)/Makefile" all
+	$(MAKE) -C $(NEWLIBDIR) -f "$(abs_srcdir)/$(NEWLIBDIR)/Makefile" all

I've just found that this whole Makefile has been broken for ages and that the old library was build only by the inclusion of the Makefile.inc in the test directories, I wonder why this wasn't breaking parallel build at all. The whole reason is that MAKE_DEPS is ignored when MAKE_TARGETS is empty so the $(LIB) targets are not rebuild and removing the $(LIBDIR) from FILTER_OUT_DIRS is not solution either since that will break parallel build for sure.

I will do something about this. One solution may be to set the MAKE_TARGETS to some phony target if it's empty. Let's see if I can figure out something better.

So the correct way how to fix this issue is to add the libnewipc to the FILTER_OUT_DIRS and create Makefile2.inc similar to Makefile.inc. I will change the first patch to do exactly that and push the patchset.

Hi!

Quoted 3 lines

So the correct way how to fix this issue is to add the libnewipc to the FILTER_OUT_DIRS and create Makefile2.inc similar to Makefile.inc. I will change the first patch to do exactly that and push the patchset.

And I've pushed the patches, thanks.

I've added Makefile2.inc and also added clean target to the top level Makefile so that the libnewipc is cleaned up on make clean.

And also merged the three msgget patches into one, since once the Makefile.inc is changed for Makefile2.inc in the Makefile the rest of the msgget testcases fails to build, which breaks bisecting. Ideally each commit should leave the tree in a state that at least compiles cleanly...

Hi!

Quoted 2 lines

Move test result description to tst_res.h so that we can use them independently for new ipc.

Isn't definining TST_NO_DEFAULT_MAIN before you include tst_test.h enough? Is there any other problem?