Re: CVS commit: src/sys/fs/puffs
YAMAMOTO Takashi y...@mwd.biglobe.ne.jp wrote: This avoids deadlocks in the following situations: 1) when memory is low: ioflush waits the fileystem, the fielsystem waits for memory can you explain how it is a problem? As I understand, one way to free memory is to flush vnode backed pages to the backend storage. If ioflush calls VOP_FSYNC on a memory-starved userland filesystem, it will get stuck until the filesystem gets memory again, and while it is stuck, it does not help freeing memory. -- Emmanuel Dreyfus http://hcpnet.free.fr/pubz m...@netbsd.org
Re: CVS commit: src/sys
On Fri, Sep 23, 2011 at 05:09:23AM +, YAMAMOTO Takashi wrote: Fix the build that was broken by struct lwp *updateproc reference in RUMP-visible code. Instead of checking that updateproc (aka ioflush, aka syncer) will not sleep in PUFFS code, I check for any kernel thread: after all none of them are designed to hang awaiting for a remote filesystem operation to complete. i don't think it's a good idea to restrict what kernel threads can do in this way. please revert. Can you imagine a situation where you would expect a kernel thread to sleep in a VFS call? If you do, then I can propose to add a L_NOWAITFS flag in struct lwp's l_flags. That way ioflush could be set to avoid sleeping in PUFFS code while other thread would remain the ability. Another approach is to add a flag to VOP_STRATEGY so that the caller can tell the filesystem whether it can wait or not. -- Emmanuel Dreyfus m...@netbsd.org
Re: CVS commit: src/sys/fs/puffs
hi, YAMAMOTO Takashi y...@mwd.biglobe.ne.jp wrote: This avoids deadlocks in the following situations: 1) when memory is low: ioflush waits the fileystem, the fielsystem waits for memory can you explain how it is a problem? As I understand, one way to free memory is to flush vnode backed pages to the backend storage. If ioflush calls VOP_FSYNC on a memory-starved userland filesystem, it will get stuck until the filesystem gets memory again, and while it is stuck, it does not help freeing memory. as i told you a few times, ioflush is not a thread to free memory. pagedaemon is. please read ufs_bmaparray and grep uvm.pagedaemon_lwp in src/sys/kern/ to see what other filesystems do. i don't think this approach works for puffs because it's almost impossible to say in which cases an operation needs memory allocation to complete, though. YAMAMOTO Takashi -- Emmanuel Dreyfus http://hcpnet.free.fr/pubz m...@netbsd.org
Re: CVS commit: src/common/lib/libc/string
[Yay, catching up with a month's worth of source-changes...] On Mon, Aug 22, 2011 at 12:46:21PM +, Christos Zoulas wrote: In article 20110822104822.gb15...@britannica.bec.de, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Mon, Aug 22, 2011 at 01:26:24AM +, David Holland wrote: On Mon, Aug 22, 2011 at 03:13:29AM +0200, Joerg Sonnenberger wrote: On Sun, Aug 21, 2011 at 11:37:08PM +, David Holland wrote: On Mon, Aug 22, 2011 at 01:31:31AM +0200, Joerg Sonnenberger wrote: Modified Files: src/common/lib/libc/string: popcount32.c popcount64.c Log Message: Requires stdint.h. No? uh what? It doesn't. The prototypes in strings.h already ensure that uint32_t/uint64_t are present and that's the only thing it could ever need from stdint.h. Yes it does. strings.h is included by string.h and is therefore not allowed to include stdint.h itself. You are skinning the wrong cat. string.h shouldn't include strings.h in first place. I agree. It is wrong for string.h to include strings.h since it exposes the old bsd functions. To provide some perspective, the way the headers were laid out Back Then was meant to achieve near-conformance while (at the same time) to avoid breaking too much existing code. The latter situation ought to have improved since, though. :-) However, the issue I'm having with this is the addition of a new interface (popcount(3)) to what ought to be considered a mostly legacy (but still standard-defined) header (strings.h), which gives us the worst of both worlds. (I'd have voiced my concerns in time if I hadn't managed to entirely miss the introduction. *sigh*) - Klaus
Re: CVS commit: src/external/bsd/bind/dist/lib/isc/include/isc
On Wed, Sep 14, 2011 at 08:32:44AM +0100, David Laight wrote:
On Tue, Sep 13, 2011 at 03:07:44PM -0400, Christos Zoulas wrote:
Module Name:src
Committed By: christos
Date: Tue Sep 13 19:07:44 UTC 2011
Modified Files:
src/external/bsd/bind/dist/lib/isc/include/isc: util.h
Log Message:
Some versions of linux have probably marked fwrite(3) as
__attribute__((__warn_unused_result__))
What sort of moonshine are those guys on?
Checking the result of fwrite() (and fprintf()) for error is often
pointless since the error doesn't happen until the data is written.
While this case may be dubious, I think the __warn_unused_result__ attribute
is generally useful. It might even reveal a security bug one day. The lousy
practices of not checking return values were probably the reason for the
invention of exceptions and try {} catch {} -idioms, etc...
- Jukka.
Re: CVS commit: src/common/lib/libc/string
In article 20110923163839.ga4...@kleink.org, Klaus Klein kle...@kleink.org wrote: [Yay, catching up with a month's worth of source-changes...] On Mon, Aug 22, 2011 at 12:46:21PM +, Christos Zoulas wrote: In article 20110822104822.gb15...@britannica.bec.de, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Mon, Aug 22, 2011 at 01:26:24AM +, David Holland wrote: On Mon, Aug 22, 2011 at 03:13:29AM +0200, Joerg Sonnenberger wrote: On Sun, Aug 21, 2011 at 11:37:08PM +, David Holland wrote: On Mon, Aug 22, 2011 at 01:31:31AM +0200, Joerg Sonnenberger wrote: Modified Files: src/common/lib/libc/string: popcount32.c popcount64.c Log Message: Requires stdint.h. No? uh what? It doesn't. The prototypes in strings.h already ensure that uint32_t/uint64_t are present and that's the only thing it could ever need from stdint.h. Yes it does. strings.h is included by string.h and is therefore not allowed to include stdint.h itself. You are skinning the wrong cat. string.h shouldn't include strings.h in first place. I agree. It is wrong for string.h to include strings.h since it exposes the old bsd functions. To provide some perspective, the way the headers were laid out Back Then was meant to achieve near-conformance while (at the same time) to avoid breaking too much existing code. The latter situation ought to have improved since, though. :-) However, the issue I'm having with this is the addition of a new interface (popcount(3)) to what ought to be considered a mostly legacy (but still standard-defined) header (strings.h), which gives us the worst of both worlds. (I'd have voiced my concerns in time if I hadn't managed to entirely miss the introduction. *sigh*) It is not too late to fix. We should add a comment in strings.h so people stop addding stuff to it, and we should move those out to string.h. christos
Re: CVS commit: src/sys/fs/puffs
YAMAMOTO Takashi y...@mwd.biglobe.ne.jp wrote: as i told you a few times, ioflush is not a thread to free memory. pagedaemon is. Sure ioflush do not directly free memory, but vnodes' dirty page use memory, don't they? If ioflush stops working, is pageadaemon able to pageout that kind of memory? please read ufs_bmaparray and grep uvm.pagedaemon_lwp in src/sys/kern/ to see what other filesystems do. i don't think this approach works for puffs because it's almost impossible to say in which cases an operation needs memory allocation to complete, though. It is indeed impossible, as we cannot know what the userland filesystem will do. -- Emmanuel Dreyfus http://hcpnet.free.fr/pubz m...@netbsd.org
Re: CVS commit: src/sys/fs/puffs
hi, YAMAMOTO Takashi y...@mwd.biglobe.ne.jp wrote: as i told you a few times, ioflush is not a thread to free memory. pagedaemon is. Sure ioflush do not directly free memory, but vnodes' dirty page use memory, don't they? If ioflush stops working, is pageadaemon able to pageout that kind of memory? pagedaemon flushes dirty pages by itself, yes. please read ufs_bmaparray and grep uvm.pagedaemon_lwp in src/sys/kern/ to see what other filesystems do. i don't think this approach works for puffs because it's almost impossible to say in which cases an operation needs memory allocation to complete, though. It is indeed impossible, as we cannot know what the userland filesystem will do. a possible solution would be local page recycling. ie. reserve some pages and put them onto a page queue dedicated for a given set of processes so that pages can be recycled in the set independently from the global queue. YAMAMOTO Takashi -- Emmanuel Dreyfus http://hcpnet.free.fr/pubz m...@netbsd.org
Re: CVS commit: src/sys/fs/puffs
YAMAMOTO Takashi y...@mwd.biglobe.ne.jp wrote: Sure ioflush do not directly free memory, but vnodes' dirty page use memory, don't they? If ioflush stops working, is pageadaemon able to pageout that kind of memory? pagedaemon flushes dirty pages by itself, yes. So this is not a problem to get ioflush traped forever awaiting for a VOP_FSYNC completion? There must be some drawback, otherwise ioflush would be useless. a possible solution would be local page recycling. ie. reserve some pages and put them onto a page queue dedicated for a given set of processes so that pages can be recycled in the set independently from the global queue. But we do not know how much memory the userland fileserver is going to require. We can have some reserves, but we must be ready to kill pigs if too much memory is retained by the fileserver. HEAD does it, but netbsd-5 prefers to hang. -- Emmanuel Dreyfus http://hcpnet.free.fr/pubz m...@netbsd.org
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Fri Sep 23 06:43:47 UTC 2011
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
since omp.h is part of libgomp, put it in the libgomp files not the
libstdc++ files.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.63 src/tools/gcc/mknative-gcc:1.64
--- src/tools/gcc/mknative-gcc:1.63 Wed Sep 21 02:15:18 2011
+++ src/tools/gcc/mknative-gcc Fri Sep 23 06:43:46 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.63 2011/09/21 02:15:18 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.64 2011/09/23 06:43:46 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -464,6 +464,8 @@
$_TMPDIR/$_PLATFORM/libgomp/libgomp_f.h
write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/libgomp.spec \
$_TMPDIR/$_PLATFORM/libgomp/libgomp.spec
+ write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/omp.h \
+ $_TMPDIR/$_PLATFORM/libgomp/omp.h
}
# gnu/lib/libobjc #
@@ -517,8 +519,6 @@
$_TMPDIR/$_PLATFORM/libstdc++-v3/config.h
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/gstdint.h \
$_TMPDIR/$_PLATFORM/libstdc++-v3/include/gstdint.h
- write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/omp.h \
- $_TMPDIR/$_PLATFORM/libgomp/omp.h
{
# libsupc++
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Fri Sep 23 06:44:37 UTC 2011
Modified Files:
src/compat/amd64/i386: bsd.i386.mk
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
src/compat/sparc64/sparc: bsd.sparc.mk
Log Message:
build compat versions of libgomp for everything except mips N64 (for now.)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/compat/amd64/i386/bsd.i386.mk
cvs rdiff -u -r1.8 -r1.9 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.8 -r1.9 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.4 -r1.5 src/compat/sparc64/sparc/bsd.sparc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/amd64/i386/bsd.i386.mk
diff -u src/compat/amd64/i386/bsd.i386.mk:1.4 src/compat/amd64/i386/bsd.i386.mk:1.5
--- src/compat/amd64/i386/bsd.i386.mk:1.4 Thu Jul 21 03:13:30 2011
+++ src/compat/amd64/i386/bsd.i386.mk Fri Sep 23 06:44:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386.mk,v 1.4 2011/07/21 03:13:30 mrg Exp $
+# $NetBSD: bsd.i386.mk,v 1.5 2011/09/23 06:44:36 mrg Exp $
LD+= -m elf_i386
MLIBDIR= i386
@@ -10,5 +10,6 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+GOMP_MACHINE_ARCH= ${MLIBDIR}
.include ${.PARSEDIR}/../../m32.mk
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.8 src/compat/mips64/64/bsd.64.mk:1.9
--- src/compat/mips64/64/bsd.64.mk:1.8 Thu Jul 21 03:13:30 2011
+++ src/compat/mips64/64/bsd.64.mk Fri Sep 23 06:44:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.64.mk,v 1.8 2011/07/21 03:13:30 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $
.if ${MACHINE_ARCH} == mips64eb
LD+= -m elf64btsmip
@@ -7,6 +7,11 @@
.endif
MLIBDIR= 64
+# XXX
+# GCC 4.5 libgomp wants a different omp.h installed for the 64 bit
+# version of it, and we don't have a way of doing that yet.
+NO_LIBGOMP= 1
+
COPTS+= -mabi=64
CPUFLAGS+= -mabi=64
LDADD+= -mabi=64
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.8 src/compat/mips64/o32/bsd.o32.mk:1.9
--- src/compat/mips64/o32/bsd.o32.mk:1.8 Thu Jul 21 03:13:31 2011
+++ src/compat/mips64/o32/bsd.o32.mk Fri Sep 23 06:44:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.8 2011/07/21 03:13:31 mrg Exp $
+# $NetBSD: bsd.o32.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $
.if ${MACHINE_ARCH} == mips64eb
LD+= -m elf32btsmip
@@ -7,6 +7,8 @@
.endif
MLIBDIR= o32
+GOMP_MACHINE_ARCH=${MACHINE_ARCH:S/64//}
+
COPTS+= -mabi=32 -march=mips3
CPUFLAGS+= -mabi=32 -march=mips3
LDADD+= -mabi=32 -march=mips3
Index: src/compat/sparc64/sparc/bsd.sparc.mk
diff -u src/compat/sparc64/sparc/bsd.sparc.mk:1.4 src/compat/sparc64/sparc/bsd.sparc.mk:1.5
--- src/compat/sparc64/sparc/bsd.sparc.mk:1.4 Thu Jul 21 03:13:31 2011
+++ src/compat/sparc64/sparc/bsd.sparc.mk Fri Sep 23 06:44:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sparc.mk,v 1.4 2011/07/21 03:13:31 mrg Exp $
+# $NetBSD: bsd.sparc.mk,v 1.5 2011/09/23 06:44:37 mrg Exp $
LD+= -m elf32_sparc
MLIBDIR= sparc
@@ -10,5 +10,6 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+GOMP_MACHINE_ARCH= ${MLIBDIR}
.include ${.PARSEDIR}/../../m32.mk
CVS commit: src/lib
Module Name:src
Committed By: mrg
Date: Fri Sep 23 07:12:10 UTC 2011
Modified Files:
src/lib: Makefile
Log Message:
add libgomp to this list of libs; so compat finds it properly.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.176 src/lib/Makefile:1.177
--- src/lib/Makefile:1.176 Fri Aug 26 21:22:10 2011
+++ src/lib/Makefile Fri Sep 23 07:12:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.176 2011/08/26 21:22:10 dyoung Exp $
+# $NetBSD: Makefile,v 1.177 2011/09/23 07:12:10 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -75,6 +75,7 @@
SUBDIR+= ../gnu/lib/libobjc4
. else
SUBDIR+= ../external/gpl3/gcc/lib/libobjc
+SUBDIR+= ../external/gpl3/gcc/lib/libgomp
. endif
. if ${HAVE_GCC} = 45 !defined(MLIBDIR)
# Should probably move GMP, MPFR and MPC builds into the GCC = 4.5
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: mrg Date: Fri Sep 23 07:31:39 UTC 2011 Modified Files: src/usr.bin/fstat: fstat.c Log Message: apply some (uintptr_t) so that printing printers works on i386 (likely all 32 bit.) To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/usr.bin/fstat/fstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/fstat/fstat.c diff -u src/usr.bin/fstat/fstat.c:1.93 src/usr.bin/fstat/fstat.c:1.94 --- src/usr.bin/fstat/fstat.c:1.93 Thu Sep 22 17:27:50 2011 +++ src/usr.bin/fstat/fstat.c Fri Sep 23 07:31:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fstat.c,v 1.93 2011/09/22 17:27:50 christos Exp $ */ +/* $NetBSD: fstat.c,v 1.94 2011/09/23 07:31:39 mrg Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = @(#)fstat.c 8.3 (Berkeley) 5/2/95; #else -__RCSID($NetBSD: fstat.c,v 1.93 2011/09/22 17:27:50 christos Exp $); +__RCSID($NetBSD: fstat.c,v 1.94 2011/09/23 07:31:39 mrg Exp $); #endif #endif /* not lint */ @@ -1032,14 +1032,14 @@ default: /* print protocol number and socket address */ snprintf(fbuf, sizeof(fbuf), %d %jx, proto.pr_protocol, - (uintmax_t)sock); + (uintmax_t)(uintptr_t)sock); break; } if (fbuf[0] || lbuf[0]) printf( %s%s%s, fbuf, (fbuf[0] lbuf[0]) ? - : , lbuf); else if (so.so_pcb) - printf( %jx, (uintmax_t)so.so_pcb); + printf( %jx, (uintmax_t)(uintptr_t)so.so_pcb); (void)printf(\n); return; bad:
CVS commit: src/external/gpl3/gcc/lib/libgomp
Module Name:src Committed By: tron Date: Fri Sep 23 09:36:38 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libgomp: Makefile Log Message: Fix build with stack smash protection enabled. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgomp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libgomp/Makefile diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.4 src/external/gpl3/gcc/lib/libgomp/Makefile:1.5 --- src/external/gpl3/gcc/lib/libgomp/Makefile:1.4 Fri Sep 23 06:47:54 2011 +++ src/external/gpl3/gcc/lib/libgomp/Makefile Fri Sep 23 09:36:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/09/23 06:47:54 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2011/09/23 09:36:37 tron Exp $ # build GCC's libgomp, so that -fopenmp works. @@ -70,3 +70,5 @@ .endif # } .include bsd.lib.mk + +COPTS+= -Wno-stack-protector
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Fri Sep 23 10:27:14 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: ACPICA 20110922 is out. And the fun never stops: ACPI 5.0 is scheduled to be released soon. To generate a diff of this commit: cvs rdiff -u -r1.872 -r1.873 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.872 src/doc/3RDPARTY:1.873 --- src/doc/3RDPARTY:1.872 Fri Sep 16 21:08:32 2011 +++ src/doc/3RDPARTY Fri Sep 23 10:27:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.872 2011/09/16 21:08:32 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.873 2011/09/23 10:27:14 jruoho Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -25,7 +25,7 @@ # remaining lines until the end of the record are notes. Package: acpica -Version: 20110623 +Version: 20110922 Current Vers: 20110623 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/unix2_source_code.php
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: macallan
Date: Fri Sep 23 12:34:53 UTC 2011
Modified Files:
src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c
Log Message:
remove accidentially committed debug output
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.16 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.17
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.16 Thu Sep 22 05:08:52 2011
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Fri Sep 23 12:34:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.16 2011/09/22 05:08:52 macallan Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.17 2011/09/23 12:34:52 macallan Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.16 2011/09/22 05:08:52 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.17 2011/09/23 12:34:52 macallan Exp $);
#ifdef CHIP_EXTENT
#include sys/extent.h
@@ -630,7 +630,6 @@
return (-1);
ret = mbst.mbst_sys_start + (addr - mbst.mbst_bus_start) + off;
if (flags BUS_SPACE_MAP_PREFETCHABLE) {
- printf(!);
ret |= PGC_PREFETCH;
}
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: macallan
Date: Fri Sep 23 12:42:15 UTC 2011
Modified Files:
src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c
Log Message:
make this build again with 32bit paddr_t
from he@
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.17 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.18
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.17 Fri Sep 23 12:34:52 2011
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Fri Sep 23 12:42:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.17 2011/09/23 12:34:52 macallan Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.18 2011/09/23 12:42:15 macallan Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.17 2011/09/23 12:34:52 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.18 2011/09/23 12:42:15 macallan Exp $);
#ifdef CHIP_EXTENT
#include sys/extent.h
@@ -629,10 +629,12 @@
if (error)
return (-1);
ret = mbst.mbst_sys_start + (addr - mbst.mbst_bus_start) + off;
+#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
if (flags BUS_SPACE_MAP_PREFETCHABLE) {
ret |= PGC_PREFETCH;
}
-
+#endif
+
return (mips_btop(ret));
#else
# error must define one of CHIP_IO or CHIP_MEM
CVS commit: [netbsd-5] src/sys/arch/xen
Module Name:src
Committed By: sborrill
Date: Fri Sep 23 12:44:52 UTC 2011
Modified Files:
src/sys/arch/xen/conf [netbsd-5]: files.xen
src/sys/arch/xen/xen [netbsd-5]: hypervisor.c
src/sys/arch/xen/xenbus [netbsd-5]: xenbus_dev.c xenbus_probe.c
Log Message:
Pull up the following revisions(s) (requested by jym in ticket #1672):
sys/arch/xen/conf/files.xen:revision 1.123 via patch
sys/arch/xen/xen/hypervisor.c: revision 1.58 via patch
sys/arch/xen/xenbus/xenbus_dev.c: revision 1.9
sys/arch/xen/xenbus/xenbus_probe.c: revision 1.35
Expose Xen kernfs entries inside a domU to make it possible to use pkgsrc's
sysutils/xentools inside a domU to query XenStore entries (or even modify
part of it if the domain has enough rights).
To generate a diff of this commit:
cvs rdiff -u -r1.88.4.6 -r1.88.4.7 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.42.4.3 -r1.42.4.4 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/arch/xen/xenbus/xenbus_dev.c
cvs rdiff -u -r1.26.2.3 -r1.26.2.4 src/sys/arch/xen/xenbus/xenbus_probe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.88.4.6 src/sys/arch/xen/conf/files.xen:1.88.4.7
--- src/sys/arch/xen/conf/files.xen:1.88.4.6 Fri Jan 7 01:42:55 2011
+++ src/sys/arch/xen/conf/files.xen Fri Sep 23 12:44:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.88.4.6 2011/01/07 01:42:55 riz Exp $
+# $NetBSD: files.xen,v 1.88.4.7 2011/09/23 12:44:51 sborrill Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@@ -181,7 +181,7 @@
attach xenbus at xendevbus
file arch/xen/xenbus/xenbus_client.c xenbus xen3 needs-flag
file arch/xen/xenbus/xenbus_comms.c xenbus xen3 needs-flag
-file arch/xen/xenbus/xenbus_dev.c xenbus xen3 dom0ops needs-flag
+file arch/xen/xenbus/xenbus_dev.c xenbus xen3 needs-flag
file arch/xen/xenbus/xenbus_probe.c xenbus xen3 needs-flag
file arch/xen/xenbus/xenbus_xs.c xenbus xen3 needs-flag
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.42.4.3 src/sys/arch/xen/xen/hypervisor.c:1.42.4.4
--- src/sys/arch/xen/xen/hypervisor.c:1.42.4.3 Sun Oct 4 00:02:00 2009
+++ src/sys/arch/xen/xen/hypervisor.c Fri Sep 23 12:44:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.42.4.3 2009/10/04 00:02:00 snj Exp $ */
+/* $NetBSD: hypervisor.c,v 1.42.4.4 2011/09/23 12:44:51 sborrill Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -63,7 +63,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hypervisor.c,v 1.42.4.3 2009/10/04 00:02:00 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: hypervisor.c,v 1.42.4.4 2011/09/23 12:44:51 sborrill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -240,11 +240,8 @@
#endif /* NPCI */
union hypervisor_attach_cookie hac;
-#ifdef DOM0OPS
- if (xendomain_is_privileged()) {
- xenkernfs_init();
- }
-#endif
+ xenkernfs_init();
+
#ifdef XEN3
xen_version = HYPERVISOR_xen_version(XENVER_version, NULL);
aprint_normal(: Xen version %d.%d\n, (xen_version 0x) 16,
@@ -408,8 +405,6 @@
return (UNCONF);
}
-#if defined(DOM0OPS)
-
#define DIR_MODE (S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
kernfs_parentdir_t *kernxen_pkt;
@@ -424,7 +419,6 @@
kernfs_addentry(NULL, dkt);
kernxen_pkt = KERNFS_ENTOPARENTDIR(dkt);
}
-#endif /* DOM0OPS */
#ifndef XEN3
/* handler for the shutdown messages */
Index: src/sys/arch/xen/xenbus/xenbus_dev.c
diff -u src/sys/arch/xen/xenbus/xenbus_dev.c:1.7 src/sys/arch/xen/xenbus/xenbus_dev.c:1.7.28.1
--- src/sys/arch/xen/xenbus/xenbus_dev.c:1.7 Tue Nov 27 11:37:27 2007
+++ src/sys/arch/xen/xenbus/xenbus_dev.c Fri Sep 23 12:44:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_dev.c,v 1.7 2007/11/27 11:37:27 pooka Exp $ */
+/* $NetBSD: xenbus_dev.c,v 1.7.28.1 2011/09/23 12:44:52 sborrill Exp $ */
/*
* xenbus_dev.c
*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xenbus_dev.c,v 1.7 2007/11/27 11:37:27 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: xenbus_dev.c,v 1.7.28.1 2011/09/23 12:44:52 sborrill Exp $);
#include opt_xen.h
@@ -92,10 +92,13 @@
PRIVCMD_MODE);
kernfs_addentry(kernxen_pkt, dkt);
- kfst = KERNFS_ALLOCTYPE(xsd_port_fileops);
- KERNFS_ALLOCENTRY(dkt, M_TEMP, M_WAITOK);
- KERNFS_INITENTRY(dkt, DT_REG, xsd_port, NULL, kfst, VREG, XSD_MODE);
- kernfs_addentry(kernxen_pkt, dkt);
+ if (xendomain_is_dom0()) {
+ kfst = KERNFS_ALLOCTYPE(xsd_port_fileops);
+ KERNFS_ALLOCENTRY(dkt, M_TEMP, M_WAITOK);
+ KERNFS_INITENTRY(dkt, DT_REG, xsd_port, NULL,
+ kfst, VREG, XSD_MODE);
+ kernfs_addentry(kernxen_pkt, dkt);
+ }
}
struct xenbus_dev_data {
Index: src/sys/arch/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.26.2.3
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Fri Sep 23 12:45:14 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1672 To generate a diff of this commit: cvs rdiff -u -r1.1.2.103 -r1.1.2.104 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.103 src/doc/CHANGES-5.2:1.1.2.104 --- src/doc/CHANGES-5.2:1.1.2.103 Sat Sep 17 18:58:20 2011 +++ src/doc/CHANGES-5.2 Fri Sep 23 12:45:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.103 2011/09/17 18:58:20 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.104 2011/09/23 12:45:14 sborrill Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -5628,3 +5628,13 @@ instead. [tron, ticket #1669] +sys/arch/xen/conf/files.xen 1.123 via patch +sys/arch/xen/xen/hypervisor.c 1.58 via patch +sys/arch/xen/xenbus/xenbus_dev.c 1.9 +sys/arch/xen/xenbus/xenbus_probe.c 1.35 + + Expose Xen kernfs entries inside a domU to make it possible to + use pkgsrc's sysutils/xentools inside a domU to query XenStore + entries (or even modify part of it if the domain has enough rights). + [jym, ticket #1672] +
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: jruoho
Date: Fri Sep 23 13:48:28 UTC 2011
Modified Files:
src/tests/lib/libm: t_pow.c
Log Message:
More bugs in pow(3); cases for PR port-amd64/45391.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libm/t_pow.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/t_pow.c
diff -u src/tests/lib/libm/t_pow.c:1.1 src/tests/lib/libm/t_pow.c:1.2
--- src/tests/lib/libm/t_pow.c:1.1 Sat Sep 17 08:15:43 2011
+++ src/tests/lib/libm/t_pow.c Fri Sep 23 13:48:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pow.c,v 1.1 2011/09/17 08:15:43 jruoho Exp $ */
+/* $NetBSD: t_pow.c,v 1.2 2011/09/23 13:48:28 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_pow.c,v 1.1 2011/09/17 08:15:43 jruoho Exp $);
+__RCSID($NetBSD: t_pow.c,v 1.2 2011/09/23 13:48:28 jruoho Exp $);
#include atf-c.h
#include math.h
@@ -296,13 +296,29 @@
*/
z = pow(+0.0, -4.0);
- if (z != -HUGE_VAL)
- atf_tc_fail_nonfatal(pow(+0.0, -4.0) != -HUGE_VAL);
+ if (z != HUGE_VAL) {
+ atf_tc_expect_fail(PR port-amd64/45391);
+ atf_tc_fail_nonfatal(pow(+0.0, -4.0) != HUGE_VAL);
+ }
z = pow(-0.0, -4.0);
+ if (z != HUGE_VAL) {
+ atf_tc_expect_fail(PR port-amd64/45391);
+ atf_tc_fail_nonfatal(pow(-0.0, -4.0) != HUGE_VAL);
+ }
+
+ z = pow(+0.0, -5.0);
+
+ if (z != HUGE_VAL) {
+ atf_tc_expect_fail(PR port-amd64/45391);
+ atf_tc_fail_nonfatal(pow(+0.0, -5.0) != HUGE_VAL);
+ }
+
+ z = pow(-0.0, -5.0);
+
if (z != -HUGE_VAL)
- atf_tc_fail_nonfatal(pow(-0.0, -4.0) != -HUGE_VAL);
+ atf_tc_fail_nonfatal(pow(-0.0, -5.0) != -HUGE_VAL);
#endif
}
@@ -604,13 +620,29 @@
*/
z = powf(+0.0, -4.0);
- if (z != -HUGE_VAL)
- atf_tc_fail_nonfatal(powf(+0.0, -4.0) != -HUGE_VAL);
+ if (z != HUGE_VALF) {
+ atf_tc_expect_fail(PR port-amd64/45391);
+ atf_tc_fail_nonfatal(powf(+0.0, -4.0) != HUGE_VALF);
+ }
z = powf(-0.0, -4.0);
- if (z != -HUGE_VAL)
- atf_tc_fail_nonfatal(powf(-0.0, -4.0) != -HUGE_VAL);
+ if (z != HUGE_VALF) {
+ atf_tc_expect_fail(PR port-amd64/45391);
+ atf_tc_fail_nonfatal(powf(-0.0, -4.0) != HUGE_VALF);
+ }
+
+ z = powf(+0.0, -5.0);
+
+ if (z != HUGE_VALF) {
+ atf_tc_expect_fail(PR port-amd64/45391);
+ atf_tc_fail_nonfatal(powf(+0.0, -5.0) != HUGE_VALF);
+ }
+
+ z = powf(-0.0, -5.0);
+
+ if (z != -HUGE_VALF)
+ atf_tc_fail_nonfatal(powf(-0.0, -5.0) != -HUGE_VALF);
#endif
}
CVS commit: src/sys/arch/hpc/hpc/platid_gen
Module Name:src
Committed By: nonaka
Date: Fri Sep 23 14:14:38 UTC 2011
Modified Files:
src/sys/arch/hpc/hpc/platid_gen: gram.y platid_gen.c platid_gen.h
scan.l
Log Message:
fix compile failure.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpc/hpc/platid_gen/gram.y
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpc/hpc/platid_gen/platid_gen.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpc/hpc/platid_gen/platid_gen.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpc/hpc/platid_gen/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpc/hpc/platid_gen/gram.y
diff -u src/sys/arch/hpc/hpc/platid_gen/gram.y:1.3 src/sys/arch/hpc/hpc/platid_gen/gram.y:1.4
--- src/sys/arch/hpc/hpc/platid_gen/gram.y:1.3 Sat Mar 3 12:51:44 2001
+++ src/sys/arch/hpc/hpc/platid_gen/gram.y Fri Sep 23 14:14:38 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: gram.y,v 1.3 2001/03/03 12:51:44 takemura Exp $ */
+/* $NetBSD: gram.y,v 1.4 2011/09/23 14:14:38 nonaka Exp $ */
/*-
* Copyright (c) 1999
@@ -37,8 +37,10 @@
#include stdio.h
#include strings.h
+#include ctype.h
#include platid_gen.h
+#include gram.h
#define LIST_NEW(l) { \
(l) = new_node(N_LIST, 0, NULL, NULL, NULL); \
@@ -130,6 +132,8 @@
%%
+extern int YYLEX_DECL();
+
char*
touppers(s)
char *s;
Index: src/sys/arch/hpc/hpc/platid_gen/platid_gen.c
diff -u src/sys/arch/hpc/hpc/platid_gen/platid_gen.c:1.9 src/sys/arch/hpc/hpc/platid_gen/platid_gen.c:1.10
--- src/sys/arch/hpc/hpc/platid_gen/platid_gen.c:1.9 Wed Mar 18 10:22:28 2009
+++ src/sys/arch/hpc/hpc/platid_gen/platid_gen.c Fri Sep 23 14:14:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platid_gen.c,v 1.9 2009/03/18 10:22:28 cegger Exp $ */
+/* $NetBSD: platid_gen.c,v 1.10 2011/09/23 14:14:38 nonaka Exp $ */
/*-
* Copyright (c) 1999
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: platid_gen.c,v 1.9 2009/03/18 10:22:28 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: platid_gen.c,v 1.10 2011/09/23 14:14:38 nonaka Exp $);
#include stdio.h
#include stdlib.h
@@ -259,6 +259,7 @@
fprintf(fp, */\n);
}
+int
gen_name(char *buf, struct genctx_t ctx[], int nest, int name, char *punct,
int ignr)
{
Index: src/sys/arch/hpc/hpc/platid_gen/platid_gen.h
diff -u src/sys/arch/hpc/hpc/platid_gen/platid_gen.h:1.4 src/sys/arch/hpc/hpc/platid_gen/platid_gen.h:1.5
--- src/sys/arch/hpc/hpc/platid_gen/platid_gen.h:1.4 Wed Apr 23 03:42:21 2003
+++ src/sys/arch/hpc/hpc/platid_gen/platid_gen.h Fri Sep 23 14:14:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platid_gen.h,v 1.4 2003/04/23 03:42:21 uwe Exp $ */
+/* $NetBSD: platid_gen.h,v 1.5 2011/09/23 14:14:38 nonaka Exp $ */
/*-
* Copyright (c) 1999
@@ -47,3 +47,4 @@
void *mem_alloc(int);
void dump_node(char *, node_t *);
char *touppers(char*);
+int read_def();
Index: src/sys/arch/hpc/hpc/platid_gen/scan.l
diff -u src/sys/arch/hpc/hpc/platid_gen/scan.l:1.5 src/sys/arch/hpc/hpc/platid_gen/scan.l:1.6
--- src/sys/arch/hpc/hpc/platid_gen/scan.l:1.5 Wed May 18 12:10:22 2011
+++ src/sys/arch/hpc/hpc/platid_gen/scan.l Fri Sep 23 14:14:38 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.5 2011/05/18 12:10:22 nonaka Exp $ */
+/* $NetBSD: scan.l,v 1.6 2011/09/23 14:14:38 nonaka Exp $ */
/*-
* Copyright (c) 1999
@@ -43,6 +43,8 @@
int yyline;
char *getstr(char *);
void getcomment(void);
+int yyparse(void);
+void yyerror(const char *);
%}
%option noyywrap
@@ -103,6 +105,7 @@
}
}
+int
read_def()
{
yyline = 1;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: njoly Date: Fri Sep 23 14:25:13 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add NVIDIA GeForce 210. To generate a diff of this commit: cvs rdiff -u -r1.1097 -r1.1098 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1097 src/sys/dev/pci/pcidevs:1.1098 --- src/sys/dev/pci/pcidevs:1.1097 Mon Sep 5 04:31:43 2011 +++ src/sys/dev/pci/pcidevs Fri Sep 23 14:25:13 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1097 2011/09/05 04:31:43 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1098 2011/09/23 14:25:13 njoly Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3784,6 +3784,7 @@ product NVIDIA MCP73_HDA_1 0x07fc nForce MCP73 High Definition Audio Controller product NVIDIA MCP73_HDA_2 0x07fd nForce MCP73 High Definition Audio Controller product NVIDIA MCP78S_SMB 0x0752 nForce MCP78S SMBus Controller +product NVIDIA GEFORCE_210 0x0a65 GeForce 210 product NVIDIA MCP79_SMB 0x0aa2 nForce MCP79 SMBus Controller product NVIDIA MCP79_LAN1 0x0ab0 nForce MCP79 Gigabit Ethernet Controller product NVIDIA MCP79_LAN2 0x0ab1 nForce MCP79 Gigabit Ethernet Controller
CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Sep 23 14:45:07 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.i386: Makefile src/share/man/man4/man4.x86: Makefile Added Files: src/share/man/man4/man4.x86: fdc.4 lpt.4 mem.4 Removed Files: src/share/man/man4/man4.i386: fdc.4 lpt.4 mem.4 Log Message: Move i386/fdc(4), i386/lpt(4), and i386/mem(4) to man4.x86. Part of PR port-amd64/36350. To generate a diff of this commit: cvs rdiff -u -r1.1341 -r1.1342 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.75 -r1.76 src/share/man/man4/man4.i386/Makefile cvs rdiff -u -r1.15 -r0 src/share/man/man4/man4.i386/fdc.4 cvs rdiff -u -r1.21 -r0 src/share/man/man4/man4.i386/lpt.4 cvs rdiff -u -r1.5 -r0 src/share/man/man4/man4.i386/mem.4 cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/fdc.4 \ src/share/man/man4/man4.x86/lpt.4 src/share/man/man4/man4.x86/mem.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1341 src/distrib/sets/lists/man/mi:1.1342 --- src/distrib/sets/lists/man/mi:1.1341 Sat Sep 17 17:06:47 2011 +++ src/distrib/sets/lists/man/mi Fri Sep 23 14:45:06 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1341 2011/09/17 17:06:47 rkujawa Exp $ +# $NetBSD: mi,v 1.1342 2011/09/23 14:45:06 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1109,7 +1109,7 @@ ./usr/share/man/cat4/i386/elanpar.0 man-sys-catman .cat ./usr/share/man/cat4/i386/elanpex.0 man-sys-catman .cat ./usr/share/man/cat4/i386/elansc.0 man-sys-catman .cat -./usr/share/man/cat4/i386/fdc.0 man-sys-catman .cat +./usr/share/man/cat4/i386/fdc.0 man-obsolete obsolete ./usr/share/man/cat4/i386/gcscide.0 man-sys-catman .cat ./usr/share/man/cat4/i386/gcscpcib.0 man-sys-catman .cat ./usr/share/man/cat4/i386/geodecntr.0 man-sys-catman .cat @@ -1120,12 +1120,12 @@ ./usr/share/man/cat4/i386/intro.0 man-sys-catman .cat ./usr/share/man/cat4/i386/io.0 man-sys-catman .cat ./usr/share/man/cat4/i386/joy.0 man-obsolete obsolete -./usr/share/man/cat4/i386/kmem.0 man-sys-catman .cat +./usr/share/man/cat4/i386/kmem.0 man-obsolete obsolete ./usr/share/man/cat4/i386/le.0 man-obsolete obsolete ./usr/share/man/cat4/i386/lms.0 man-sys-catman .cat -./usr/share/man/cat4/i386/lpa.0 man-sys-catman .cat -./usr/share/man/cat4/i386/lpt.0 man-sys-catman .cat -./usr/share/man/cat4/i386/mem.0 man-sys-catman .cat +./usr/share/man/cat4/i386/lpa.0 man-obsolete obsolete +./usr/share/man/cat4/i386/lpt.0 man-obsolete obsolete +./usr/share/man/cat4/i386/mem.0 man-obsolete obsolete ./usr/share/man/cat4/i386/mms.0 man-sys-catman .cat ./usr/share/man/cat4/i386/ndis.0 man-sys-catman .cat ./usr/share/man/cat4/i386/npx.0 man-sys-catman .cat @@ -1822,11 +1822,16 @@ ./usr/share/man/cat4/x86/balloon.0 man-sys-catman .cat ./usr/share/man/cat4/x86/coretemp.0 man-sys-catman .cat ./usr/share/man/cat4/x86/est.0 man-sys-catman .cat +./usr/share/man/cat4/x86/fdc.0 man-sys-catman .cat ./usr/share/man/cat4/x86/fwhrng.0 man-sys-catman .cat ./usr/share/man/cat4/x86/hpet.0 man-sys-catman .cat ./usr/share/man/cat4/x86/ichlpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/ioapic.0 man-sys-catman .cat +./usr/share/man/cat4/x86/kmem.0 man-sys-catman .cat ./usr/share/man/cat4/x86/lapic.0 man-sys-catman .cat +./usr/share/man/cat4/x86/lpa.0 man-sys-catman .cat +./usr/share/man/cat4/x86/lpt.0 man-sys-catman .cat +./usr/share/man/cat4/x86/mem.0 man-sys-catman .cat ./usr/share/man/cat4/x86/odcm.0 man-sys-catman .cat ./usr/share/man/cat4/x86/powernow.0 man-sys-catman .cat ./usr/share/man/cat4/xbd.0 man-sys-catman .cat @@ -3922,7 +3927,7 @@ ./usr/share/man/html4/i386/elanpar.html man-sys-htmlman html ./usr/share/man/html4/i386/elanpex.html man-sys-htmlman html ./usr/share/man/html4/i386/elansc.html man-sys-htmlman html -./usr/share/man/html4/i386/fdc.html man-sys-htmlman html +./usr/share/man/html4/i386/fdc.html man-obsolete obsolete ./usr/share/man/html4/i386/gcscide.html man-sys-htmlman html ./usr/share/man/html4/i386/gcscpcib.html man-sys-htmlman html ./usr/share/man/html4/i386/geodecntr.html man-sys-htmlman html @@ -3931,11 +3936,11 @@ ./usr/share/man/html4/i386/gscpcib.html man-sys-htmlman html ./usr/share/man/html4/i386/intro.html man-sys-htmlman html ./usr/share/man/html4/i386/io.html man-sys-htmlman html -./usr/share/man/html4/i386/kmem.html man-sys-htmlman html +./usr/share/man/html4/i386/kmem.html man-obsolete obsolete ./usr/share/man/html4/i386/lms.html man-sys-htmlman html -./usr/share/man/html4/i386/lpa.html man-sys-htmlman html -./usr/share/man/html4/i386/lpt.html man-sys-htmlman html
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Fri Sep 23 14:47:41 UTC 2011 Modified Files: src/sys/sys: param.h Log Message: remove things that have not been used for almost 20 years (cblock stuff) To generate a diff of this commit: cvs rdiff -u -r1.392 -r1.393 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.392 src/sys/sys/param.h:1.393 --- src/sys/sys/param.h:1.392 Mon Jul 11 04:27:39 2011 +++ src/sys/sys/param.h Fri Sep 23 10:47:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.392 2011/07/11 08:27:39 hannken Exp $ */ +/* $NetBSD: param.h,v 1.393 2011/09/23 14:47:41 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -295,12 +295,6 @@ #define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */ #define NODEV (dev_t)(-1) /* non-existent device */ -#define CBLOCK 64 /* Clist block size, must be a power of 2. */ -#define CBQSIZE (CBLOCK/NBBY) /* Quote bytes/cblock - can do better. */ -/* Data chars/clist. */ -#define CBSIZE (CBLOCK - (int)sizeof(struct cblock *) - CBQSIZE) -#define CROUND (CBLOCK - 1) /* Clist rounding. */ - /* * File system parameters and macros. *
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Fri Sep 23 15:17:33 UTC 2011
Modified Files:
src/crypto/external/bsd/libsaslc/lib: Makefile
src/distrib/sets/lists/comp: mi
Log Message:
Build and install MLINKS for the libsaslc(3) functions.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/libsaslc/lib/Makefile
cvs rdiff -u -r1.1675 -r1.1676 src/distrib/sets/lists/comp/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/libsaslc/lib/Makefile
diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.5 src/crypto/external/bsd/libsaslc/lib/Makefile:1.6
--- src/crypto/external/bsd/libsaslc/lib/Makefile:1.5 Thu Aug 25 15:30:54 2011
+++ src/crypto/external/bsd/libsaslc/lib/Makefile Fri Sep 23 15:17:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/25 15:30:54 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/09/23 15:17:31 jruoho Exp $
.include bsd.own.mk
@@ -29,9 +29,23 @@
COPTS.msg.c = -Wno-format-nonliteral
CPPFLAGS+=-I${EXTDIST}/include
-MAN=libsaslc.3
WARNS?=4
+MAN=libsaslc.3
+MLINKS+=libsaslc.3 saslc_alloc.3 \
+ libsaslc.3 saslc_end.3 \
+ libsaslc.3 saslc_init.3 \
+ libsaslc.3 saslc_sess_init.3 \
+ libsaslc.3 saslc_sess_end.3 \
+ libsaslc.3 saslc_sess_getprop.3 \
+ libsaslc.3 saslc_sess_setprop.3 \
+ libsaslc.3 saslc_sess_cont.3 \
+ libsaslc.3 saslc_sess_decode.3 \
+ libsaslc.3 saslc_sess_encode.3 \
+ libsaslc.3 saslc_sess_getmech.3 \
+ libsaslc.3 saslc_sess_strerror.3 \
+ libsaslc.3 saslc_strerror.3
+
EXTDIST=${.CURDIR}/../dist
.PATH: ${EXTDIST}/include ${EXTDIST}/src ${EXTDIST}/man
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1675 src/distrib/sets/lists/comp/mi:1.1676
--- src/distrib/sets/lists/comp/mi:1.1675 Fri Sep 23 06:48:09 2011
+++ src/distrib/sets/lists/comp/mi Fri Sep 23 15:17:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1675 2011/09/23 06:48:09 mrg Exp $
+# $NetBSD: mi,v 1.1676 2011/09/23 15:17:31 jruoho Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -8594,6 +8594,19 @@
./usr/share/man/cat3/rumphijack.0 comp-c-catman .cat
./usr/share/man/cat3/rumpuser.0 comp-c-catman .cat
./usr/share/man/cat3/ruserok.0 comp-c-catman .cat
+./usr/share/man/cat3/saslc_alloc.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_end.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_init.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_init.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_end.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_getprop.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_setprop.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_cont.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_decode.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_encode.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_getmech.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_sess_strerror.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/saslc_strerror.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/savetty.0 comp-c-catman .cat
./usr/share/man/cat3/scalb.0 comp-c-catman .cat
./usr/share/man/cat3/scalbf.0 comp-c-catman .cat
@@ -14714,6 +14727,19 @@
./usr/share/man/html3/rumphijack.html comp-c-htmlman html
./usr/share/man/html3/rumpuser.html comp-c-htmlman html
./usr/share/man/html3/ruserok.html comp-c-htmlman html
+./usr/share/man/html3/saslc_alloc.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_end.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_init.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_init.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_end.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_getprop.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_setprop.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_cont.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_decode.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_encode.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_getmech.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_sess_strerror.html comp-c-htmlman crypto,html
+./usr/share/man/html3/saslc_strerror.html comp-c-htmlman crypto,html
./usr/share/man/html3/savetty.html comp-c-htmlman html
./usr/share/man/html3/scalb.html comp-c-htmlman html
./usr/share/man/html3/scalbf.html comp-c-htmlman html
@@ -20840,6 +20866,19 @@
./usr/share/man/man3/rumphijack.3 comp-c-man .man
./usr/share/man/man3/rumpuser.3 comp-c-man .man
./usr/share/man/man3/ruserok.3 comp-c-man .man
+./usr/share/man/man3/saslc_alloc.3 comp-c-man crypto,.man
+./usr/share/man/man3/saslc_end.3 comp-c-man
CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Sep 23 15:24:36 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3 src/crypto/external/bsd/libsaslc/lib: Makefile src/distrib/sets/lists/comp: mi Log Message: Also note /etc/saslc.d. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/libsaslc/lib/Makefile cvs rdiff -u -r1.1676 -r1.1677 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 diff -u src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.12 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.13 --- src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.12 Tue Mar 22 09:42:00 2011 +++ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 Fri Sep 23 15:24:36 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: libsaslc.3,v 1.12 2011/03/22 09:42:00 wiz Exp $ +.\ $NetBSD: libsaslc.3,v 1.13 2011/09/23 15:24:36 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -34,10 +34,12 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 22, 2011 +.Dd September 23, 2011 .Dt LIBSASLC 3 .Os .Sh NAME +.Nm libsaslc , +.Nm saslc.d , .Nm saslc_alloc , .Nm saslc_end , .Nm saslc_init , @@ -707,6 +709,15 @@ .Pp to obtain a ticket for the postfix user with the postfix credential and you should be good to go! +.Sh FILES +.Bl -tag -width /etc/saslc.d +.It Pa /etc/saslc.d +.El +.Sh HISTORY +The +.Nm +library appeared in +.Nx 6.0 . .Sh EXAMPLES The following code fragments illustrate the possible use of the functions described above. Index: src/crypto/external/bsd/libsaslc/lib/Makefile diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.6 src/crypto/external/bsd/libsaslc/lib/Makefile:1.7 --- src/crypto/external/bsd/libsaslc/lib/Makefile:1.6 Fri Sep 23 15:17:31 2011 +++ src/crypto/external/bsd/libsaslc/lib/Makefile Fri Sep 23 15:24:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2011/09/23 15:17:31 jruoho Exp $ +# $NetBSD: Makefile,v 1.7 2011/09/23 15:24:35 jruoho Exp $ .include bsd.own.mk @@ -32,7 +32,8 @@ WARNS?=4 MAN=libsaslc.3 -MLINKS+=libsaslc.3 saslc_alloc.3 \ +MLINKS+=libsaslc.3 saslc.d.3 \ + libsaslc.3 saslc_alloc.3 \ libsaslc.3 saslc_end.3 \ libsaslc.3 saslc_init.3 \ libsaslc.3 saslc_sess_init.3 \ Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1676 src/distrib/sets/lists/comp/mi:1.1677 --- src/distrib/sets/lists/comp/mi:1.1676 Fri Sep 23 15:17:31 2011 +++ src/distrib/sets/lists/comp/mi Fri Sep 23 15:24:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1676 2011/09/23 15:17:31 jruoho Exp $ +# $NetBSD: mi,v 1.1677 2011/09/23 15:24:35 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -8594,6 +8594,7 @@ ./usr/share/man/cat3/rumphijack.0 comp-c-catman .cat ./usr/share/man/cat3/rumpuser.0 comp-c-catman .cat ./usr/share/man/cat3/ruserok.0 comp-c-catman .cat +./usr/share/man/cat3/saslc.d.0 comp-c-catman crypto,.cat ./usr/share/man/cat3/saslc_alloc.0 comp-c-catman crypto,.cat ./usr/share/man/cat3/saslc_end.0 comp-c-catman crypto,.cat ./usr/share/man/cat3/saslc_init.0 comp-c-catman crypto,.cat @@ -14727,6 +14728,7 @@ ./usr/share/man/html3/rumphijack.html comp-c-htmlman html ./usr/share/man/html3/rumpuser.html comp-c-htmlman html ./usr/share/man/html3/ruserok.html comp-c-htmlman html +./usr/share/man/html3/saslc.d.html comp-c-htmlman crypto,html ./usr/share/man/html3/saslc_alloc.html comp-c-htmlman crypto,html ./usr/share/man/html3/saslc_end.html comp-c-htmlman crypto,html ./usr/share/man/html3/saslc_init.html comp-c-htmlman crypto,html @@ -20866,6 +20868,7 @@ ./usr/share/man/man3/rumphijack.3 comp-c-man .man ./usr/share/man/man3/rumpuser.3 comp-c-man .man ./usr/share/man/man3/ruserok.3 comp-c-man .man +./usr/share/man/man3/saslc.d.3 comp-c-man crypto,.man ./usr/share/man/man3/saslc_alloc.3 comp-c-man crypto,.man ./usr/share/man/man3/saslc_end.3 comp-c-man crypto,.man ./usr/share/man/man3/saslc_init.3 comp-c-man crypto,.man
CVS commit: src/sys
Module Name:src Committed By: christos Date: Fri Sep 23 15:29:09 UTC 2011 Modified Files: src/sys/kern: tty.c src/sys/net: if_sl.c if_strip.c src/sys/sys: tty.h Log Message: Change obsolete CBSIZE constant (48), to a power of two constant (64) that is close enough to match the original assumptions. To generate a diff of this commit: cvs rdiff -u -r1.246 -r1.247 src/sys/kern/tty.c cvs rdiff -u -r1.117 -r1.118 src/sys/net/if_sl.c cvs rdiff -u -r1.95 -r1.96 src/sys/net/if_strip.c cvs rdiff -u -r1.88 -r1.89 src/sys/sys/tty.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/tty.c diff -u src/sys/kern/tty.c:1.246 src/sys/kern/tty.c:1.247 --- src/sys/kern/tty.c:1.246 Tue Jul 26 09:14:18 2011 +++ src/sys/kern/tty.c Fri Sep 23 11:29:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tty.c,v 1.246 2011/07/26 13:14:18 yamt Exp $ */ +/* $NetBSD: tty.c,v 1.247 2011/09/23 15:29:08 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.246 2011/07/26 13:14:18 yamt Exp $); +__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.247 2011/09/23 15:29:08 christos Exp $); #include sys/param.h #include sys/systm.h @@ -2350,7 +2350,7 @@ tp-t_lowat = x = CLAMP(cps / 2, TTMAXLOWAT, TTMINLOWAT); x += cps; x = CLAMP(x, TTMAXHIWAT, TTMINHIWAT); - tp-t_hiwat = roundup(x, CBSIZE); + tp-t_hiwat = roundup(x, TTROUND); #undef CLAMP } Index: src/sys/net/if_sl.c diff -u src/sys/net/if_sl.c:1.117 src/sys/net/if_sl.c:1.118 --- src/sys/net/if_sl.c:1.117 Mon Apr 5 03:22:23 2010 +++ src/sys/net/if_sl.c Fri Sep 23 11:29:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_sl.c,v 1.117 2010/04/05 07:22:23 joerg Exp $ */ +/* $NetBSD: if_sl.c,v 1.118 2011/09/23 15:29:09 christos Exp $ */ /* * Copyright (c) 1987, 1989, 1992, 1993 @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_sl.c,v 1.117 2010/04/05 07:22:23 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: if_sl.c,v 1.118 2011/09/23 15:29:09 christos Exp $); #include opt_inet.h @@ -154,7 +154,7 @@ #if (SLMTU 3) #error SLMTU way too small. #endif -#define SLIP_HIWAT roundup(50,CBSIZE) +#define SLIP_HIWAT roundup(50, TTROUND) #ifndef __NetBSD__ /* XXX - cgd */ #define CLISTRESERVE 1024 /* Can't let clists get too low */ #endif /* !__NetBSD__ */ Index: src/sys/net/if_strip.c diff -u src/sys/net/if_strip.c:1.95 src/sys/net/if_strip.c:1.96 --- src/sys/net/if_strip.c:1.95 Mon Apr 5 03:22:24 2010 +++ src/sys/net/if_strip.c Fri Sep 23 11:29:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_strip.c,v 1.95 2010/04/05 07:22:24 joerg Exp $ */ +/* $NetBSD: if_strip.c,v 1.96 2011/09/23 15:29:09 christos Exp $ */ /* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */ /* @@ -87,7 +87,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_strip.c,v 1.95 2010/04/05 07:22:24 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: if_strip.c,v 1.96 2011/09/23 15:29:09 christos Exp $); #include opt_inet.h @@ -186,7 +186,7 @@ #define STRIP_MTU_ONWIRE (SLMTU + 20 + STRIP_HDRLEN) /* (2*SLMTU+2 in sl.c */ -#define SLIP_HIWAT roundup(50,CBSIZE) +#define SLIP_HIWAT roundup(50, TTROUND) /* This is a NetBSD-1.0 or later kernel. */ #define CCOUNT(q) ((q)-c_cc) Index: src/sys/sys/tty.h diff -u src/sys/sys/tty.h:1.88 src/sys/sys/tty.h:1.89 --- src/sys/sys/tty.h:1.88 Tue Jul 26 09:14:17 2011 +++ src/sys/sys/tty.h Fri Sep 23 11:29:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tty.h,v 1.88 2011/07/26 13:14:17 yamt Exp $ */ +/* $NetBSD: tty.h,v 1.89 2011/09/23 15:29:09 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -165,10 +165,11 @@ #define TTYHOG 1024 #ifdef _KERNEL -#define TTMAXHIWAT roundup(2048, CBSIZE) -#define TTMINHIWAT roundup(100, CBSIZE) +#define TTMAXHIWAT roundup(2048, TTROUND) +#define TTMINHIWAT roundup(100, TTROUND) #define TTMAXLOWAT 256 #define TTMINLOWAT 32 +#define TTROUND 64 #endif /* _KERNEL */ /* These flags are kept in t_state. */
CVS commit: src/sys/arch/hpc/stand
Module Name:src
Committed By: nonaka
Date: Fri Sep 23 16:00:16 UTC 2011
Modified Files:
src/sys/arch/hpc/stand/hpcboot: hpcboot.config
src/sys/arch/hpc/stand/libsa: libsa.config stand.h stricmp.cpp
strtok.cpp tolower.cpp winblk.c
src/sys/arch/hpc/stand/libz: libz.config
Added Files:
src/sys/arch/hpc/stand/libsa: dkcksum.c ufs.c
Log Message:
fix build failure.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpc/stand/hpcboot/hpcboot.config
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpc/stand/libsa/dkcksum.c \
src/sys/arch/hpc/stand/libsa/ufs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpc/stand/libsa/libsa.config \
src/sys/arch/hpc/stand/libsa/winblk.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpc/stand/libsa/stand.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpc/stand/libsa/stricmp.cpp \
src/sys/arch/hpc/stand/libsa/tolower.cpp
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpc/stand/libsa/strtok.cpp
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpc/stand/libz/libz.config
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpc/stand/hpcboot/hpcboot.config
diff -u src/sys/arch/hpc/stand/hpcboot/hpcboot.config:1.12 src/sys/arch/hpc/stand/hpcboot/hpcboot.config:1.13
--- src/sys/arch/hpc/stand/hpcboot/hpcboot.config:1.12 Tue Apr 6 16:20:27 2010
+++ src/sys/arch/hpc/stand/hpcboot/hpcboot.config Fri Sep 23 16:00:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: hpcboot.config,v 1.12 2010/04/06 16:20:27 nonaka Exp $
+# $NetBSD: hpcboot.config,v 1.13 2011/09/23 16:00:15 nonaka Exp $
# config file/script to generate project file (.dsp/.vcp) for hpcboot
TYPE=application
@@ -67,6 +67,8 @@
__COMPILER_INT64__=__int64
__COMPILER_UINT64__=unsigned#__int64
LIBSA_RENAME_PRINTF
+ __VA_LIST_DECLARED
+ __builtin_va_list=char#*
'
INCDIR_LIST='
.
Index: src/sys/arch/hpc/stand/libsa/libsa.config
diff -u src/sys/arch/hpc/stand/libsa/libsa.config:1.6 src/sys/arch/hpc/stand/libsa/libsa.config:1.7
--- src/sys/arch/hpc/stand/libsa/libsa.config:1.6 Wed Jan 18 01:04:04 2006
+++ src/sys/arch/hpc/stand/libsa/libsa.config Fri Sep 23 16:00:15 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: libsa.config,v 1.6 2006/01/18 01:04:04 uwe Exp $
+# $NetBSD: libsa.config,v 1.7 2011/09/23 16:00:15 nonaka Exp $
# config file/script to generate project file (.dsp) for libsa
@@ -7,8 +7,8 @@
NAME='libsa'
SRCFILE_LIST='
- ../../../../lib/libsa/dkcksum.c
- ../../../../lib/libsa/ufs.c
+ dkcksum.c
+ ufs.c
panic.c
alloc.c
winblk.c
@@ -29,6 +29,8 @@
LIBSA_USE_MEMCPY
LIBSA_USE_MEMSET
LIBKERN_INLINE=__inline
+ __builtin_va_list=char#*
+ _SYS_STDARG_H_
'
INCDIR_LIST='
.
Index: src/sys/arch/hpc/stand/libsa/winblk.c
diff -u src/sys/arch/hpc/stand/libsa/winblk.c:1.6 src/sys/arch/hpc/stand/libsa/winblk.c:1.7
--- src/sys/arch/hpc/stand/libsa/winblk.c:1.6 Thu Jun 23 11:38:24 2011
+++ src/sys/arch/hpc/stand/libsa/winblk.c Fri Sep 23 16:00:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: winblk.c,v 1.6 2011/06/23 11:38:24 nonaka Exp $ */
+/* $NetBSD: winblk.c,v 1.7 2011/09/23 16:00:15 nonaka Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -58,7 +58,7 @@
#endif
#define islower(c) ('a' = (c) (c) = 'z')
-#define toupper(c) (islower(c) ? ((c) - 'a' + 'A') : (c))
+#define _toupper(c) (islower(c) ? ((c) - 'a' + 'A') : (c))
#define BLKSZ 512
@@ -142,9 +142,9 @@
goto end;
}
wsprintf(wdevname, TEXT(%C%C%C%d:),
- toupper(devname[0]),
- toupper(devname[1]),
- toupper(devname[2]),
+ _toupper(devname[0]),
+ _toupper(devname[1]),
+ _toupper(devname[2]),
unit);
DEBUG_PRINTF((TEXT(winblk.open: block device name is '%s'\n),
wdevname));
Index: src/sys/arch/hpc/stand/libsa/stand.h
diff -u src/sys/arch/hpc/stand/libsa/stand.h:1.4 src/sys/arch/hpc/stand/libsa/stand.h:1.5
--- src/sys/arch/hpc/stand/libsa/stand.h:1.4 Wed Jan 25 18:28:26 2006
+++ src/sys/arch/hpc/stand/libsa/stand.h Fri Sep 23 16:00:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.h,v 1.4 2006/01/25 18:28:26 christos Exp $ */
+/* $NetBSD: stand.h,v 1.5 2011/09/23 16:00:15 nonaka Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -44,4 +44,5 @@
int win_printf(LPWSTR lpszFmt, ...);
#endif /* STANDALONE_WINDOWS_SIDE */
+#include stdarg.h
#include ../../../../lib/libsa/stand.h
Index: src/sys/arch/hpc/stand/libsa/stricmp.cpp
diff -u src/sys/arch/hpc/stand/libsa/stricmp.cpp:1.3 src/sys/arch/hpc/stand/libsa/stricmp.cpp:1.4
--- src/sys/arch/hpc/stand/libsa/stricmp.cpp:1.3 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpc/stand/libsa/stricmp.cpp Fri Sep 23 16:00:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: stricmp.cpp,v 1.3 2008/04/28 20:23:21 martin Exp $ */
+/* $NetBSD: stricmp.cpp,v 1.4 2011/09/23 16:00:15 nonaka Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -29,6 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include stand.h
#include sys/cdefs.h
#include sys/types.h
#include libsa_string.h
CVS commit: src/sys/arch/hpc/stand/hpcboot/res
Module Name:src
Committed By: nonaka
Date: Fri Sep 23 16:02:09 UTC 2011
Modified Files:
src/sys/arch/hpc/stand/hpcboot/res: hpcmenu.rc
Log Message:
reduce combobox size.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpc/stand/hpcboot/res/hpcmenu.rc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpc/stand/hpcboot/res/hpcmenu.rc
diff -u src/sys/arch/hpc/stand/hpcboot/res/hpcmenu.rc:1.18 src/sys/arch/hpc/stand/hpcboot/res/hpcmenu.rc:1.19
--- src/sys/arch/hpc/stand/hpcboot/res/hpcmenu.rc:1.18 Tue Apr 6 16:20:28 2010
+++ src/sys/arch/hpc/stand/hpcboot/res/hpcmenu.rc Fri Sep 23 16:02:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcmenu.rc,v 1.18 2010/04/06 16:20:28 nonaka Exp $ */
+/* $NetBSD: hpcmenu.rc,v 1.19 2011/09/23 16:02:08 nonaka Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
STYLE WS_CHILD
{
// kernel directory
- COMBOBOX IDC_MAIN_DIR, 5, 5, 70, 120,
+ COMBOBOX IDC_MAIN_DIR, 5, 5, 70, 80,
WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWN | CBS_AUTOHSCROLL
// kernel file name
@@ -75,7 +75,7 @@
WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP |
ES_LEFT | ES_AUTOHSCROLL
// platform select
- COMBOBOX IDC_MAIN_PLATFORM, 5, 20, 110, 80,
+ COMBOBOX IDC_MAIN_PLATFORM, 5, 20, 110, 64,
WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWN | CBS_AUTOHSCROLL
// root file system select
CVS commit: src/crypto/external/bsd/libsaslc/dist/man
Module Name:src Committed By: wiz Date: Fri Sep 23 16:22:00 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3 Log Message: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 diff -u src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.13 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.14 --- src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.13 Fri Sep 23 15:24:36 2011 +++ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 Fri Sep 23 16:22:00 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: libsaslc.3,v 1.13 2011/09/23 15:24:36 jruoho Exp $ +.\ $NetBSD: libsaslc.3,v 1.14 2011/09/23 16:22:00 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -713,11 +713,6 @@ .Bl -tag -width /etc/saslc.d .It Pa /etc/saslc.d .El -.Sh HISTORY -The -.Nm -library appeared in -.Nx 6.0 . .Sh EXAMPLES The following code fragments illustrate the possible use of the functions described above. @@ -803,6 +798,11 @@ .Sh STANDARDS RFC 2195, RFC , RFC 2245, RFC 2595, RFC 2831, RFC 4422, RFC 4505, RFC 4616, RFC 4752. +.Sh HISTORY +The +.Nm +library appeared in +.Nx 6.0 . .Sh CAVEATS The API was heavily influenced by its use with .Xr postfix 1 .
CVS commit: src/share/mk
Module Name:src
Committed By: apb
Date: Fri Sep 23 21:13:14 UTC 2011
Modified Files:
src/share/mk: bsd.clean.mk
Log Message:
* use a :M* modifier when testing whether the expanded list of
files is empty. Sometimes the variable contains one or more spaces,
and testing against gave the wrong result, but applying the
:M* modifier discards the spaces. This should fix PR 45396.
* Instead of using - to ignore the exit status from the rm command,
use ||true. This should work around the bug in PR 45356, but that
bug is not fixed.
* Suppress the ${MKMSG} command with .if 0. People who build with
MAKEVERBOSE=1 don't want to see the message, and people who build
with MAKEVERBOSE=2 or higher will see the actual rm command. The
message may be useful for debugging this makefile itself, so it's
only disabled, not deleted.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/mk/bsd.clean.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.clean.mk
diff -u src/share/mk/bsd.clean.mk:1.2 src/share/mk/bsd.clean.mk:1.3
--- src/share/mk/bsd.clean.mk:1.2 Sat Sep 10 19:25:10 2011
+++ src/share/mk/bsd.clean.mk Fri Sep 23 21:13:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.clean.mk,v 1.2 2011/09/10 19:25:10 apb Exp $
+# $NetBSD: bsd.clean.mk,v 1.3 2011/09/23 21:13:14 apb Exp $
# bsd.clean.mk
#
@@ -41,14 +41,16 @@
# both .OBJDIR and .SRCDIR.
#
__cleanuse: .USE
- ${${.ALLSRC:@v@${${v}}@} == :?@true:${_MKMSG} \
+.if 0 # print # clean CLEANFILES for debugging
+ ${${.ALLSRC:@v@${${v}:M*}@} == :?@true:${_MKMSG} \
clean ${.ALLSRC} }
+.endif
.for _d in ${${.OBJDIR} == ${.CURDIR} \
:? ${.OBJDIR} \
: ${.OBJDIR} ${.CURDIR} }
- -${${.ALLSRC:@v@${${v}}@} == :?@true: \
- (cd ${_d} rm -f ${.ALLSRC:@v@${${v}}@}) }
- @${${.ALLSRC:@v@${${v}}@} == :?true: \
+ ${${.ALLSRC:@v@${${v}:M*}@} == :?@true: \
+ (cd ${_d} rm -f ${.ALLSRC:@v@${${v}}@} || true) }
+ @${${.ALLSRC:@v@${${v}:M*}@} == :?true: \
bad=\$(cd ${_d} ls -d ${.ALLSRC:@v@${${v}}@} 2/dev/null); \
if test -n \$bad; then \
echo Failed to remove files from ${_d}: ; \
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Fri Sep 23 23:57:06 UTC 2011
Modified Files:
src/sys/kern: tty_pty.c
Log Message:
Fix various bogus things:
- Don't use TTYHOG - 1, you can use the last byte in the ring buffer.
- Don't put unnecessary if statements around the code. The loop invariant
is that if you reach the top of the loop, cc == 0.
- Remove cast to (void *).
- Check result of b_to_q and adjust cc.
- Explain what the TTYHOG - 2 code tried to do, and do it right.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/kern/tty_pty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.129 src/sys/kern/tty_pty.c:1.130
--- src/sys/kern/tty_pty.c:1.129 Tue Jul 26 09:14:18 2011
+++ src/sys/kern/tty_pty.c Fri Sep 23 19:57:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.129 2011/07/26 13:14:18 yamt Exp $ */
+/* $NetBSD: tty_pty.c,v 1.130 2011/09/23 23:57:06 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty_pty.c,v 1.129 2011/07/26 13:14:18 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty_pty.c,v 1.130 2011/09/23 23:57:06 christos Exp $);
#include opt_ptm.h
@@ -701,61 +701,66 @@
if (pti-pt_flags PF_REMOTE) {
if (tp-t_canq.c_cc)
goto block;
- while (uio-uio_resid 0 tp-t_canq.c_cc TTYHOG - 1) {
- if (cc == 0) {
-cc = min(uio-uio_resid, BUFSIZ);
-cc = min(cc, TTYHOG - 1 - tp-t_canq.c_cc);
-cp = locbuf;
-mutex_spin_exit(tty_lock);
-error = uiomove((void *)cp, cc, uio);
-if (error != 0)
- return error;
-mutex_spin_enter(tty_lock);
-/* check again for safety */
-if (!ISSET(tp-t_state, TS_ISOPEN)) {
- /*
- * adjust for data copied in but not
- * written
- */
- uio-uio_resid += cc;
- error = EIO;
- goto out;
-}
- }
- if (cc)
-(void) b_to_q(cp, cc, tp-t_canq);
- cc = 0;
- }
- (void) putc(0, tp-t_canq);
- ttwakeup(tp);
- cv_broadcast(tp-t_cancv);
- error = 0;
- goto out;
- }
- while (uio-uio_resid 0) {
- if (cc == 0) {
+ while (uio-uio_resid 0 tp-t_canq.c_cc TTYHOG) {
cc = min(uio-uio_resid, BUFSIZ);
+ cc = min(cc, TTYHOG - tp-t_canq.c_cc);
cp = locbuf;
mutex_spin_exit(tty_lock);
- error = uiomove((void *)cp, cc, uio);
+ error = uiomove(cp, cc, uio);
if (error != 0)
return error;
mutex_spin_enter(tty_lock);
/* check again for safety */
if (!ISSET(tp-t_state, TS_ISOPEN)) {
-/* adjust for data copied in but not written */
+/*
+ * adjust for data copied in but not
+ * written
+ */
uio-uio_resid += cc;
error = EIO;
goto out;
}
+ if (cc) {
+cc = b_to_q(cp, cc, tp-t_outq);
+if (cc 0)
+ goto block;
+ }
+ }
+ (void) putc(0, tp-t_canq);
+ ttwakeup(tp);
+ cv_broadcast(tp-t_cancv);
+ error = 0;
+ goto out;
+ }
+ while (uio-uio_resid 0) {
+ cc = min(uio-uio_resid, BUFSIZ);
+ cp = locbuf;
+ mutex_spin_exit(tty_lock);
+ error = uiomove(cp, cc, uio);
+ if (error != 0)
+ return error;
+ mutex_spin_enter(tty_lock);
+ /* check again for safety */
+ if (!ISSET(tp-t_state, TS_ISOPEN)) {
+ /* adjust for data copied in but not written */
+ uio-uio_resid += cc;
+ error = EIO;
+ goto out;
}
while (cc 0) {
- if ((tp-t_rawq.c_cc + tp-t_canq.c_cc) = TTYHOG - 2
- (tp-t_canq.c_cc 0 || !ISSET(tp-t_lflag, ICANON))) {
+ int used = tp-t_rawq.c_cc + tp-t_canq.c_cc;
+ int canon = ISSET(tp-t_lflag, ICANON) ? 1 : 0;
+ /*
+ * We need space for 2 characters if canonical
+ * because we might need to print ^C
+ */
+ if (used = (TTYHOG - canon)
+ (tp-t_canq.c_cc 0 || !canon)) {
cv_broadcast(tp-t_rawcv);
goto block;
}
- /* XXX - should change l_rint to be called with lock
+ /*
+ * XXX - should change l_rint to be called with lock
* see also tty.c:ttyinput_wlock()
*/
mutex_spin_exit(tty_lock);
@@ -764,7 +769,6 @@
cnt++;
cc--;
}
- cc = 0;
}
error = 0;
goto out;
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sat Sep 24 00:05:39 UTC 2011
Modified Files:
src/sys/kern: tty.c tty_subr.c
src/sys/sys: tty.h ttycom.h
Log Message:
- Introduce a sysctl to control the default tty queue size kern.tty.qsize,
which defaults to 1024 as before.
- Add two ioctls TIOC{G,S}QSIZE to read and adjust the queue size on
individual ptys.
NB: ttys (and ptys) still silently (or beepingly (IMAXBEL)) drop
characters if the queue size is exceeded. I.e. you can appear
to succeed writing to the {p,t}ty, but not all characters will
have made it if the queue overflows. CVS:
To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/sys/kern/tty.c
cvs rdiff -u -r1.39 -r1.40 src/sys/kern/tty_subr.c
cvs rdiff -u -r1.89 -r1.90 src/sys/sys/tty.h
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/ttycom.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/tty.c
diff -u src/sys/kern/tty.c:1.247 src/sys/kern/tty.c:1.248
--- src/sys/kern/tty.c:1.247 Fri Sep 23 11:29:08 2011
+++ src/sys/kern/tty.c Fri Sep 23 20:05:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.247 2011/09/23 15:29:08 christos Exp $ */
+/* $NetBSD: tty.c,v 1.248 2011/09/24 00:05:38 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.247 2011/09/23 15:29:08 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.248 2011/09/24 00:05:38 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -91,6 +91,7 @@
#include sys/intr.h
#include sys/ioctl_compat.h
#include sys/module.h
+#include sys/bitops.h
static int ttnread(struct tty *);
static void ttyblock(struct tty *);
@@ -207,12 +208,77 @@
static kauth_listener_t tty_listener;
-static struct sysctllog *kern_tkstat_sysctllog;
+#define TTY_MINQSIZE 0x00400
+#define TTY_MAXQSIZE 0x1
+int tty_qsize = TTY_MINQSIZE;
+
+static int
+tty_get_qsize(int *qsize, int newsize)
+{
+ newsize = 1 ilog2(newsize); /* Make it a power of two */
+
+ if (newsize TTY_MINQSIZE || newsize TTY_MAXQSIZE)
+ return EINVAL;
+
+ *qsize = newsize;
+ return 0;
+}
+
+static void
+tty_set_qsize(struct tty *tp, int newsize)
+{
+ struct clist rawq, canq, outq;
+ struct clist orawq, ocanq, ooutq;
+
+ clalloc(rawq, newsize, 1);
+ clalloc(canq, newsize, 1);
+ clalloc(outq, newsize, 0);
+
+ mutex_spin_enter(tty_lock);
+
+ orawq = tp-t_rawq;
+ ocanq = tp-t_canq;
+ ooutq = tp-t_outq;
+
+ tp-t_qsize = newsize;
+ tp-t_rawq = rawq;
+ tp-t_canq = canq;
+ tp-t_outq = outq;
+
+ ttsetwater(tp);
+
+ mutex_spin_exit(tty_lock);
+
+ clfree(orawq);
+ clfree(ocanq);
+ clfree(ooutq);
+}
+
+static int
+sysctl_kern_tty_qsize(SYSCTLFN_ARGS)
+{
+ int newsize;
+ int error;
+ struct sysctlnode node;
+ node = *rnode;
+ node.sysctl_data = newsize;
+
+ newsize = tty_qsize;
+ error = sysctl_lookup(SYSCTLFN_CALL(node));
+ if (error || newp == NULL)
+ return error;
+
+
+ return tty_get_qsize(tty_qsize, newsize);
+}
static void
-sysctl_kern_tkstat_setup(void)
+sysctl_kern_tty_setup(void)
{
+ const struct sysctlnode *rnode, *cnode;
+ struct sysctllog *kern_tkstat_sysctllog, *kern_tty_sysctllog;
+ kern_tkstat_sysctllog = NULL;
sysctl_createv(kern_tkstat_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, kern, NULL,
@@ -250,6 +316,19 @@
SYSCTL_DESCR(Number of raw tty input characters),
NULL, 0, tk_rawcc, 0,
CTL_KERN, KERN_TKSTAT, KERN_TKSTAT_RAWCC, CTL_EOL);
+
+ kern_tty_sysctllog = NULL;
+ sysctl_createv(kern_tty_sysctllog, 0, NULL, rnode,
+ CTLFLAG_PERMANENT,
+ CTLTYPE_NODE, tty, NULL,
+ NULL, 0, NULL, 0,
+ CTL_KERN, CTL_CREATE, CTL_EOL);
+ sysctl_createv(kern_tty_sysctllog, 0, rnode, cnode,
+ CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
+ CTLTYPE_INT, qsize,
+ SYSCTL_DESCR(TTY input and output queue size),
+ sysctl_kern_tty_qsize, 0, tty_qsize, 0,
+ CTL_CREATE, CTL_EOL);
}
int
@@ -319,6 +398,8 @@
tp-t_flags = 0;
}
mutex_spin_exit(tty_lock);
+ if (tp-t_qsize != tty_qsize)
+ tty_set_qsize(tp, tty_qsize);
return (0);
}
@@ -856,6 +937,7 @@
case TIOCSTAT:
case TIOCSTI:
case TIOCSWINSZ:
+ case TIOCSQSIZE:
case TIOCLBIC:
case TIOCLBIS:
case TIOCLSET:
@@ -974,6 +1056,9 @@
case TIOCGWINSZ: /* get window size */
*(struct winsize *)data = tp-t_winsize;
break;
+ case TIOCGQSIZE:
+ *(int *)data = tp-t_qsize;
+ break;
case FIOGETOWN:
mutex_enter(proc_lock);
if (tp-t_session != NULL !isctty(p, tp)) {
@@ -1262,6 +1347,11 @@
}
mutex_spin_exit(tty_lock);
break;
+ case TIOCSQSIZE:
+ if ((error = tty_get_qsize(s, *(int *)data)) == 0
+ s != tp-t_qsize)
+ tty_set_qsize(tp, s);
+ return error;
default:
/* We may have to load the compat module for this. */
for (;;) {
@@ -2694,15 +2784,15 @@
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sat Sep 24 00:06:20 UTC 2011 Modified Files: src/share/man/man4: tty.4 Log Message: mention the new QSIZE ioctls. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man4/tty.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/tty.4 diff -u src/share/man/man4/tty.4:1.27 src/share/man/man4/tty.4:1.28 --- src/share/man/man4/tty.4:1.27 Thu Apr 28 08:15:35 2011 +++ src/share/man/man4/tty.4 Fri Sep 23 20:06:20 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: tty.4,v 1.27 2011/04/28 12:15:35 wiz Exp $ +.\ $NetBSD: tty.4,v 1.28 2011/09/24 00:06:20 christos Exp $ .\ .\ Copyright (c) 1991, 1992, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)tty.4 8.3 (Berkeley) 4/19/94 .\ -.Dd October 7, 2006 +.Dd September 9, 2011 .Dt TTY 4 .Os .Sh NAME @@ -331,6 +331,16 @@ structure pointed to by .Fa ws (see above). +.It Dv TIOCGQSIZE Fa int *qsize +Get the current size of the tty input and output queues. +.It Dv TIOCSQSIZE Fa int *qsize +Set the size of the tty input and output queues. +Valid sizes are between +.Dv 1024 +and +.Dv 65536 +and input values are converted to a power of two. +All pending input and output is dropped. .It Dv TIOCCONS Fa int *on If .Fa on
CVS commit: src/share/man/man7
Module Name:src Committed By: christos Date: Sat Sep 24 00:08:05 UTC 2011 Modified Files: src/share/man/man7: sysctl.7 Log Message: mention the new kern.tty.qsize To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.65 src/share/man/man7/sysctl.7:1.66 --- src/share/man/man7/sysctl.7:1.65 Sat Aug 27 05:06:58 2011 +++ src/share/man/man7/sysctl.7 Fri Sep 23 20:08:05 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.65 2011/08/27 09:06:58 christos Exp $ +.\ $NetBSD: sysctl.7,v 1.66 2011/09/24 00:08:05 christos Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\ -.Dd August 27, 2011 +.Dd September 9, 2011 .Dt SYSCTL 7 .Os .Sh NAME @@ -356,6 +356,7 @@ .It kern.timecounter node not applicable .It kern.timex struct no .It kern.tkstat node not applicable +.It kern.tty node not applicable .It kern.urandom integer no .It kern.usercrypto integer yes .It kern.userasymcrypto integer yes @@ -1048,6 +1049,25 @@ .It Li kern.tkstat.rawcc ( KERN_TKSTAT_RAWCC ) The number of raw input characters. .El +.It Li kern.tty +The third level names for the tty setup variables are detailed below. +The changeable column shows whether a process +with appropriate privilege may change the value. +.Bl -column kern.tty.qsize int Changeable -offset indent +.It Sy Third level name Type Changeable +.It kern.tty.qsize int yes +.El +.Pp +The variables are as follows: +.Bl -tag -width 123456 +.It Li kern.tty.qsize +Control/display the size of the default input and output queues selected +during tty creation. +Is converted to a power of two and its range is between +.Dv 1024 +and +.Dv 65536 . +.El .It Li kern.urandom ( KERN_URND ) Random integer value. .It Li kern.usercrypto
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Sat Sep 24 04:10:03 UTC 2011
Modified Files:
src/sys/kern: tty_pty.c
Log Message:
put back the cc == 0 check, because we can re-enter the loop with cc != 0
if we block.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/kern/tty_pty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.130 src/sys/kern/tty_pty.c:1.131
--- src/sys/kern/tty_pty.c:1.130 Fri Sep 23 19:57:06 2011
+++ src/sys/kern/tty_pty.c Sat Sep 24 00:10:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.130 2011/09/23 23:57:06 christos Exp $ */
+/* $NetBSD: tty_pty.c,v 1.131 2011/09/24 04:10:03 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty_pty.c,v 1.130 2011/09/23 23:57:06 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty_pty.c,v 1.131 2011/09/24 04:10:03 christos Exp $);
#include opt_ptm.h
@@ -702,23 +702,25 @@
if (tp-t_canq.c_cc)
goto block;
while (uio-uio_resid 0 tp-t_canq.c_cc TTYHOG) {
- cc = min(uio-uio_resid, BUFSIZ);
- cc = min(cc, TTYHOG - tp-t_canq.c_cc);
- cp = locbuf;
- mutex_spin_exit(tty_lock);
- error = uiomove(cp, cc, uio);
- if (error != 0)
-return error;
- mutex_spin_enter(tty_lock);
- /* check again for safety */
- if (!ISSET(tp-t_state, TS_ISOPEN)) {
-/*
- * adjust for data copied in but not
- * written
- */
-uio-uio_resid += cc;
-error = EIO;
-goto out;
+ if (cc == 0) {
+cc = min(uio-uio_resid, BUFSIZ);
+cc = min(cc, TTYHOG - tp-t_canq.c_cc);
+cp = locbuf;
+mutex_spin_exit(tty_lock);
+error = uiomove(cp, cc, uio);
+if (error != 0)
+ return error;
+mutex_spin_enter(tty_lock);
+/* check again for safety */
+if (!ISSET(tp-t_state, TS_ISOPEN)) {
+ /*
+ * adjust for data copied in but not
+ * written
+ */
+ uio-uio_resid += cc;
+ error = EIO;
+ goto out;
+}
}
if (cc) {
cc = b_to_q(cp, cc, tp-t_outq);
@@ -733,19 +735,21 @@
goto out;
}
while (uio-uio_resid 0) {
- cc = min(uio-uio_resid, BUFSIZ);
- cp = locbuf;
- mutex_spin_exit(tty_lock);
- error = uiomove(cp, cc, uio);
- if (error != 0)
- return error;
- mutex_spin_enter(tty_lock);
- /* check again for safety */
- if (!ISSET(tp-t_state, TS_ISOPEN)) {
- /* adjust for data copied in but not written */
- uio-uio_resid += cc;
- error = EIO;
- goto out;
+ if (cc == 0) {
+ cc = min(uio-uio_resid, BUFSIZ);
+ cp = locbuf;
+ mutex_spin_exit(tty_lock);
+ error = uiomove(cp, cc, uio);
+ if (error != 0)
+return error;
+ mutex_spin_enter(tty_lock);
+ /* check again for safety */
+ if (!ISSET(tp-t_state, TS_ISOPEN)) {
+/* adjust for data copied in but not written */
+uio-uio_resid += cc;
+error = EIO;
+goto out;
+ }
}
while (cc 0) {
int used = tp-t_rawq.c_cc + tp-t_canq.c_cc;
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Fri Sep 23 06:43:47 UTC 2011 Modified Files: src/tools/gcc: mknative-gcc Log Message: since omp.h is part of libgomp, put it in the libgomp files not the libstdc++ files. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/compat
Module Name:src Committed By: mrg Date: Fri Sep 23 06:44:37 UTC 2011 Modified Files: src/compat/amd64/i386: bsd.i386.mk src/compat/mips64/64: bsd.64.mk src/compat/mips64/o32: bsd.o32.mk src/compat/sparc64/sparc: bsd.sparc.mk Log Message: build compat versions of libgomp for everything except mips N64 (for now.) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/compat/amd64/i386/bsd.i386.mk cvs rdiff -u -r1.8 -r1.9 src/compat/mips64/64/bsd.64.mk cvs rdiff -u -r1.8 -r1.9 src/compat/mips64/o32/bsd.o32.mk cvs rdiff -u -r1.4 -r1.5 src/compat/sparc64/sparc/bsd.sparc.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Fri Sep 23 06:48:11 UTC 2011 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/external/gpl3/gcc/lib: Makefile src/external/gpl3/gcc/lib/libgomp: Makefile Added Files: src/external/gpl3/gcc/lib/libgomp/arch/alpha: omp.h src/external/gpl3/gcc/lib/libgomp/arch/arm: omp.h src/external/gpl3/gcc/lib/libgomp/arch/armeb: omp.h src/external/gpl3/gcc/lib/libgomp/arch/hppa: omp.h src/external/gpl3/gcc/lib/libgomp/arch/i386: omp.h src/external/gpl3/gcc/lib/libgomp/arch/m68000: omp.h src/external/gpl3/gcc/lib/libgomp/arch/m68k: omp.h src/external/gpl3/gcc/lib/libgomp/arch/mips64eb: omp.h src/external/gpl3/gcc/lib/libgomp/arch/mips64el: omp.h src/external/gpl3/gcc/lib/libgomp/arch/mipseb: omp.h src/external/gpl3/gcc/lib/libgomp/arch/mipsel: omp.h src/external/gpl3/gcc/lib/libgomp/arch/powerpc: omp.h src/external/gpl3/gcc/lib/libgomp/arch/sh3eb: omp.h src/external/gpl3/gcc/lib/libgomp/arch/sh3el: omp.h src/external/gpl3/gcc/lib/libgomp/arch/sparc: omp.h src/external/gpl3/gcc/lib/libgomp/arch/sparc64: omp.h src/external/gpl3/gcc/lib/libgomp/arch/vax: omp.h src/external/gpl3/gcc/lib/libgomp/arch/x86_64: omp.h Removed Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: omp.h Log Message: build and install libgomp, as needed by cc -fopenmp, and its suplimentary files like libgomp.spec and omp.h. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.140 -r1.141 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.133 -r1.134 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.602 -r1.603 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1674 -r1.1675 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.192 -r1.193 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgomp/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/alpha/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/arm/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/armeb/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/hppa/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/i386/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/m68000/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/m68k/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/mips64eb/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/mips64el/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/mipseb/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/mipsel/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/powerpc/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/sh3eb/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/sh3el/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/sparc/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/sparc64/omp.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/vax/omp.h cvs rdiff -u -r0 -r1.1
CVS commit: src/lib
Module Name:src Committed By: mrg Date: Fri Sep 23 07:12:10 UTC 2011 Modified Files: src/lib: Makefile Log Message: add libgomp to this list of libs; so compat finds it properly. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: mrg Date: Fri Sep 23 07:31:39 UTC 2011 Modified Files: src/usr.bin/fstat: fstat.c Log Message: apply some (uintptr_t) so that printing printers works on i386 (likely all 32 bit.) To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/usr.bin/fstat/fstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/lib/libgomp
Module Name:src Committed By: tron Date: Fri Sep 23 09:36:38 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libgomp: Makefile Log Message: Fix build with stack smash protection enabled. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgomp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Fri Sep 23 10:27:14 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: ACPICA 20110922 is out. And the fun never stops: ACPI 5.0 is scheduled to be released soon. To generate a diff of this commit: cvs rdiff -u -r1.872 -r1.873 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: macallan Date: Fri Sep 23 12:34:53 UTC 2011 Modified Files: src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c Log Message: remove accidentially committed debug output To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: macallan Date: Fri Sep 23 12:42:15 UTC 2011 Modified Files: src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c Log Message: make this build again with 32bit paddr_t from he@ To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/arch/xen
Module Name:src Committed By: sborrill Date: Fri Sep 23 12:44:52 UTC 2011 Modified Files: src/sys/arch/xen/conf [netbsd-5]: files.xen src/sys/arch/xen/xen [netbsd-5]: hypervisor.c src/sys/arch/xen/xenbus [netbsd-5]: xenbus_dev.c xenbus_probe.c Log Message: Pull up the following revisions(s) (requested by jym in ticket #1672): sys/arch/xen/conf/files.xen:revision 1.123 via patch sys/arch/xen/xen/hypervisor.c: revision 1.58 via patch sys/arch/xen/xenbus/xenbus_dev.c: revision 1.9 sys/arch/xen/xenbus/xenbus_probe.c: revision 1.35 Expose Xen kernfs entries inside a domU to make it possible to use pkgsrc's sysutils/xentools inside a domU to query XenStore entries (or even modify part of it if the domain has enough rights). To generate a diff of this commit: cvs rdiff -u -r1.88.4.6 -r1.88.4.7 src/sys/arch/xen/conf/files.xen cvs rdiff -u -r1.42.4.3 -r1.42.4.4 src/sys/arch/xen/xen/hypervisor.c cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/arch/xen/xenbus/xenbus_dev.c cvs rdiff -u -r1.26.2.3 -r1.26.2.4 src/sys/arch/xen/xenbus/xenbus_probe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Fri Sep 23 12:45:14 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1672 To generate a diff of this commit: cvs rdiff -u -r1.1.2.103 -r1.1.2.104 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src Committed By: jruoho Date: Fri Sep 23 13:48:28 UTC 2011 Modified Files: src/tests/lib/libm: t_pow.c Log Message: More bugs in pow(3); cases for PR port-amd64/45391. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libm/t_pow.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpc/hpc/platid_gen
Module Name:src Committed By: nonaka Date: Fri Sep 23 14:14:38 UTC 2011 Modified Files: src/sys/arch/hpc/hpc/platid_gen: gram.y platid_gen.c platid_gen.h scan.l Log Message: fix compile failure. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpc/hpc/platid_gen/gram.y cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpc/hpc/platid_gen/platid_gen.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpc/hpc/platid_gen/platid_gen.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpc/hpc/platid_gen/scan.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: njoly Date: Fri Sep 23 14:25:13 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add NVIDIA GeForce 210. To generate a diff of this commit: cvs rdiff -u -r1.1097 -r1.1098 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: njoly Date: Fri Sep 23 14:26:24 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen for NVIDIA GeForce 210. To generate a diff of this commit: cvs rdiff -u -r1.1092 -r1.1093 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1091 -r1.1092 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Sep 23 14:45:07 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.i386: Makefile src/share/man/man4/man4.x86: Makefile Added Files: src/share/man/man4/man4.x86: fdc.4 lpt.4 mem.4 Removed Files: src/share/man/man4/man4.i386: fdc.4 lpt.4 mem.4 Log Message: Move i386/fdc(4), i386/lpt(4), and i386/mem(4) to man4.x86. Part of PR port-amd64/36350. To generate a diff of this commit: cvs rdiff -u -r1.1341 -r1.1342 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.75 -r1.76 src/share/man/man4/man4.i386/Makefile cvs rdiff -u -r1.15 -r0 src/share/man/man4/man4.i386/fdc.4 cvs rdiff -u -r1.21 -r0 src/share/man/man4/man4.i386/lpt.4 cvs rdiff -u -r1.5 -r0 src/share/man/man4/man4.i386/mem.4 cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/fdc.4 \ src/share/man/man4/man4.x86/lpt.4 src/share/man/man4/man4.x86/mem.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Fri Sep 23 14:47:41 UTC 2011 Modified Files: src/sys/sys: param.h Log Message: remove things that have not been used for almost 20 years (cblock stuff) To generate a diff of this commit: cvs rdiff -u -r1.392 -r1.393 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Sep 23 15:17:33 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/lib: Makefile src/distrib/sets/lists/comp: mi Log Message: Build and install MLINKS for the libsaslc(3) functions. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/libsaslc/lib/Makefile cvs rdiff -u -r1.1675 -r1.1676 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Sep 23 15:24:36 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3 src/crypto/external/bsd/libsaslc/lib: Makefile src/distrib/sets/lists/comp: mi Log Message: Also note /etc/saslc.d. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/libsaslc/lib/Makefile cvs rdiff -u -r1.1676 -r1.1677 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Fri Sep 23 15:29:09 UTC 2011 Modified Files: src/sys/kern: tty.c src/sys/net: if_sl.c if_strip.c src/sys/sys: tty.h Log Message: Change obsolete CBSIZE constant (48), to a power of two constant (64) that is close enough to match the original assumptions. To generate a diff of this commit: cvs rdiff -u -r1.246 -r1.247 src/sys/kern/tty.c cvs rdiff -u -r1.117 -r1.118 src/sys/net/if_sl.c cvs rdiff -u -r1.95 -r1.96 src/sys/net/if_strip.c cvs rdiff -u -r1.88 -r1.89 src/sys/sys/tty.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpc/stand
Module Name:src Committed By: nonaka Date: Fri Sep 23 16:00:16 UTC 2011 Modified Files: src/sys/arch/hpc/stand/hpcboot: hpcboot.config src/sys/arch/hpc/stand/libsa: libsa.config stand.h stricmp.cpp strtok.cpp tolower.cpp winblk.c src/sys/arch/hpc/stand/libz: libz.config Added Files: src/sys/arch/hpc/stand/libsa: dkcksum.c ufs.c Log Message: fix build failure. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpc/stand/hpcboot/hpcboot.config cvs rdiff -u -r0 -r1.1 src/sys/arch/hpc/stand/libsa/dkcksum.c \ src/sys/arch/hpc/stand/libsa/ufs.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpc/stand/libsa/libsa.config \ src/sys/arch/hpc/stand/libsa/winblk.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpc/stand/libsa/stand.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpc/stand/libsa/stricmp.cpp \ src/sys/arch/hpc/stand/libsa/tolower.cpp cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpc/stand/libsa/strtok.cpp cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpc/stand/libz/libz.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpc/stand/hpcboot/res
Module Name:src Committed By: nonaka Date: Fri Sep 23 16:02:09 UTC 2011 Modified Files: src/sys/arch/hpc/stand/hpcboot/res: hpcmenu.rc Log Message: reduce combobox size. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpc/stand/hpcboot/res/hpcmenu.rc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/libsaslc/dist/man
Module Name:src Committed By: wiz Date: Fri Sep 23 16:22:00 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3 Log Message: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpc/stand/binary
Module Name:src Committed By: nonaka Date: Fri Sep 23 16:41:16 UTC 2011 Modified Files: src/sys/arch/hpc/stand/binary: build_number.h src/sys/arch/hpc/stand/binary/ARM: hpcboot.exe.uue Log Message: recompile. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpc/stand/binary/build_number.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpc/stand/binary/ARM/hpcboot.exe.uue Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: apb
Date: Fri Sep 23 21:13:14 UTC 2011
Modified Files:
src/share/mk: bsd.clean.mk
Log Message:
* use a :M* modifier when testing whether the expanded list of
files is empty. Sometimes the variable contains one or more spaces,
and testing against gave the wrong result, but applying the
:M* modifier discards the spaces. This should fix PR 45396.
* Instead of using - to ignore the exit status from the rm command,
use ||true. This should work around the bug in PR 45356, but that
bug is not fixed.
* Suppress the ${MKMSG} command with .if 0. People who build with
MAKEVERBOSE=1 don't want to see the message, and people who build
with MAKEVERBOSE=2 or higher will see the actual rm command. The
message may be useful for debugging this makefile itself, so it's
only disabled, not deleted.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/mk/bsd.clean.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: macallan Date: Fri Sep 23 23:02:23 UTC 2011 Modified Files: src/sys/arch/mips/mips: pmap.c Log Message: the cached/not cached stuff doesn't build when both MIPS1 and MIPS3 are defined so put it back to #if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64) there is no good reason why it can't work on MIPS1 though. To generate a diff of this commit: cvs rdiff -u -r1.204 -r1.205 src/sys/arch/mips/mips/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Fri Sep 23 23:57:06 UTC 2011 Modified Files: src/sys/kern: tty_pty.c Log Message: Fix various bogus things: - Don't use TTYHOG - 1, you can use the last byte in the ring buffer. - Don't put unnecessary if statements around the code. The loop invariant is that if you reach the top of the loop, cc == 0. - Remove cast to (void *). - Check result of b_to_q and adjust cc. - Explain what the TTYHOG - 2 code tried to do, and do it right. To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/sys/kern/tty_pty.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sat Sep 24 00:05:39 UTC 2011
Modified Files:
src/sys/kern: tty.c tty_subr.c
src/sys/sys: tty.h ttycom.h
Log Message:
- Introduce a sysctl to control the default tty queue size kern.tty.qsize,
which defaults to 1024 as before.
- Add two ioctls TIOC{G,S}QSIZE to read and adjust the queue size on
individual ptys.
NB: ttys (and ptys) still silently (or beepingly (IMAXBEL)) drop
characters if the queue size is exceeded. I.e. you can appear
to succeed writing to the {p,t}ty, but not all characters will
have made it if the queue overflows. CVS:
To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/sys/kern/tty.c
cvs rdiff -u -r1.39 -r1.40 src/sys/kern/tty_subr.c
cvs rdiff -u -r1.89 -r1.90 src/sys/sys/tty.h
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/ttycom.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sat Sep 24 00:06:20 UTC 2011 Modified Files: src/share/man/man4: tty.4 Log Message: mention the new QSIZE ioctls. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man4/tty.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: christos Date: Sat Sep 24 00:08:05 UTC 2011 Modified Files: src/share/man/man7: sysctl.7 Log Message: mention the new kern.tty.qsize To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Sat Sep 24 04:10:03 UTC 2011 Modified Files: src/sys/kern: tty_pty.c Log Message: put back the cc == 0 check, because we can re-enter the loop with cc != 0 if we block. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/kern/tty_pty.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
