Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/regress/sys/kern The SysV IPC tests have been converted to atf
details: https://anonhg.NetBSD.org/src/rev/a4d86ccab7ec
branches: trunk
changeset: 782530:a4d86ccab7ec
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Mon Nov 05 04:11:44 2012 +0000
description:
The SysV IPC tests have been converted to atf
diffstat:
regress/sys/kern/Makefile | 5 +-
regress/sys/kern/sysvmsg/Makefile | 15 -
regress/sys/kern/sysvmsg/msgtest.c | 350 -------------------------------------
regress/sys/kern/sysvsem/Makefile | 15 -
regress/sys/kern/sysvsem/semtest.c | 338 -----------------------------------
regress/sys/kern/sysvshm/Makefile | 15 -
regress/sys/kern/sysvshm/shmtest.c | 289 ------------------------------
7 files changed, 2 insertions(+), 1025 deletions(-)
diffs (truncated from 1059 to 300 lines):
diff -r 5d70da11a8cb -r a4d86ccab7ec regress/sys/kern/Makefile
--- a/regress/sys/kern/Makefile Mon Nov 05 04:09:34 2012 +0000
+++ b/regress/sys/kern/Makefile Mon Nov 05 04:11:44 2012 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2009/02/20 21:45:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2012/11/05 04:11:44 pgoyette Exp $
SUBDIR+= execve getcwd lockf lockf2 ras \
- sigtramp sleeping sysvmsg sysvsem sysvshm \
- unfdpass
+ sigtramp sleeping unfdpass
.include <bsd.subdir.mk>
diff -r 5d70da11a8cb -r a4d86ccab7ec regress/sys/kern/sysvmsg/Makefile
--- a/regress/sys/kern/sysvmsg/Makefile Mon Nov 05 04:09:34 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2002/09/18 05:41:55 lukem Exp $
-
-NOMAN= # defined
-
-PROG= msgtest
-WARNS= 1
-
-regress:
- @if ./msgtest ./msgtest; then \
- echo "PASSED"; \
- else \
- echo "FAILED"; \
- fi
-
-.include <bsd.prog.mk>
diff -r 5d70da11a8cb -r a4d86ccab7ec regress/sys/kern/sysvmsg/msgtest.c
--- a/regress/sys/kern/sysvmsg/msgtest.c Mon Nov 05 04:09:34 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,350 +0,0 @@
-/* $NetBSD: msgtest.c,v 1.10 2008/04/28 20:23:07 martin Exp $ */
-
-/*-
- * Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center, and by Andrew Doran.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Test the SVID-compatible Message Queue facility.
- */
-
-#include <sys/param.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <sys/wait.h>
-
-#include <err.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-int main(int, char *[]);
-void print_msqid_ds(struct msqid_ds *, mode_t);
-void sigsys_handler(int);
-void sigchld_handler(int);
-void cleanup(void);
-void receiver(void);
-void usage(void);
-
-#define MESSAGE_TEXT_LEN 256
-
-struct mymsg {
- long mtype;
- char mtext[MESSAGE_TEXT_LEN];
-};
-
-const char *m1_str = "California is overrated.";
-const char *m2_str = "The quick brown fox jumped over the lazy dog.";
-
-#define MTYPE_1 1
-#define MTYPE_1_ACK 2
-
-#define MTYPE_2 3
-#define MTYPE_2_ACK 4
-
-int sender_msqid = -1;
-pid_t child_pid;
-
-key_t msgkey;
-
-int maxloop = 1;
-
-int
-main(argc, argv)
- int argc;
- char *argv[];
-{
- struct sigaction sa;
- struct msqid_ds m_ds;
- struct mymsg m;
- sigset_t sigmask;
- int loop;
-
- if (argc == 3)
- maxloop = atoi(argv[2]);
- else if (argc != 2)
- usage();
-
- /*
- * Install a SIGSYS handler so that we can exit gracefully if
- * System V Message Queue support isn't in the kernel.
- */
- sa.sa_handler = sigsys_handler;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = 0;
- if (sigaction(SIGSYS, &sa, NULL) == -1)
- err(1, "sigaction SIGSYS");
-
- /*
- * Install and SIGCHLD handler to deal with all possible exit
- * conditions of the receiver.
- */
- sa.sa_handler = sigchld_handler;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = 0;
- if (sigaction(SIGCHLD, &sa, NULL) == -1)
- err(1, "sigaction SIGCHLD");
-
- msgkey = ftok(argv[1], 4160);
-
- /*
- * Initialize child_pid to ourselves to that the cleanup function
- * works before we create the receiver.
- */
- child_pid = getpid();
-
- /*
- * Make sure that when the sender exits, the message queue is
- * removed.
- */
- if (atexit(cleanup) == -1)
- err(1, "atexit");
-
- if ((sender_msqid = msgget(msgkey, IPC_CREAT | 0640)) == -1)
- err(1, "msgget");
-
- if (msgctl(sender_msqid, IPC_STAT, &m_ds) == -1)
- err(1, "msgctl IPC_STAT");
-
- print_msqid_ds(&m_ds, 0640);
-
- m_ds.msg_perm.mode = (m_ds.msg_perm.mode & ~0777) | 0600;
-
- if (msgctl(sender_msqid, IPC_SET, &m_ds) == -1)
- err(1, "msgctl IPC_SET");
-
- memset(&m_ds, 0, sizeof(m_ds));
-
- if (msgctl(sender_msqid, IPC_STAT, &m_ds) == -1)
- err(1, "msgctl IPC_STAT");
-
- if ((m_ds.msg_perm.mode & 0777) != 0600)
- err(1, "IPC_SET of mode didn't hold");
-
- print_msqid_ds(&m_ds, 0600);
-
- switch ((child_pid = fork())) {
- case -1:
- err(1, "fork");
- /* NOTREACHED */
-
- case 0:
- receiver();
- break;
-
- default:
- break;
- }
-
- for (loop = 0; loop < maxloop; loop++) {
- /*
- * Send the first message to the receiver and wait for the ACK.
- */
- m.mtype = MTYPE_1;
- strcpy(m.mtext, m1_str);
- if (msgsnd(sender_msqid, &m, sizeof(m), 0) == -1)
- err(1, "sender: msgsnd 1");
-
- if (msgrcv(sender_msqid, &m, sizeof(m), MTYPE_1_ACK, 0) !=
- sizeof(m))
- err(1, "sender: msgrcv 1 ack");
-
- print_msqid_ds(&m_ds, 0600);
-
- /*
- * Send the second message to the receiver and wait for the ACK.
- */
- m.mtype = MTYPE_2;
- strcpy(m.mtext, m2_str);
- if (msgsnd(sender_msqid, &m, sizeof(m), 0) == -1)
- err(1, "sender: msgsnd 2");
-
- if (msgrcv(sender_msqid, &m, sizeof(m), MTYPE_2_ACK, 0) !=
- sizeof(m))
- err(1, "sender: msgrcv 2 ack");
- }
-
- /*
- * Suspend forever; when we get SIGCHLD, the handler will exit.
- */
- sigemptyset(&sigmask);
- (void) sigsuspend(&sigmask);
-
- /*
- * ...and any other signal is an unexpected error.
- */
- errx(1, "sender: received unexpected signal");
-}
-
-void
-sigsys_handler(signo)
- int signo;
-{
-
- errx(1, "System V Message Queue support is not present in the kernel");
-}
-
-void
-sigchld_handler(signo)
- int signo;
-{
- struct msqid_ds m_ds;
- int cstatus;
-
- /*
- * Reap the child; if it exited successfully, then the test passed!
- */
- if (waitpid(child_pid, &cstatus, 0) != child_pid)
- err(1, "waitpid");
-
- if (WIFEXITED(cstatus) == 0)
- errx(1, "receiver exited abnormally");
-
- if (WEXITSTATUS(cstatus) != 0)
- errx(1, "receiver exited with status %d",
- WEXITSTATUS(cstatus));
-
- /*
- * If we get here, the child has exited normally, and thus
- * we should exit normally too. First, tho, we print out
- * the final stats for the message queue.
- */
-
- if (msgctl(sender_msqid, IPC_STAT, &m_ds) == -1)
- err(1, "msgctl IPC_STAT");
-
- print_msqid_ds(&m_ds, 0600);
-
- exit(0);
-}
-
-void
-cleanup()
-{
-
- /*
- * If we're the sender, and it exists, remove the message queue.
- */
- if (child_pid != 0 && sender_msqid != -1) {
- if (msgctl(sender_msqid, IPC_RMID, NULL) == -1)
- warn("msgctl IPC_RMID");
- }
-}
-
-void
Home |
Main Index |
Thread Index |
Old Index