[src/trunk]: src/sys Switch default for pipes to the faster John S. Dyson's i...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c794b9b1a1e
branches:  trunk
changeset: 522132:3c794b9b1a1e
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Feb 11 18:11:41 2002 +0000

description:
Switch default for pipes to the faster John S. Dyson's implementation.
Old, socketpair-based ones are available with option PIPE_SOCKETPAIR.

diffstat:

 sys/conf/files           |   5 ++---
 sys/kern/init_main.c     |  10 +++++-----
 sys/kern/kern_sysctl.c   |  10 +++++-----
 sys/kern/uipc_syscalls.c |  10 +++++-----
 4 files changed, 17 insertions(+), 18 deletions(-)

diffs (152 lines):

diff -r 635de0b580c1 -r 3c794b9b1a1e sys/conf/files
--- a/sys/conf/files    Mon Feb 11 18:06:34 2002 +0000
+++ b/sys/conf/files    Mon Feb 11 18:11:41 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.494 2002/02/11 18:03:00 jdolecek Exp $
+#      $NetBSD: files,v 1.495 2002/02/11 18:11:41 jdolecek Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -12,7 +12,6 @@
 defparam                       RTC_OFFSET
 defparam                       DEFCORENAME
 defflag                                UCONSOLE
-defflag                                NEW_PIPE
 defflag        opt_pipe.h              PIPE_SOCKETPAIR PIPE_NODIRECT
 
 defflag                                MULTIPROCESSOR
@@ -1099,7 +1098,7 @@
 file   kern/subr_userconf.c            userconf
 file   kern/subr_xxx.c
 file   kern/sys_generic.c
-file   kern/sys_pipe.c                 new_pipe
+file   kern/sys_pipe.c                 !pipe_socketpair
 file   kern/sys_process.c
 file   kern/sys_socket.c
 file   kern/syscalls.c                 syscall_debug
diff -r 635de0b580c1 -r 3c794b9b1a1e sys/kern/init_main.c
--- a/sys/kern/init_main.c      Mon Feb 11 18:06:34 2002 +0000
+++ b/sys/kern/init_main.c      Mon Feb 11 18:11:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_main.c,v 1.197 2002/01/01 09:17:28 perry Exp $    */
+/*     $NetBSD: init_main.c,v 1.198 2002/02/11 18:11:43 jdolecek Exp $ */
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou.  All rights reserved.
@@ -42,14 +42,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.197 2002/01/01 09:17:28 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.198 2002/02/11 18:11:43 jdolecek Exp $");
 
 #include "fs_nfs.h"
 #include "opt_nfsserver.h"
 #include "opt_sysv.h"
 #include "opt_maxuprc.h"
 #include "opt_multiprocessor.h"
-#include "opt_new_pipe.h"
+#include "opt_pipe.h"
 #include "opt_syscall_debug.h"
 
 #include "rnd.h"
@@ -95,7 +95,7 @@
 #if NRND > 0
 #include <sys/rnd.h>
 #endif
-#ifdef NEW_PIPE
+#ifndef PIPE_SOCKETPAIR
 #include <sys/pipe.h>
 #endif
 
@@ -506,7 +506,7 @@
        /* Initialize exec structures */
        exec_init(1);
 
-#ifdef NEW_PIPE
+#ifndef PIPE_SOCKETPAIR
        /* Initialize pipe structures */
        pipe_init();
 #endif
diff -r 635de0b580c1 -r 3c794b9b1a1e sys/kern/kern_sysctl.c
--- a/sys/kern/kern_sysctl.c    Mon Feb 11 18:06:34 2002 +0000
+++ b/sys/kern/kern_sysctl.c    Mon Feb 11 18:11:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_sysctl.c,v 1.101 2002/01/31 00:32:47 kleink Exp $ */
+/*     $NetBSD: kern_sysctl.c,v 1.102 2002/02/11 18:11:43 jdolecek Exp $       */
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -43,12 +43,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.101 2002/01/31 00:32:47 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.102 2002/02/11 18:11:43 jdolecek Exp $");
 
 #include "opt_ddb.h"
 #include "opt_insecure.h"
 #include "opt_defcorename.h"
-#include "opt_new_pipe.h"
+#include "opt_pipe.h"
 #include "opt_sysv.h"
 #include "pty.h"
 
@@ -98,7 +98,7 @@
 #include <ddb/ddbvar.h>
 #endif
 
-#ifdef NEW_PIPE
+#ifndef PIPE_SOCKETPAIR
 #include <sys/pipe.h>
 #endif
 
@@ -541,7 +541,7 @@
        case KERN_MAXPTYS:
                return sysctl_pty(oldp, oldlenp, newp, newlen);
 #endif
-#ifdef NEW_PIPE
+#ifndef PIPE_SOCKETPAIR
        case KERN_PIPE:
                return (sysctl_dopipe(name + 1, namelen - 1, oldp, oldlenp,
                    newp, newlen));
diff -r 635de0b580c1 -r 3c794b9b1a1e sys/kern/uipc_syscalls.c
--- a/sys/kern/uipc_syscalls.c  Mon Feb 11 18:06:34 2002 +0000
+++ b/sys/kern/uipc_syscalls.c  Mon Feb 11 18:11:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_syscalls.c,v 1.67 2001/11/12 15:25:33 lukem Exp $ */
+/*     $NetBSD: uipc_syscalls.c,v 1.68 2002/02/11 18:11:43 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -36,10 +36,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.67 2001/11/12 15:25:33 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.68 2002/02/11 18:11:43 jdolecek Exp $");
 
 #include "opt_ktrace.h"
-#include "opt_new_pipe.h"
+#include "opt_pipe.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -854,7 +854,7 @@
        return (error);
 }
 
-#ifndef NEW_PIPE
+#ifdef PIPE_SOCKETPAIR
 /* ARGSUSED */
 int
 sys_pipe(struct proc *p, void *v, register_t *retval)
@@ -908,7 +908,7 @@
        (void)soclose(rso);
        return (error);
 }
-#endif /* !NEW_PIPE */
+#endif /* PIPE_SOCKETPAIR */
 
 /*
  * Get socket name.