CVS commit: src/share/man/man4/man4.vax
Module Name:src Committed By: reed Date: Tue Apr 6 02:30:40 UTC 2010 Modified Files: src/share/man/man4/man4.vax: dhu.4 Log Message: Fix time travel. (See previous line and previous revision.) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.vax/dhu.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/man4.vax/dhu.4 diff -u src/share/man/man4/man4.vax/dhu.4:1.13 src/share/man/man4/man4.vax/dhu.4:1.14 --- src/share/man/man4/man4.vax/dhu.4:1.13 Sat Apr 11 21:53:01 2009 +++ src/share/man/man4/man4.vax/dhu.4 Tue Apr 6 02:30:40 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: dhu.4,v 1.13 2009/04/11 21:53:01 joerg Exp $ +.\" $NetBSD: dhu.4,v 1.14 2010/04/06 02:30:40 reed Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -101,7 +101,7 @@ A new .Nm driver showed up in -.Bx 1.2 . +.Nx 1.2 . .Sh BUGS Even if the .Nm
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Mon Apr 5 22:53:02 UTC 2010
Modified Files:
src/distrib/utils/sysinst: util.c
src/distrib/utils/sysinst/arch/sparc64: md.h
Log Message:
Add a NO_LFS define to force support for LFS in sysinst off, even if
the install media provides the utilities. Set this for sparc64 for now,
since the bootblocks don't deal with the default LFS parameters used
by sysinst.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/distrib/utils/sysinst/util.c
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/sparc64/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.164 src/distrib/utils/sysinst/util.c:1.165
--- src/distrib/utils/sysinst/util.c:1.164 Tue Mar 30 20:09:25 2010
+++ src/distrib/utils/sysinst/util.c Mon Apr 5 22:53:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.164 2010/03/30 20:09:25 martin Exp $ */
+/* $NetBSD: util.c,v 1.165 2010/04/05 22:53:02 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1479,7 +1479,11 @@
check_lfs_progs(void)
{
+#ifndef NO_LFS
return (access("/sbin/fsck_lfs", X_OK) == 0 &&
access("/sbin/mount_lfs", X_OK) == 0 &&
access("/sbin/newfs_lfs", X_OK) == 0);
+#else
+ return 0;
+#endif
}
Index: src/distrib/utils/sysinst/arch/sparc64/md.h
diff -u src/distrib/utils/sysinst/arch/sparc64/md.h:1.17 src/distrib/utils/sysinst/arch/sparc64/md.h:1.18
--- src/distrib/utils/sysinst/arch/sparc64/md.h:1.17 Sat Mar 13 08:36:06 2010
+++ src/distrib/utils/sysinst/arch/sparc64/md.h Mon Apr 5 22:53:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.17 2010/03/13 08:36:06 mrg Exp $ */
+/* $NetBSD: md.h,v 1.18 2010/04/05 22:53:02 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -66,6 +66,9 @@
/* allow using tmpfs for /tmp instead of mfs */
#define HAVE_TMPFS
+/* disable LFS support, despite providing the lfs utilities */
+#define NO_LFS
+
/*
* Default filesets to fetch and install during installation
* or upgrade.
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: joerg Date: Mon Apr 5 21:35:36 UTC 2010 Modified Files: src/lib/libc/stdio: wprintf.3 Log Message: Fix escape sequences To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/stdio/wprintf.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdio/wprintf.3 diff -u src/lib/libc/stdio/wprintf.3:1.4 src/lib/libc/stdio/wprintf.3:1.5 --- src/lib/libc/stdio/wprintf.3:1.4 Sun Jan 11 02:46:30 2009 +++ src/lib/libc/stdio/wprintf.3 Mon Apr 5 21:35:36 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: wprintf.3,v 1.4 2009/01/11 02:46:30 christos Exp $ +.\" $NetBSD: wprintf.3,v 1.5 2010/04/05 21:35:36 joerg Exp $ .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -376,7 +376,7 @@ .Vt double argument is rounded and converted in the style .Sm off -.Oo \- Oc Ar d Li \&. Ar ddd Li e \\*[Pm] Ar dd +.Oo \- Oc Ar d Li \&. Ar ddd Li e \*[Pm] Ar dd .Sm on where there is one digit before the decimal-point character @@ -452,7 +452,7 @@ .Vt double argument is converted to hexadecimal notation in the style .Sm off -.Oo \- Oc Li 0x Ar h Li \&. Ar hhhp Oo \\*[Pm] Oc Ar d , +.Oo \- Oc Li 0x Ar h Li \&. Ar hhhp Oo \*[Pm] Oc Ar d , .Sm on where the number of digits after the hexadecimal-point character is equal to the precision specification.
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: joerg Date: Mon Apr 5 21:34:48 UTC 2010 Modified Files: src/lib/libc/stdio: fopen.3 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libc/stdio/fopen.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdio/fopen.3 diff -u src/lib/libc/stdio/fopen.3:1.23 src/lib/libc/stdio/fopen.3:1.24 --- src/lib/libc/stdio/fopen.3:1.23 Wed May 25 16:01:24 2005 +++ src/lib/libc/stdio/fopen.3 Mon Apr 5 21:34:47 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: fopen.3,v 1.23 2005/05/25 16:01:24 kleink Exp $ +.\" $NetBSD: fopen.3,v 1.24 2010/04/05 21:34:47 joerg Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -100,7 +100,7 @@ extension. .Pp Any created files will have mode -.Pf \\*q Dv S_IRUSR +.Pf \*q Dv S_IRUSR \&| .Dv S_IWUSR \&| @@ -110,7 +110,7 @@ \&| .Dv S_IROTH \&| -.Dv S_IWOTH Ns \\*q +.Dv S_IWOTH Ns \*q .Pq Li 0666 , as modified by the process' umask value (see
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: joerg
Date: Mon Apr 5 21:33:54 UTC 2010
Modified Files:
src/lib/libc/gen: ctype.3
Log Message:
\\ -> \e
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/gen/ctype.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/ctype.3
diff -u src/lib/libc/gen/ctype.3:1.19 src/lib/libc/gen/ctype.3:1.20
--- src/lib/libc/gen/ctype.3:1.19 Wed Mar 11 12:57:03 2009
+++ src/lib/libc/gen/ctype.3 Mon Apr 5 21:33:54 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: ctype.3,v 1.19 2009/03/11 12:57:03 joerg Exp $
+.\" $NetBSD: ctype.3,v 1.20 2010/04/05 21:33:54 joerg Exp $
.\"
.\" Copyright (c) 1991 Regents of the University of California.
.\" All rights reserved.
@@ -78,7 +78,7 @@
code:
.Bd -literal
const char *s = ...;
-while (*s != '\\0') {
+while (*s != '\e0') {
putchar(toupper((int)(unsigned char)*s));
s++;
}
CVS commit: src/lib/libm/man
Module Name:src Committed By: joerg Date: Mon Apr 5 21:33:26 UTC 2010 Modified Files: src/lib/libm/man: ieee.3 Log Message: Fix escape sequences To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libm/man/ieee.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/man/ieee.3 diff -u src/lib/libm/man/ieee.3:1.19 src/lib/libm/man/ieee.3:1.20 --- src/lib/libm/man/ieee.3:1.19 Thu Aug 7 16:44:48 2003 +++ src/lib/libm/man/ieee.3 Mon Apr 5 21:33:25 2010 @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\" $NetBSD: ieee.3,v 1.19 2003/08/07 16:44:48 agc Exp $ +.\" $NetBSD: ieee.3,v 1.20 2010/04/05 21:33:25 joerg Exp $ .\" .Dd February 25, 1994 .Dt IEEE 3 @@ -91,7 +91,7 @@ otherwise a zero is returned (when -.Pf \\*(Ba Ns Fa x Ns \\*(Ba +.Pf \*(Ba Ns Fa x Ns \*(Ba = \*(If or .Fa x is \*(Na). @@ -129,10 +129,10 @@ .Fa x Ns / Ns Fa y ; .Ek moreover if -.Pf \\*(Ba Fa n +.Pf \*(Ba Fa n \- .Sm off -.Fa x No / Fa y No \\*(Ba +.Fa x No / Fa y No \*(Ba .Sm on = 1/2 @@ -141,11 +141,11 @@ is even. Consequently the remainder is computed exactly and .Sm off -.Pf \\*(Ba Fa r No \\*(Ba +.Pf \*(Ba Fa r No \*(Ba .Sm on \*(Le .Sm off -.Pf \\*(Ba Fa y No \\*(Ba/2 . +.Pf \*(Ba Fa y No \*(Ba/2 . .Sm on But .Fn remainder x 0
CVS commit: src/usr.bin/compile_et
Module Name:src Committed By: pgoyette Date: Mon Apr 5 21:33:10 UTC 2010 Modified Files: src/usr.bin/compile_et: compile_et.1 Log Message: Typo: s/ a a/ as a/ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/compile_et/compile_et.1 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/compile_et/compile_et.1 diff -u src/usr.bin/compile_et/compile_et.1:1.4 src/usr.bin/compile_et/compile_et.1:1.5 --- src/usr.bin/compile_et/compile_et.1:1.4 Mon Apr 5 21:16:21 2010 +++ src/usr.bin/compile_et/compile_et.1 Mon Apr 5 21:33:09 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: compile_et.1,v 1.4 2010/04/05 21:16:21 joerg Exp $ +.\" $NetBSD: compile_et.1,v 1.5 2010/04/05 21:33:09 pgoyette Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -67,7 +67,7 @@ following declarations: .Bl -tag -offset indent -width XX .It id [ Em base ] Em string -Defines an identification string (such a a version string) which is +Defines an identification string (such as a version string) which is recorded in the generated files. It is mandatory and must be the first declaration in the source file. .It et Em name
CVS commit: src/lib/libc/gen
Module Name:src Committed By: joerg Date: Mon Apr 5 21:29:48 UTC 2010 Modified Files: src/lib/libc/gen: syslog.3 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/libc/gen/syslog.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/syslog.3 diff -u src/lib/libc/gen/syslog.3:1.26 src/lib/libc/gen/syslog.3:1.27 --- src/lib/libc/gen/syslog.3:1.26 Sat Nov 1 13:54:01 2008 +++ src/lib/libc/gen/syslog.3 Mon Apr 5 21:29:47 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: syslog.3,v 1.26 2008/11/01 13:54:01 wiz Exp $ +.\" $NetBSD: syslog.3,v 1.27 2010/04/05 21:29:47 joerg Exp $ .\" $OpenBSD: syslog.3,v 1.25 2005/07/22 03:16:58 jaredy Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 @@ -444,7 +444,7 @@ syslogp(LOG_INFO|LOG_LOCAL2, NULL, NULL, "foobar error: %m"); -syslogp(LOG_INFO, "ID%d", "[meta language=\\"en-US\\"]", +syslogp(LOG_INFO, "ID%d", "[meta language=\e"en-US\e"]", "event: %s", 42, EventDescription); .Ed .Pp
CVS commit: src/lib/libc/gen
Module Name:src Committed By: joerg Date: Mon Apr 5 21:29:09 UTC 2010 Modified Files: src/lib/libc/gen: scandir.3 Log Message: Fix escape sequences To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/scandir.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/scandir.3 diff -u src/lib/libc/gen/scandir.3:1.11 src/lib/libc/gen/scandir.3:1.12 --- src/lib/libc/gen/scandir.3:1.11 Thu Aug 7 16:42:56 2003 +++ src/lib/libc/gen/scandir.3 Mon Apr 5 21:29:09 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: scandir.3,v 1.11 2003/08/07 16:42:56 agc Exp $ +.\" $NetBSD: scandir.3,v 1.12 2010/04/05 21:29:09 joerg Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -42,7 +42,7 @@ .In sys/types.h .In dirent.h .Ft int -.Fn scandir "const char *dirname" "struct dirent ***namelist" "int \\*(lp*select\\*(rp\\*(lpconst struct dirent *\\*(rp" "int \\*(lp*compar\\*(rp\\*(lpconst void *, const void *\\*(rp" +.Fn scandir "const char *dirname" "struct dirent ***namelist" "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" "int \*(lp*compar\*(rp\*(lpconst void *, const void *\*(rp" .Ft int .Fn alphasort "const void *d1" "const void *d2" .Sh DESCRIPTION
CVS commit: src/lib/libc/hash/sha1
Module Name:src
Committed By: joerg
Date: Mon Apr 5 21:27:01 UTC 2010
Modified Files:
src/lib/libc/hash/sha1: sha1.3
Log Message:
\\ -> \e
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/hash/sha1/sha1.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/hash/sha1/sha1.3
diff -u src/lib/libc/hash/sha1/sha1.3:1.5 src/lib/libc/hash/sha1/sha1.3:1.6
--- src/lib/libc/hash/sha1/sha1.3:1.5 Fri Nov 6 20:31:18 2009
+++ src/lib/libc/hash/sha1/sha1.3 Mon Apr 5 21:27:01 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: sha1.3,v 1.5 2009/11/06 20:31:18 joerg Exp $
+.\" $NetBSD: sha1.3,v 1.6 2010/04/05 21:27:01 joerg Exp $
.\" $OpenBSD: sha1.3,v 1.9 1998/03/07 22:18:12 millert Exp $
.\"
.\" Copyright (c) 1997, 2004 Todd C. Miller
@@ -159,7 +159,7 @@
printf("0x");
for (n = 0; n \*[Lt] 20; n++)
printf("%02x", results[n]);
-putchar('\\n');
+putchar('\en');
.Ed
.Pp
Alternately, the helper functions could be used in the following way:
CVS commit: src/lib/libc/hash/rmd160
Module Name:src
Committed By: joerg
Date: Mon Apr 5 21:26:30 UTC 2010
Modified Files:
src/lib/libc/hash/rmd160: rmd160.3
Log Message:
\\ -> \e
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/hash/rmd160/rmd160.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/hash/rmd160/rmd160.3
diff -u src/lib/libc/hash/rmd160/rmd160.3:1.2 src/lib/libc/hash/rmd160/rmd160.3:1.3
--- src/lib/libc/hash/rmd160/rmd160.3:1.2 Mon Dec 26 19:40:14 2005
+++ src/lib/libc/hash/rmd160/rmd160.3 Mon Apr 5 21:26:30 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: rmd160.3,v 1.2 2005/12/26 19:40:14 perry Exp $
+.\" $NetBSD: rmd160.3,v 1.3 2010/04/05 21:26:30 joerg Exp $
.\" $OpenBSD: rmd160.3,v 1.12 2000/04/18 03:01:29 aaron Exp $
.\"
.\" Copyright (c) 1997 Todd C. Miller
@@ -173,7 +173,7 @@
printf("0x");
for (n = 0; n \*[Lt] 20; n++)
printf("%02x", results[n]);
-putchar('\\n');
+putchar('\en');
.Ed
.Pp
Alternately, the helper functions could be used in the following way:
CVS commit: src/lib/libc/sys
Module Name:src
Committed By: joerg
Date: Mon Apr 5 21:25:57 UTC 2010
Modified Files:
src/lib/libc/sys: select.2
Log Message:
\\ -> \e
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/sys/select.2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/sys/select.2
diff -u src/lib/libc/sys/select.2:1.37 src/lib/libc/sys/select.2:1.38
--- src/lib/libc/sys/select.2:1.37 Mon Mar 22 19:30:55 2010
+++ src/lib/libc/sys/select.2 Mon Apr 5 21:25:56 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: select.2,v 1.37 2010/03/22 19:30:55 joerg Exp $
+.\" $NetBSD: select.2,v 1.38 2010/04/05 21:25:56 joerg Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -207,11 +207,11 @@
break;
case 0:
- printf("Timeout, no data received.\\n");
+ printf("Timeout, no data received.\en");
break;
default:
- printf("Data received on %d file desciptor(s)\\n", ret);
+ printf("Data received on %d file desciptor(s)\en", ret);
/*
* select(2) hands back a file descriptor set where
@@ -220,7 +220,7 @@
*/
for (i = 0; i \*[Lt]= fd; i++) {
if (FD_ISSET(i, \*[Am]read_set)) {
-printf("Data on file descriptor %d\\n", i);
+printf("Data on file descriptor %d\en", i);
/* Remove the file descriptor from the set */
FD_CLR(fd, \*[Am]read_set);
}
CVS commit: src/usr.bin/stat
Module Name:src Committed By: joerg Date: Mon Apr 5 21:25:01 UTC 2010 Modified Files: src/usr.bin/stat: stat.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/stat/stat.1 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/stat/stat.1 diff -u src/usr.bin/stat/stat.1:1.27 src/usr.bin/stat/stat.1:1.28 --- src/usr.bin/stat/stat.1:1.27 Thu Mar 11 21:37:01 2010 +++ src/usr.bin/stat/stat.1 Mon Apr 5 21:25:01 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: stat.1,v 1.27 2010/03/11 21:37:01 enami Exp $ +.\" $NetBSD: stat.1,v 1.28 2010/04/05 21:25:01 joerg Exp $ .\" .\" Copyright (c) 2002-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -462,7 +462,7 @@ exits 0 on success, and \*[Gt]0 if an error occurred. .Sh EXAMPLES If no options are specified, the default format is -"%d %i %Sp %l %Su %Sg %r %z \\"%Sa\\" \\"%Sm\\" \\"%Sc\\" \\"%SB\\" %k %b %#Xf %N". +"%d %i %Sp %l %Su %Sg %r %z \e"%Sa\e" \e"%Sm\e" \e"%Sc\e" \e"%SB\e" %k %b %#Xf %N". .Bd -literal -offset indent \*[Gt] stat /tmp/bar 0 78852 -rw-r--r-- 1 root wheel 0 0 "Jul 8 10:26:03 2004" "Jul 8 10:26:03 2004" "Jul 8 10:28:13 2004" "Jan 1 09:00:00 1970" 16384 0 0 /tmp/bar
CVS commit: src/usr.bin/printf
Module Name:src Committed By: joerg Date: Mon Apr 5 21:24:14 UTC 2010 Modified Files: src/usr.bin/printf: printf.1 Log Message: \\*(Pm -> \*(Pm To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.bin/printf/printf.1 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/printf/printf.1 diff -u src/usr.bin/printf/printf.1:1.23 src/usr.bin/printf/printf.1:1.24 --- src/usr.bin/printf/printf.1:1.23 Wed Mar 11 13:57:39 2009 +++ src/usr.bin/printf/printf.1 Mon Apr 5 21:24:14 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: printf.1,v 1.23 2009/03/11 13:57:39 joerg Exp $ +.\" $NetBSD: printf.1,v 1.24 2010/04/05 21:24:14 joerg Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -277,7 +277,7 @@ .Ar argument is printed in the style .Sm off -.Pf [\-]d Cm \&. No ddd Cm e No \\*(Pmdd +.Pf [\-]d Cm \&. No ddd Cm e No \*(Pmdd .Sm on where there is one digit before the decimal point and the number after is equal to
CVS commit: src/bin/pax
Module Name:src Committed By: joerg Date: Mon Apr 5 21:22:37 UTC 2010 Modified Files: src/bin/pax: pax.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/bin/pax/pax.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/pax/pax.1 diff -u src/bin/pax/pax.1:1.56 src/bin/pax/pax.1:1.57 --- src/bin/pax/pax.1:1.56 Sun Sep 6 13:38:50 2009 +++ src/bin/pax/pax.1 Mon Apr 5 21:22:37 2010 @@ -1,4 +1,4 @@ -.\"$NetBSD: pax.1,v 1.56 2009/09/06 13:38:50 christos Exp $ +.\"$NetBSD: pax.1,v 1.57 2010/04/05 21:22:37 joerg Exp $ .\" .\" Copyright (c) 1992 Keith Muller. .\" Copyright (c) 1992, 1993 @@ -642,7 +642,7 @@ .Cm old is a basic regular expression and .Cm new -can contain an ampersand (\*[Am]), \\n (where n is a digit) back-references, +can contain an ampersand (\*[Am]), \en (where n is a digit) back-references, or subexpression matching. The .Cm old @@ -877,7 +877,7 @@ name, or when starting with a .Cm # , a numeric gid. -A '\\' can be used to escape the +A '\e' can be used to escape the .Cm # . Multiple .Fl G @@ -1059,7 +1059,7 @@ name, or when starting with a .Cm # , a numeric uid. -A '\\' can be used to escape the +A '\e' can be used to escape the .Cm # . Multiple .Fl U
CVS commit: src/bin/ls
Module Name:src Committed By: joerg Date: Mon Apr 5 21:19:26 UTC 2010 Modified Files: src/bin/ls: ls.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/bin/ls/ls.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/ls/ls.1 diff -u src/bin/ls/ls.1:1.63 src/bin/ls/ls.1:1.64 --- src/bin/ls/ls.1:1.63 Thu Sep 25 23:44:05 2008 +++ src/bin/ls/ls.1 Mon Apr 5 21:19:26 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: ls.1,v 1.63 2008/09/25 23:44:05 lukem Exp $ +.\" $NetBSD: ls.1,v 1.64 2010/04/05 21:19:26 joerg Exp $ .\" .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -78,7 +78,7 @@ dot .Pq Sq \&. . .It Fl B -Force printing of non-graphic characters in file names as \\xxx, where xxx +Force printing of non-graphic characters in file names as \exxx, where xxx is the numeric value of the character in octal. .It Fl b As
CVS commit: src/usr.bin/lam
Module Name:src Committed By: joerg Date: Mon Apr 5 21:18:56 UTC 2010 Modified Files: src/usr.bin/lam: lam.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/lam/lam.1 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/lam/lam.1 diff -u src/usr.bin/lam/lam.1:1.6 src/usr.bin/lam/lam.1:1.7 --- src/usr.bin/lam/lam.1:1.6 Fri Jan 18 01:50:11 2008 +++ src/usr.bin/lam/lam.1 Mon Apr 5 21:18:56 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: lam.1,v 1.6 2008/01/18 01:50:11 jschauma Exp $ +.\" $NetBSD: lam.1,v 1.7 2010/04/05 21:18:56 joerg Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -107,7 +107,7 @@ joins 4 files together along each line. To merge the lines from four different files use .Bd -literal -offset indent -lam file1 \-S "\\ +lam file1 \-S "\e " file2 file3 file4 .Ed .Pp
CVS commit: src/usr.bin/error
Module Name:src Committed By: joerg Date: Mon Apr 5 21:18:20 UTC 2010 Modified Files: src/usr.bin/error: error.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/error/error.1 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/error/error.1 diff -u src/usr.bin/error/error.1:1.13 src/usr.bin/error/error.1:1.14 --- src/usr.bin/error/error.1:1.13 Fri Nov 24 19:37:03 2006 +++ src/usr.bin/error/error.1 Mon Apr 5 21:18:20 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: error.1,v 1.13 2006/11/24 19:37:03 christos Exp $ +.\" $NetBSD: error.1,v 1.14 2010/04/05 21:18:20 joerg Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -289,7 +289,7 @@ Humans are still much better at discarding these related errors. .Pp Pascal error messages belong after the lines affected -(error puts them before). The alignment of the `\\' marking +(error puts them before). The alignment of the `\e' marking the point of error is also disturbed by .Nm . .Pp
CVS commit: src/bin/df
Module Name:src Committed By: joerg Date: Mon Apr 5 21:17:28 UTC 2010 Modified Files: src/bin/df: df.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/bin/df/df.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/df/df.1 diff -u src/bin/df/df.1:1.43 src/bin/df/df.1:1.44 --- src/bin/df/df.1:1.43 Tue Mar 4 20:11:00 2008 +++ src/bin/df/df.1 Mon Apr 5 21:17:28 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: df.1,v 1.43 2008/03/04 20:11:00 christos Exp $ +.\" $NetBSD: df.1,v 1.44 2010/04/05 21:17:28 joerg Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -136,7 +136,7 @@ option are specified, the output will be preceded by the following header line, formatted to match the data following it: .Bd -literal -"Filesystem 1024-blocks Used Available Capacity Mounted on\\n" +"Filesystem 1024-blocks Used Available Capacity Mounted on\en" .Ed .Pp If the @@ -146,12 +146,12 @@ options, the output will be preceded by the following header line, formatted to match the data following it: .Bd -literal -"Filesystem \*[Lt]blksize\*[Gt]-blocks Used Available Capacity Mounted on\\n" +"Filesystem \*[Lt]blksize\*[Gt]-blocks Used Available Capacity Mounted on\en" .Ed .Pp The header line is followed by data formatted as follows: .Bd -literal -"%s %d %d %d %d%% %s\\n", \*[Lt]file system name\*[Gt], \*[Lt]total space\*[Gt], +"%s %d %d %d %d%% %s\en", \*[Lt]file system name\*[Gt], \*[Lt]total space\*[Gt], \*[Lt]space used\*[Gt], \*[Lt]space free\*[Gt], \*[Lt]percentage used\*[Gt], \*[Lt]file system root\*[Gt] .Ed
CVS commit: src/usr.bin/compile_et
Module Name:src Committed By: joerg Date: Mon Apr 5 21:16:22 UTC 2010 Modified Files: src/usr.bin/compile_et: compile_et.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/compile_et/compile_et.1 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/compile_et/compile_et.1 diff -u src/usr.bin/compile_et/compile_et.1:1.3 src/usr.bin/compile_et/compile_et.1:1.4 --- src/usr.bin/compile_et/compile_et.1:1.3 Tue Dec 8 09:45:15 2009 +++ src/usr.bin/compile_et/compile_et.1 Mon Apr 5 21:16:21 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: compile_et.1,v 1.3 2009/12/08 09:45:15 mbalmer Exp $ +.\" $NetBSD: compile_et.1,v 1.4 2010/04/05 21:16:21 joerg Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -115,7 +115,7 @@ .Pp .Bd -literal # example error table source file - id "\\$Id\\$" + id "\e$Id\e$" et test prefix TEST ec PERM, "Operation not permitted"
CVS commit: src/usr.sbin/ypserv/ypserv
Module Name:src Committed By: joerg Date: Mon Apr 5 19:38:53 UTC 2010 Modified Files: src/usr.sbin/ypserv/ypserv: ypserv.8 Log Message: No trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/ypserv/ypserv/ypserv.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/ypserv/ypserv/ypserv.8 diff -u src/usr.sbin/ypserv/ypserv/ypserv.8:1.20 src/usr.sbin/ypserv/ypserv/ypserv.8:1.21 --- src/usr.sbin/ypserv/ypserv/ypserv.8:1.20 Tue Oct 20 00:51:15 2009 +++ src/usr.sbin/ypserv/ypserv/ypserv.8 Mon Apr 5 19:38:53 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: ypserv.8,v 1.20 2009/10/20 00:51:15 snj Exp $ +.\" $NetBSD: ypserv.8,v 1.21 2010/04/05 19:38:53 joerg Exp $ .\" .\" Copyright (c) 1994 Mats O Jansson .\" All rights reserved. @@ -78,7 +78,7 @@ will return the .Tn NIS result code YP_NODOM. -To avoid problems with DNS lookups causing +To avoid problems with DNS lookups causing .Nm to hang, .Nm
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Mon Apr 5 19:37:13 UTC 2010 Modified Files: src/share/man/man9: tvtohz.9 Log Message: No trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/tvtohz.9 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/man9/tvtohz.9 diff -u src/share/man/man9/tvtohz.9:1.2 src/share/man/man9/tvtohz.9:1.3 --- src/share/man/man9/tvtohz.9:1.2 Mon Nov 24 14:36:40 2008 +++ src/share/man/man9/tvtohz.9 Mon Apr 5 19:37:13 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: tvtohz.9,v 1.2 2008/11/24 14:36:40 tsutsui Exp $ +.\" $NetBSD: tvtohz.9,v 1.3 2010/04/05 19:37:13 joerg Exp $ .\" .\" Copyright (c) 2000 Kelly Yancey .\" All rights reserved. @@ -55,7 +55,7 @@ The .Nm function first appeared in -.Fx 3.0 +.Fx 3.0 and was ported to .Nx 4.0 as a part of
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Mon Apr 5 19:36:29 UTC 2010 Modified Files: src/share/man/man9: select.9 Log Message: No trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/select.9 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/man9/select.9 diff -u src/share/man/man9/select.9:1.3 src/share/man/man9/select.9:1.4 --- src/share/man/man9/select.9:1.3 Tue May 13 15:52:51 2008 +++ src/share/man/man9/select.9 Mon Apr 5 19:36:29 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: select.9,v 1.3 2008/05/13 15:52:51 tnn Exp $ +.\" $NetBSD: select.9,v 1.4 2010/04/05 19:36:29 joerg Exp $ .\" .\" Copyright (C) 2002 Chad David . All rights reserved. .\" @@ -79,11 +79,11 @@ .Fn selrecord should only be called when the poll routine determines that the object is not ready for I/O: there are no events of interest pending. -The check for pending I/O and call to +The check for pending I/O and call to .Fn selrecord must be atomic. Atomicity can be provided by holding the object's lock across the test -and call to +and call to .Fn selrecord . For non-MPSAFE drivers, the global .Dv kernel_lock @@ -92,9 +92,9 @@ .Fn selnotify is called by the underlying object handling code in order to notify any waiting threads that an event of interest has occurred. -The same lock held across the poll method and call to +The same lock held across the poll method and call to .Fn selrecord -must be held across the call to +must be held across the call to .Fn selnotify . The lock prevents an event of interest being signalled while a thread is in the process of recording its interest.
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Mon Apr 5 19:34:28 UTC 2010 Modified Files: src/share/man/man9: ieee80211_radiotap.9 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/ieee80211_radiotap.9 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/man9/ieee80211_radiotap.9 diff -u src/share/man/man9/ieee80211_radiotap.9:1.11 src/share/man/man9/ieee80211_radiotap.9:1.12 --- src/share/man/man9/ieee80211_radiotap.9:1.11 Mon Mar 26 04:32:14 2007 +++ src/share/man/man9/ieee80211_radiotap.9 Mon Apr 5 19:34:28 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: ieee80211_radiotap.9,v 1.11 2007/03/26 04:32:14 dyoung Exp $ +.\" $NetBSD: ieee80211_radiotap.9,v 1.12 2010/04/05 19:34:28 joerg Exp $ .\" .\" Copyright (c) 2004 Bruce M. Simpson , .\" Darron Broad . @@ -243,11 +243,11 @@ .Pp Bitmap indicating which fields are present in the above structure: .Bd -literal -offset indent -#define AN_RX_RADIOTAP_PRESENT \\ - ((1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_FLAGS) | \\ - (1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_RATE) | \\ - (1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_CHANNEL) | \\ - (1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_DBM_ANTSIGNAL) | \\ +#define AN_RX_RADIOTAP_PRESENT \e + ((1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_FLAGS) | \e + (1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_RATE) | \e + (1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_CHANNEL) | \e + (1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_DBM_ANTSIGNAL) | \e (1 \*[Gt]\*[Gt] IEEE80211_RADIOTAP_DBM_ANTNOISE)) .Ed .Sh SEE ALSO
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Mon Apr 5 19:32:55 UTC 2010 Modified Files: src/share/man/man9: doshutdownhooks.9 Log Message: Drop redundant macros. Drop incorrect , To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/doshutdownhooks.9 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/man9/doshutdownhooks.9 diff -u src/share/man/man9/doshutdownhooks.9:1.11 src/share/man/man9/doshutdownhooks.9:1.12 --- src/share/man/man9/doshutdownhooks.9:1.11 Thu Feb 11 18:17:43 2010 +++ src/share/man/man9/doshutdownhooks.9 Mon Apr 5 19:32:55 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: doshutdownhooks.9,v 1.11 2010/02/11 18:17:43 dyoung Exp $ +.\" $NetBSD: doshutdownhooks.9,v 1.12 2010/04/05 19:32:55 joerg Exp $ .\" .\" Copyright (c) 1994 Christopher G. Demetriou .\" All rights reserved. @@ -43,10 +43,10 @@ .Fn doshutdownhooks "void" .Sh DESCRIPTION .Em The -.Em Nm +.Nm .Em routine is deprecated. .Em Use -.Em Xr pmf_system_shutdown 9 , +.Xr pmf_system_shutdown 9 .Em instead. .Pp The
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Mon Apr 5 19:31:29 UTC 2010 Modified Files: src/share/man/man9: dopowerhooks.9 Log Message: Drop incorrect , To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/dopowerhooks.9 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/man9/dopowerhooks.9 diff -u src/share/man/man9/dopowerhooks.9:1.5 src/share/man/man9/dopowerhooks.9:1.6 --- src/share/man/man9/dopowerhooks.9:1.5 Mon Apr 5 19:29:32 2010 +++ src/share/man/man9/dopowerhooks.9 Mon Apr 5 19:31:29 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: dopowerhooks.9,v 1.5 2010/04/05 19:29:32 joerg Exp $ +.\" $NetBSD: dopowerhooks.9,v 1.6 2010/04/05 19:31:29 joerg Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -41,7 +41,7 @@ .Nm .Em routine is deprecated. .Em Use -.Xr pmf_system_suspend 9 , +.Xr pmf_system_suspend 9 .Em instead. .Pp The
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Mon Apr 5 19:29:32 UTC 2010 Modified Files: src/share/man/man9: dopowerhooks.9 Log Message: Drop redundant macros. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/dopowerhooks.9 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/man9/dopowerhooks.9 diff -u src/share/man/man9/dopowerhooks.9:1.4 src/share/man/man9/dopowerhooks.9:1.5 --- src/share/man/man9/dopowerhooks.9:1.4 Thu Feb 11 18:20:38 2010 +++ src/share/man/man9/dopowerhooks.9 Mon Apr 5 19:29:32 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: dopowerhooks.9,v 1.4 2010/02/11 18:20:38 dyoung Exp $ +.\" $NetBSD: dopowerhooks.9,v 1.5 2010/04/05 19:29:32 joerg Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -38,10 +38,10 @@ .Fn dopowerhooks "int why" .Sh DESCRIPTION .Em The -.Em Nm +.Nm .Em routine is deprecated. .Em Use -.Em Xr pmf_system_suspend 9 , +.Xr pmf_system_suspend 9 , .Em instead. .Pp The
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Mon Apr 5 19:27:16 UTC 2010 Modified Files: src/share/man/man9: config.9 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man9/config.9 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/man9/config.9 diff -u src/share/man/man9/config.9:1.27 src/share/man/man9/config.9:1.28 --- src/share/man/man9/config.9:1.27 Wed Mar 3 13:57:35 2010 +++ src/share/man/man9/config.9 Mon Apr 5 19:27:16 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: config.9,v 1.27 2010/03/03 13:57:35 pooka Exp $ +.\" $NetBSD: config.9,v 1.28 2010/04/05 19:27:16 joerg Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -167,7 +167,7 @@ .Em options are defined in file .Em filename . -This statement permits ``options FOO=bar'' or ``option FOO="\\"com\\""'' +This statement permits ``options FOO=bar'' or ``option FOO="\e"com\e""'' in the machine description file. .Xr config 1 will generate an error if a value is not given.
CVS commit: src/share/man/man9
Module Name:src
Committed By: joerg
Date: Mon Apr 5 19:26:28 UTC 2010
Modified Files:
src/share/man/man9: cons.9
Log Message:
\\ -> \e
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man9/cons.9
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/man9/cons.9
diff -u src/share/man/man9/cons.9:1.16 src/share/man/man9/cons.9:1.17
--- src/share/man/man9/cons.9:1.16 Wed Apr 30 13:10:58 2008
+++ src/share/man/man9/cons.9 Mon Apr 5 19:26:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: cons.9,v 1.16 2008/04/30 13:10:58 martin Exp $
+.\" $NetBSD: cons.9,v 1.17 2010/04/05 19:26:27 joerg Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -143,8 +143,8 @@
cnpollc(1);
for(;;) {
c = cngetc();
- if ((c == '\\r' || (c == '\\n')) {
- printf("\\n");
+ if ((c == '\er' || (c == '\en')) {
+ printf("\en");
break;
}
}
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Mon Apr 5 19:18:45 UTC 2010 Modified Files: src/share/man/man9: CTASSERT.9 Log Message: Canonical prolog order To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/CTASSERT.9 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/man9/CTASSERT.9 diff -u src/share/man/man9/CTASSERT.9:1.1 src/share/man/man9/CTASSERT.9:1.2 --- src/share/man/man9/CTASSERT.9:1.1 Mon Jan 25 07:51:17 2010 +++ src/share/man/man9/CTASSERT.9 Mon Apr 5 19:18:45 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: CTASSERT.9,v 1.1 2010/01/25 07:51:17 jruoho Exp $ +.\" $NetBSD: CTASSERT.9,v 1.2 2010/04/05 19:18:45 joerg Exp $ .\" Copyright (c) 2003 Hiten M. Pandya .\" .\" All rights reserved. @@ -28,8 +28,8 @@ .\" $FreeBSD: src/share/man/man9/CTASSERT.9,v 1.3 2008/09/05 15:24:54 emaste Exp $ .\" .Dd January 24, 2010 -.Os .Dt CTASSERT 9 +.Os .Sh NAME .Nm CTASSERT .Nd compile time assertion macro
CVS commit: src/share/man/man9
Module Name:src Committed By: dyoung Date: Mon Apr 5 18:24:24 UTC 2010 Modified Files: src/share/man/man9: bus_dma.9 bus_space.9 Log Message: Change some references to to . MI drivers should #include . #includes for the MD implementation details. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/share/man/man9/bus_dma.9 cvs rdiff -u -r1.38 -r1.39 src/share/man/man9/bus_space.9 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/man9/bus_dma.9 diff -u src/share/man/man9/bus_dma.9:1.49 src/share/man/man9/bus_dma.9:1.50 --- src/share/man/man9/bus_dma.9:1.49 Mon Mar 22 18:58:32 2010 +++ src/share/man/man9/bus_dma.9 Mon Apr 5 18:24:24 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: bus_dma.9,v 1.49 2010/03/22 18:58:32 joerg Exp $ +.\" $NetBSD: bus_dma.9,v 1.50 2010/04/05 18:24:24 dyoung Exp $ .\" .\" Copyright (c) 1996, 1997, 1998, 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 19, 2009 +.Dd April 5, 2010 .Dt BUS_DMA 9 .Os .Sh NAME @@ -50,7 +50,7 @@ .Nm bus_dmatag_destroy .Nd Bus and Machine Independent DMA Mapping Interface .Sh SYNOPSIS -.In machine/bus.h +.In sys/bus.h .Ft int .Fn bus_dmamap_create "bus_dma_tag_t tag" "bus_size_t size" "int nsegments" \ "bus_size_t maxsegsz" "bus_size_t boundary" "int flags" "bus_dmamap_t *dmamp" Index: src/share/man/man9/bus_space.9 diff -u src/share/man/man9/bus_space.9:1.38 src/share/man/man9/bus_space.9:1.39 --- src/share/man/man9/bus_space.9:1.38 Mon Mar 22 18:58:33 2010 +++ src/share/man/man9/bus_space.9 Mon Apr 5 18:24:24 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: bus_space.9,v 1.38 2010/03/22 18:58:33 joerg Exp $ +.\" $NetBSD: bus_space.9,v 1.39 2010/04/05 18:24:24 dyoung Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 1, 2008 +.Dd April 5, 2010 .Dt BUS_SPACE 9 .Os .Sh NAME @@ -105,7 +105,7 @@ .Nm bus_space_write_stream_8 .Nd bus space manipulation functions .Sh SYNOPSIS -.In machine/bus.h +.In sys/bus.h .Ft int .Fn bus_space_map "bus_space_tag_t space" "bus_addr_t address" \ "bus_size_t size" "int flags" "bus_space_handle_t *handlep" @@ -347,7 +347,7 @@ machine-independent access to bus memory and register areas. All of the functions and types described in this document can be used by including the -.In machine/bus.h +.In sys/bus.h header file. .Pp Many common devices are used on multiple architectures, but are accessed @@ -1603,7 +1603,7 @@ old, deprecated specification can be compiled by defining the .Dv __BUS_SPACE_COMPAT_OLDDEFS preprocessor symbol before including -.In machine/bus.h . +.In sys/bus.h . .Sh SEE ALSO .Xr bus_dma 9 , .Xr mb 9
CVS commit: src/sbin/mbrlabel
Module Name:src Committed By: wiz Date: Mon Apr 5 18:08:41 UTC 2010 Modified Files: src/sbin/mbrlabel: mbrlabel.8 Log Message: Sort option descriptions, per PR 43119 by Bug Hunting. Refer to -r from -w. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sbin/mbrlabel/mbrlabel.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mbrlabel/mbrlabel.8 diff -u src/sbin/mbrlabel/mbrlabel.8:1.16 src/sbin/mbrlabel/mbrlabel.8:1.17 --- src/sbin/mbrlabel/mbrlabel.8:1.16 Thu Jan 12 20:37:23 2006 +++ src/sbin/mbrlabel/mbrlabel.8 Mon Apr 5 18:08:41 2010 @@ -27,9 +27,9 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $NetBSD: mbrlabel.8,v 1.16 2006/01/12 20:37:23 wiz Exp $ +.\" $NetBSD: mbrlabel.8,v 1.17 2010/04/05 18:08:41 wiz Exp $ .\" -.Dd December 27, 2005 +.Dd April 5, 2010 .Dt MBRLABEL 8 .Os .Sh NAME @@ -86,8 +86,6 @@ Force an update, even if there has been no change. .It Fl q Performs operations in a quiet fashion. -.It Fl w -Update the in-core label if it has been changed. .It Fl r In conjunction with .Fl w , @@ -98,6 +96,10 @@ Useful if the disk has remapping drivers on it and the MBR is located in a non-standard place. Defaults to 0. +.It Fl w +Update the in-core label if it has been changed. +See also +.Fl r . .El .Sh SEE ALSO .Xr disklabel 8 ,
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src Committed By: joerg Date: Mon Apr 5 16:35:30 UTC 2010 Modified Files: src/sys/rump/net/lib/libvirtif: if_virt.c Log Message: Fix typo To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/rump/net/lib/libvirtif/if_virt.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/rump/net/lib/libvirtif/if_virt.c diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.17 src/sys/rump/net/lib/libvirtif/if_virt.c:1.18 --- src/sys/rump/net/lib/libvirtif/if_virt.c:1.17 Mon Apr 5 07:22:50 2010 +++ src/sys/rump/net/lib/libvirtif/if_virt.c Mon Apr 5 16:35:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_virt.c,v 1.17 2010/04/05 07:22:50 joerg Exp $ */ +/* $NetBSD: if_virt.c,v 1.18 2010/04/05 16:35:30 joerg Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.17 2010/04/05 07:22:50 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.18 2010/04/05 16:35:30 joerg Exp $"); #include #include @@ -232,7 +232,7 @@ } m->m_len = m->m_pkthdr.len = n; m->m_pkthdr.rcvif = ifp; - bpf_mtap(ifp, m0); + bpf_mtap(ifp, m); ether_input(ifp, m); }
CVS commit: src/bin/stty
Module Name:src Committed By: joerg Date: Mon Apr 5 16:19:54 UTC 2010 Modified Files: src/bin/stty: stty.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/bin/stty/stty.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/stty/stty.1 diff -u src/bin/stty/stty.1:1.38 src/bin/stty/stty.1:1.39 --- src/bin/stty/stty.1:1.38 Mon Dec 14 07:35:44 2009 +++ src/bin/stty/stty.1 Mon Apr 5 16:19:54 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: stty.1,v 1.38 2009/12/14 07:35:44 wiz Exp $ +.\" $NetBSD: stty.1,v 1.39 2010/04/05 16:19:54 joerg Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -324,7 +324,7 @@ Otherwise control characters echo as themselves. .It Cm echoprt Pq Fl echoprt For printing terminals. -If set, echo erased characters backwards within ``\\'' +If set, echo erased characters backwards within ``\e'' and ``/''. Otherwise, disable this feature. .It Cm noflsh Pq Fl noflsh
CVS commit: src/bin/pax
Module Name:src Committed By: joerg Date: Mon Apr 5 16:16:53 UTC 2010 Modified Files: src/bin/pax: tar.1 Log Message: \\ -> \e To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/bin/pax/tar.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/pax/tar.1 diff -u src/bin/pax/tar.1:1.29 src/bin/pax/tar.1:1.30 --- src/bin/pax/tar.1:1.29 Tue Mar 23 18:09:16 2010 +++ src/bin/pax/tar.1 Mon Apr 5 16:16:53 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: tar.1,v 1.29 2010/03/23 18:09:16 dholland Exp $ +.\" $NetBSD: tar.1,v 1.30 2010/04/05 16:16:53 joerg Exp $ .\" .\" Copyright (c) 1996 SigmaSoft, Th. Lockert .\" All rights reserved. @@ -167,7 +167,7 @@ .Cm old is a basic regular expression and .Cm new -can contain an ampersand (\*[Am]), \\n (where n is a digit) back-references, +can contain an ampersand (\*[Am]), \en (where n is a digit) back-references, or subexpression matching. The .Cm old
CVS commit: src/usr.bin/whereis
Module Name:src Committed By: joerg Date: Mon Apr 5 16:13:58 UTC 2010 Modified Files: src/usr.bin/whereis: which.1 Log Message: No trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/whereis/which.1 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/whereis/which.1 diff -u src/usr.bin/whereis/which.1:1.1 src/usr.bin/whereis/which.1:1.2 --- src/usr.bin/whereis/which.1:1.1 Thu Apr 1 21:41:37 2004 +++ src/usr.bin/whereis/which.1 Mon Apr 5 16:13:58 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: which.1,v 1.1 2004/04/01 21:41:37 christos Exp $ +.\" $NetBSD: which.1,v 1.2 2010/04/05 16:13:58 joerg Exp $ .\" .\" Copyright (c) 1980, 1991 Regents of the University of California. .\" All rights reserved. @@ -28,7 +28,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)which.1 6.3 (Berkeley) 4/23/91 -.\" $NetBSD: which.1,v 1.1 2004/04/01 21:41:37 christos Exp $ +.\" $NetBSD: which.1,v 1.2 2010/04/05 16:13:58 joerg Exp $ .\" .Dd April 23, 1991 .Dt WHICH 1 @@ -61,7 +61,7 @@ command appeared in .Bx 3.0 . .Sh BUGS -This implementation does not expand -.Xr csh 1 +This implementation does not expand +.Xr csh 1 aliases, and is shell agnostic. This is really a feature.
CVS commit: src/distrib/notes/atari
Module Name:src Committed By: tsutsui Date: Mon Apr 5 14:42:38 UTC 2010 Modified Files: src/distrib/notes/atari: hardware Log Message: Also note EtherNEC. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/notes/atari/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/atari/hardware diff -u src/distrib/notes/atari/hardware:1.23 src/distrib/notes/atari/hardware:1.24 --- src/distrib/notes/atari/hardware:1.23 Mon Apr 5 14:41:35 2010 +++ src/distrib/notes/atari/hardware Mon Apr 5 14:42:38 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.23 2010/04/05 14:41:35 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.24 2010/04/05 14:42:38 tsutsui Exp $ . .Nx*M \*V runs on the TT030, Falcon, Hades and MilanI machines. @@ -49,6 +49,8 @@ .It The serial interface on the first 68901 UART (modem1) .It +EtherNEC Ethernet on ROM cartridge slot +.It VME-bus devices (TT030/Hades) .(bullet -compact BVME410 Ethernet
CVS commit: src/distrib/notes/atari
Module Name:src Committed By: tsutsui Date: Mon Apr 5 14:41:35 UTC 2010 Modified Files: src/distrib/notes/atari: hardware Log Message: - note SMC_TT to supported VME-bus devices - capitalize Ethernet To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/notes/atari/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/atari/hardware diff -u src/distrib/notes/atari/hardware:1.22 src/distrib/notes/atari/hardware:1.23 --- src/distrib/notes/atari/hardware:1.22 Thu Apr 23 01:56:48 2009 +++ src/distrib/notes/atari/hardware Mon Apr 5 14:41:35 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.22 2009/04/23 01:56:48 snj Exp $ +.\" $NetBSD: hardware,v 1.23 2010/04/05 14:41:35 tsutsui Exp $ . .Nx*M \*V runs on the TT030, Falcon, Hades and MilanI machines. @@ -51,13 +51,15 @@ .It VME-bus devices (TT030/Hades) .(bullet -compact -BVME410 ethernet +BVME410 Ethernet .It Circad Leonardo 24-bit VME graphics adapter .It Crazy Dots VME et4000 graphics adapter .It -Riebl (and possibly PAM) ethernet cards on the VME bus. +Riebl (and possibly PAM) Ethernet cards on the VME bus. +.It +SMC Elite Ultra ISA Ethernet with SMC_TT VME-ISA bridge .bullet) .It PCI-bus devices (Hades and Milan only)
CVS commit: src/external/bsd/mdocml
Module Name:src
Committed By: joerg
Date: Mon Apr 5 14:23:56 UTC 2010
Modified Files:
src/external/bsd/mdocml: Makefile.inc
Log Message:
Update for mdocml-1.9.22
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/Makefile.inc
diff -u src/external/bsd/mdocml/Makefile.inc:1.5 src/external/bsd/mdocml/Makefile.inc:1.6
--- src/external/bsd/mdocml/Makefile.inc:1.5 Fri Feb 19 23:02:41 2010
+++ src/external/bsd/mdocml/Makefile.inc Mon Apr 5 14:23:56 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.5 2010/02/19 23:02:41 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.6 2010/04/05 14:23:56 joerg Exp $
.include
-VERSION= 1.9.15pl1
+VERSION= 1.9.22
CPPFLAGS+= -DVERSION=\"${VERSION}\"
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: joerg
Date: Mon Apr 5 14:22:59 UTC 2010
Modified Files:
src/external/bsd/mdocml/dist: mdoc_action.c
Log Message:
Merge mdocml-1.9.22
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/dist/mdoc_action.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/mdoc_action.c
diff -u src/external/bsd/mdocml/dist/mdoc_action.c:1.5 src/external/bsd/mdocml/dist/mdoc_action.c:1.6
--- src/external/bsd/mdocml/dist/mdoc_action.c:1.5 Fri Feb 19 23:01:28 2010
+++ src/external/bsd/mdocml/dist/mdoc_action.c Mon Apr 5 14:22:59 2010
@@ -1,4 +1,4 @@
-/* $Vendor-Id: mdoc_action.c,v 1.50 2010/01/01 17:14:29 kristaps Exp $ */
+/* $Vendor-Id: mdoc_action.c,v 1.51 2010/03/31 07:13:53 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons
*
@@ -647,7 +647,8 @@
post_bl_width(POST_ARGS)
{
size_t width;
- int i, tok;
+ int i;
+ enum mdoct tok;
char buf[NUMSIZ];
char *p;
CVS commit: src/external/bsd/mdocml/dist
Module Name:src Committed By: joerg Date: Mon Apr 5 14:19:54 UTC 2010 Update of /cvsroot/src/external/bsd/mdocml/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21301 Log Message: Import of mdocml-1.9.22: - Better support for obsolete .Xo/.Xc macros if compiled with -DUGLY - Support for more roff instructions in the man(7) code - Correct handling of opening punctuation in macros for mdoc(7) - Discard more of the pod2man junk Status: Vendor Tag: KRISTAPS Release Tags: mdocml-1-9-22 U src/external/bsd/mdocml/dist/mdoc_macro.c U src/external/bsd/mdocml/dist/config.h.pre U src/external/bsd/mdocml/dist/test-strlcpy.c U src/external/bsd/mdocml/dist/test-strlcat.c U src/external/bsd/mdocml/dist/external.png.uu U src/external/bsd/mdocml/dist/chars.in U src/external/bsd/mdocml/dist/vol.in U src/external/bsd/mdocml/dist/st.in U src/external/bsd/mdocml/dist/msec.in U src/external/bsd/mdocml/dist/lib.in U src/external/bsd/mdocml/dist/att.in U src/external/bsd/mdocml/dist/arch.in U src/external/bsd/mdocml/dist/style.css U src/external/bsd/mdocml/dist/man.3 U src/external/bsd/mdocml/dist/man.7 U src/external/bsd/mdocml/dist/mandoc_char.7 U src/external/bsd/mdocml/dist/manuals.7 U src/external/bsd/mdocml/dist/mdoc.7 U src/external/bsd/mdocml/dist/mdoc.3 U src/external/bsd/mdocml/dist/mandoc.1 U src/external/bsd/mdocml/dist/Makefile U src/external/bsd/mdocml/dist/main.h U src/external/bsd/mdocml/dist/out.h U src/external/bsd/mdocml/dist/chars.h U src/external/bsd/mdocml/dist/html.h U src/external/bsd/mdocml/dist/libmandoc.h U src/external/bsd/mdocml/dist/term.h U src/external/bsd/mdocml/dist/libman.h U src/external/bsd/mdocml/dist/man.h U src/external/bsd/mdocml/dist/libmdoc.h U src/external/bsd/mdocml/dist/mdoc.h U src/external/bsd/mdocml/dist/man_argv.c U src/external/bsd/mdocml/dist/mandoc.c U src/external/bsd/mdocml/dist/man_action.c U src/external/bsd/mdocml/dist/man_validate.c U src/external/bsd/mdocml/dist/man_hash.c U src/external/bsd/mdocml/dist/man.c U src/external/bsd/mdocml/dist/man_macro.c U src/external/bsd/mdocml/dist/out.c U src/external/bsd/mdocml/dist/man_html.c U src/external/bsd/mdocml/dist/mdoc_html.c U src/external/bsd/mdocml/dist/html.c U src/external/bsd/mdocml/dist/man_term.c U src/external/bsd/mdocml/dist/compat.c U src/external/bsd/mdocml/dist/tree.c U src/external/bsd/mdocml/dist/term.c U src/external/bsd/mdocml/dist/chars.c U src/external/bsd/mdocml/dist/main.c U src/external/bsd/mdocml/dist/mdoc_term.c U src/external/bsd/mdocml/dist/st.c U src/external/bsd/mdocml/dist/msec.c U src/external/bsd/mdocml/dist/vol.c U src/external/bsd/mdocml/dist/arch.c U src/external/bsd/mdocml/dist/att.c U src/external/bsd/mdocml/dist/lib.c C src/external/bsd/mdocml/dist/mdoc_action.c U src/external/bsd/mdocml/dist/mdoc_validate.c U src/external/bsd/mdocml/dist/mdoc_argv.c U src/external/bsd/mdocml/dist/mdoc_strings.c U src/external/bsd/mdocml/dist/mdoc_hash.c U src/external/bsd/mdocml/dist/mdoc.c U src/external/bsd/mdocml/dist/config.h.post 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jKRISTAPS:yesterday -jKRISTAPS src/external/bsd/mdocml/dist
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Mon Apr 5 14:01:26 UTC 2010
Modified Files:
src/libexec/ld.elf_so: headers.c reloc.c rtld.h symbol.c
Log Message:
Use fast_remainder32 for the ELF hash. For the hot cache case, this
speeds up Firefox startup by over 2% on AMD64.
Limit hash table buckets to 32bit.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/libexec/ld.elf_so/headers.c
cvs rdiff -u -r1.101 -r1.102 src/libexec/ld.elf_so/reloc.c
cvs rdiff -u -r1.90 -r1.91 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.52 -r1.53 src/libexec/ld.elf_so/symbol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.28 src/libexec/ld.elf_so/headers.c:1.29
--- src/libexec/ld.elf_so/headers.c:1.28 Sun Apr 12 13:29:29 2009
+++ src/libexec/ld.elf_so/headers.c Mon Apr 5 14:01:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.28 2009/04/12 13:29:29 lukem Exp $ */
+/* $NetBSD: headers.c,v 1.29 2010/04/05 14:01:26 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.28 2009/04/12 13:29:29 lukem Exp $");
+__RCSID("$NetBSD: headers.c,v 1.29 2010/04/05 14:01:26 joerg Exp $");
#endif /* not lint */
#include
@@ -53,6 +53,7 @@
#include
#include
#include
+#include
#include
#include "debug.h"
@@ -138,10 +139,23 @@
const Elf_Word *hashtab = (const Elf_Word *)
(obj->relocbase + dynp->d_un.d_ptr);
-obj->nbuckets = hashtab[0];
+if (hashtab[0] > UINT32_MAX)
+ obj->nbuckets = UINT32_MAX;
+else
+ obj->nbuckets = hashtab[0];
obj->nchains = hashtab[1];
obj->buckets = hashtab + 2;
obj->chains = obj->buckets + obj->nbuckets;
+/*
+ * Should really be in _rtld_relocate_objects,
+ * but _rtld_symlook_obj might be used before.
+ */
+if (obj->nbuckets) {
+ fast_divide32_prepare(obj->nbuckets,
+ &obj->nbuckets_m,
+ &obj->nbuckets_s1,
+ &obj->nbuckets_s2);
+}
}
break;
Index: src/libexec/ld.elf_so/reloc.c
diff -u src/libexec/ld.elf_so/reloc.c:1.101 src/libexec/ld.elf_so/reloc.c:1.102
--- src/libexec/ld.elf_so/reloc.c:1.101 Sat Jan 16 10:37:51 2010
+++ src/libexec/ld.elf_so/reloc.c Mon Apr 5 14:01:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: reloc.c,v 1.101 2010/01/16 10:37:51 skrll Exp $ */
+/* $NetBSD: reloc.c,v 1.102 2010/04/05 14:01:26 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: reloc.c,v 1.101 2010/01/16 10:37:51 skrll Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.102 2010/04/05 14:01:26 joerg Exp $");
#endif /* not lint */
#include
@@ -52,6 +52,7 @@
#include
#include
#include
+#include
#include
#include "debug.h"
@@ -154,6 +155,10 @@
" symbol table", obj->path);
return -1;
}
+ if (obj->nbuckets == UINT32_MAX) {
+ _rtld_error("%s: Symbol table too large", obj->path);
+ return -1;
+ }
rdbg((" relocating %s (%ld/%ld rel/rela, %ld/%ld plt rel/rela)",
obj->path,
(long)(obj->rellim - obj->rel),
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.90 src/libexec/ld.elf_so/rtld.h:1.91
--- src/libexec/ld.elf_so/rtld.h:1.90 Thu Mar 18 22:17:55 2010
+++ src/libexec/ld.elf_so/rtld.h Mon Apr 5 14:01:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.90 2010/03/18 22:17:55 roy Exp $ */
+/* $NetBSD: rtld.h,v 1.91 2010/04/05 14:01:26 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -162,7 +162,10 @@
#endif
const Elf_Word *buckets; /* Hash table buckets array */
- unsigned long nbuckets; /* Number of buckets */
+ uint32_tnbuckets; /* Number of buckets */
+ uint32_tnbuckets_m; /* Precomputed for fast remainder */
+ uint8_t nbuckets_s1;
+ uint8_t nbuckets_s2;
const Elf_Word *chains; /* Hash table chain array */
unsigned long nchains; /* Number of chains */
Index: src/libexec/ld.elf_so/symbol.c
diff -u src/libexec/ld.elf_so/symbol.c:1.52 src/libexec/ld.elf_so/symbol.c:1.53
--- src/libexec/ld.elf_so/symbol.c:1.52 Thu Mar 18 22:17:55 2010
+++ src/libexec/ld.elf_so/symbol.c Mon Apr 5 14:01:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: symbol.c,v 1.52 2010/03/18 22:17:55 roy Exp $ */
+/* $NetBSD: symbol.c,v 1.53 2010/04/05 14:01:26 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: symbol.c,v 1.52 2010/03/18 22:17:55 roy Exp $");
+__RCSID("$NetBSD: symbol.c,v 1.53 2010/04/05 14:01:26 joerg Exp $");
#endif /* not lint */
#include
@@ -53,6 +53,7 @@
#include
#include
#include
+#include
#include
#include "debug.h"
@@ -229,7 +230,8 @@
{
unsigned long symnum;
- for (symnum = obj->buckets[hash % obj->nbuckets];
+ for (symnum = obj->buckets[fast_remainder32(hash, obj->nbuckets,
+ obj
CVS commit: src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Mon Apr 5 12:56:51 UTC 2010 Modified Files: src/sys/arch/hp700/hp700: locore.S Log Message: Fix register usage in hp700_intr_schedule after previous change (making cpl, ipending, and intr_depth per CPU values). To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/hp700/hp700/locore.S 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/hp700/hp700/locore.S diff -u src/sys/arch/hp700/hp700/locore.S:1.45 src/sys/arch/hp700/hp700/locore.S:1.46 --- src/sys/arch/hp700/hp700/locore.S:1.45 Wed Mar 31 12:56:14 2010 +++ src/sys/arch/hp700/hp700/locore.S Mon Apr 5 12:56:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.45 2010/03/31 12:56:14 skrll Exp $ */ +/* $NetBSD: locore.S,v 1.46 2010/04/05 12:56:51 skrll Exp $ */ /* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */ /* @@ -619,9 +619,9 @@ ldw L_CPU(%t1),%t2 mfctl %eiem, %arg1 mtctl %r0, %eiem ; disable interrupts - ldw CI_IPENDING(%t1), %r1 ; load ipending + ldw CI_IPENDING(%t2), %r1 ; load ipending or %r1, %arg0, %r1 ; or in mask - stw %r1, CI_IPENDING(%t1) ; store ipending + stw %r1, CI_IPENDING(%t2) ; store ipending ldw CI_CPL(%t2), %arg0 ; load cpl andcm,= %r1, %arg0, %r1 ; and ipending with ~cpl b,n spllower_dispatch ; dispatch if we can
CVS commit: src/sys/dev
Module Name:src
Committed By: hannken
Date: Mon Apr 5 09:30:46 UTC 2010
Modified Files:
src/sys/dev: fss.c fssvar.h
Log Message:
Remove unused fss_softc member sc_bs_size.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/fss.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/fssvar.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/dev/fss.c
diff -u src/sys/dev/fss.c:1.65 src/sys/dev/fss.c:1.66
--- src/sys/dev/fss.c:1.65 Sat Oct 17 10:29:29 2009
+++ src/sys/dev/fss.c Mon Apr 5 09:30:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.65 2009/10/17 10:29:29 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.66 2010/04/05 09:30:46 hannken Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.65 2009/10/17 10:29:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.66 2010/04/05 09:30:46 hannken Exp $");
#include
#include
@@ -579,7 +579,6 @@
int error, bits, fsbsize;
struct timespec ts;
struct partinfo dpart;
- struct vattr va;
/* nd -> nd2 to reduce mistakes while updating only some namei calls */
struct nameidata nd2;
struct vnode *vp;
@@ -686,10 +685,6 @@
return EINVAL;
if (sc->sc_bs_vp->v_type == VREG) {
- error = VOP_GETATTR(sc->sc_bs_vp, &va, l->l_cred);
- if (error != 0)
- return error;
- sc->sc_bs_size = va.va_size;
fsbsize = sc->sc_bs_vp->v_mount->mnt_stat.f_iosize;
if (fsbsize & (fsbsize-1)) /* No power of two */
return EINVAL;
Index: src/sys/dev/fssvar.h
diff -u src/sys/dev/fssvar.h:1.23 src/sys/dev/fssvar.h:1.24
--- src/sys/dev/fssvar.h:1.23 Wed Sep 17 14:49:25 2008
+++ src/sys/dev/fssvar.h Mon Apr 5 09:30:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fssvar.h,v 1.23 2008/09/17 14:49:25 hannken Exp $ */
+/* $NetBSD: fssvar.h,v 1.24 2010/04/05 09:30:46 hannken Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -138,7 +138,6 @@
struct timeval sc_time; /* Time this snapshot was taken */
dev_t sc_bdev; /* Underlying block device */
struct vnode *sc_bs_vp; /* Our backing store */
- off_t sc_bs_size; /* Its size in bytes */
int sc_bs_bshift; /* Shift of backing store block */
u_int32_t sc_bs_bmask; /* Mask of backing store block */
struct lwp *sc_bs_lwp; /* Our kernel thread */
CVS commit: src
Module Name:src
Committed By: he
Date: Mon Apr 5 08:03:42 UTC 2010
Modified Files:
src/sys/kern: kern_malloc.c
src/sys/sys: mallocvar.h
src/usr.bin/vmstat: vmstat.c
Log Message:
Follow christos' suggestions, and make ks_active a u_short, and
also only use 16 u_shorts instead of 32 ints. Also add panic()
calls for under- and overflow of the ks_active members under
DIAGNOSTIC. The MAXBUCKET constant ended up in sys/mallocvar.h
and not sys/param.h, as the latter caused build problems.
Ride the kernel revision bump of my previous change.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/kern/kern_malloc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/sys/mallocvar.h
cvs rdiff -u -r1.167 -r1.168 src/usr.bin/vmstat/vmstat.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/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.129 src/sys/kern/kern_malloc.c:1.130
--- src/sys/kern/kern_malloc.c:1.129 Mon Apr 5 07:16:13 2010
+++ src/sys/kern/kern_malloc.c Mon Apr 5 08:03:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.129 2010/04/05 07:16:13 he Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.130 2010/04/05 08:03:42 he Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.129 2010/04/05 07:16:13 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.130 2010/04/05 08:03:42 he Exp $");
#include
#include
@@ -371,7 +371,11 @@
&malloc_lock);
}
ksp->ks_size |= 1 << indx;
- ksp->ks_active[indx]++;
+#ifdef DIAGNOSTIC
+ if (ksp->ks_active[indx - MINBUCKET] == USHRT_MAX)
+ panic("too many allocations in bucket");
+#endif
+ ksp->ks_active[indx - MINBUCKET]++;
#endif
#ifdef DIAGNOSTIC
copysize = 1 << indx < MAX_COPY ? 1 << indx : MAX_COPY;
@@ -605,7 +609,11 @@
#ifdef KMEMSTATS
size = kup->ku_pagecnt << PGSHIFT;
ksp->ks_memuse -= size;
- ksp->ks_active[kup->ku_indx]--;
+#ifdef DIAGNOSTIC
+ if (ksp->ks_active[kup->ku_indx - MINBUCKET] == 0)
+ panic("no active allocation(1), probably double free");
+#endif
+ ksp->ks_active[kup->ku_indx - MINBUCKET]--;
kup->ku_indx = 0;
kup->ku_pagecnt = 0;
if (ksp->ks_memuse + size >= ksp->ks_limit &&
@@ -662,7 +670,11 @@
}
kbp->kb_totalfree++;
ksp->ks_memuse -= size;
- ksp->ks_active[kup->ku_indx]--;
+#ifdef DIAGNOSTIC
+ if (ksp->ks_active[kup->ku_indx - MINBUCKET] == 0)
+ panic("no active allocation(2), probably double free");
+#endif
+ ksp->ks_active[kup->ku_indx - MINBUCKET]--;
if (ksp->ks_memuse + size >= ksp->ks_limit &&
ksp->ks_memuse < ksp->ks_limit)
wakeup((void *)ksp);
Index: src/sys/sys/mallocvar.h
diff -u src/sys/sys/mallocvar.h:1.8 src/sys/sys/mallocvar.h:1.9
--- src/sys/sys/mallocvar.h:1.8 Mon Apr 5 07:16:12 2010
+++ src/sys/sys/mallocvar.h Mon Apr 5 08:03:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mallocvar.h,v 1.8 2010/04/05 07:16:12 he Exp $ */
+/* $NetBSD: mallocvar.h,v 1.9 2010/04/05 08:03:41 he Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,6 +38,7 @@
#define M_MAGIC 877983977
+#define MAXBUCKET 15
/*
* This structure describes a type of malloc'd memory and carries
* allocation statistics for that memory.
@@ -56,7 +57,7 @@
u_long ks_maxused; /* maximum number ever used */
u_long ks_limit; /* most that are allowed to exist */
u_long ks_size; /* sizes of this thing that are allocated */
- u_int ks_active[32]; /* number of active allocations per size */
+ u_short ks_active[MAXBUCKET+1]; /* number of active allocations per size */
};
#ifdef _KERNEL
Index: src/usr.bin/vmstat/vmstat.c
diff -u src/usr.bin/vmstat/vmstat.c:1.167 src/usr.bin/vmstat/vmstat.c:1.168
--- src/usr.bin/vmstat/vmstat.c:1.167 Mon Apr 5 07:16:13 2010
+++ src/usr.bin/vmstat/vmstat.c Mon Apr 5 08:03:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.167 2010/04/05 07:16:13 he Exp $ */
+/* $NetBSD: vmstat.c,v 1.168 2010/04/05 08:03:42 he Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95";
#else
-__RCSID("$NetBSD: vmstat.c,v 1.167 2010/04/05 07:16:13 he Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.168 2010/04/05 08:03:42 he Exp $");
#endif
#endif /* not lint */
@@ -1183,7 +1183,7 @@
else
(void)printf(",%d", j);
first = 0;
- (void)printf(":%u", ks.ks_active[i]);
+ (void)printf(":%u", ks.ks_active[i - MINBUCKET]);
}
(void)printf("\n");
totuse += ks.ks_memuse;
CVS commit: src/lib/libc/sys
Module Name:src
Committed By: wiz
Date: Mon Apr 5 07:53:47 UTC 2010
Modified Files:
src/lib/libc/sys: acct.2 lseek.2 open.2 read.2 unlink.2 write.2
Log Message:
Sort ERRORS section.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/sys/acct.2
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/sys/lseek.2
cvs rdiff -u -r1.40 -r1.41 src/lib/libc/sys/open.2
cvs rdiff -u -r1.32 -r1.33 src/lib/libc/sys/read.2
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/sys/unlink.2
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/sys/write.2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/sys/acct.2
diff -u src/lib/libc/sys/acct.2:1.17 src/lib/libc/sys/acct.2:1.18
--- src/lib/libc/sys/acct.2:1.17 Sat Apr 3 14:40:34 2010
+++ src/lib/libc/sys/acct.2 Mon Apr 5 07:53:47 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: acct.2,v 1.17 2010/04/03 14:40:34 jruoho Exp $
+.\" $NetBSD: acct.2,v 1.18 2010/04/05 07:53:47 wiz Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -86,10 +86,16 @@
.Fn acct
will fail if one of the following is true:
.Bl -tag -width Er
-.It Bq Er EPERM
-The caller is not the super-user.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
+.It Bq Er EACCES
+Search permission is denied for a component of the path prefix,
+or the path name is not a regular file.
+.It Bq Er EFAULT
+.Fa file
+points outside the process's allocated address space.
+.It Bq Er EIO
+An I/O error occurred while reading from or writing to the file system.
+.It Bq Er ELOOP
+Too many symbolic links were encountered in translating the pathname.
.It Bq Er ENAMETOOLONG
A component of a pathname exceeded
.Dv {NAME_MAX}
@@ -98,18 +104,12 @@
characters.
.It Bq Er ENOENT
The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix,
-or the path name is not a regular file.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
+.It Bq Er ENOTDIR
+A component of the path prefix is not a directory.
+.It Bq Er EPERM
+The caller is not the super-user.
.It Bq Er EROFS
The named file resides on a read-only file system.
-.It Bq Er EFAULT
-.Fa file
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
.El
.Pp
Also,
Index: src/lib/libc/sys/lseek.2
diff -u src/lib/libc/sys/lseek.2:1.23 src/lib/libc/sys/lseek.2:1.24
--- src/lib/libc/sys/lseek.2:1.23 Sat Apr 3 15:42:22 2010
+++ src/lib/libc/sys/lseek.2 Mon Apr 5 07:53:47 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: lseek.2,v 1.23 2010/04/03 15:42:22 jruoho Exp $
+.\" $NetBSD: lseek.2,v 1.24 2010/04/05 07:53:47 wiz Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -115,12 +115,12 @@
.It Bq Er EBADF
.Fa fildes
is not an open file descriptor.
-.It Bq Er ESPIPE
-.Fa fildes
-is associated with a pipe, socket, or FIFO.
.It Bq Er EINVAL
.Fa whence
is not a proper value, or the resulting file offset would be invalid.
+.It Bq Er ESPIPE
+.Fa fildes
+is associated with a pipe, socket, or FIFO.
.El
.Sh SEE ALSO
.Xr dup 2 ,
Index: src/lib/libc/sys/open.2
diff -u src/lib/libc/sys/open.2:1.40 src/lib/libc/sys/open.2:1.41
--- src/lib/libc/sys/open.2:1.40 Sat Apr 3 15:48:52 2010
+++ src/lib/libc/sys/open.2 Mon Apr 5 07:53:47 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: open.2,v 1.40 2010/04/03 15:48:52 jruoho Exp $
+.\" $NetBSD: open.2,v 1.41 2010/04/05 07:53:47 wiz Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -228,22 +228,6 @@
.Sh ERRORS
The named file is opened unless:
.Bl -tag -width Er
-.It Bq Er EPERM
-The file's flags (see
-.Xr chflags 2 )
-don't allow the file to be opened.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Dv NAME_MAX
-characters, or an entire path name exceeded
-.Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-.Dv O_CREAT
-is not set and the named file does not exist, or
-a component of the path name that must exist does not exist.
.It Bq Er EACCES
Search permission is denied for a component of the path prefix,
the required permissions (for reading and/or writing)
@@ -253,18 +237,68 @@
the file does not exist,
and the directory in which it is to be created
does not permit writing.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
+.It Bq Er EDQUOT
+.Dv O_CREAT
+is specified,
+the file does not exist,
+and the directory in which the entry for the new file
+is being placed cannot be extended because the
+user's quota of disk blocks on the file system
+containing the directory has been exhausted; or
+.Dv O_CREAT
+is specified,
+the file does not exist,
+an
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Mon Apr 5 07:44:28 UTC 2010 Modified Files: src/lib/libc/sys: getuid.2 setuid.2 Log Message: Fix date. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libc/sys/getuid.2 cvs rdiff -u -r1.21 -r1.22 src/lib/libc/sys/setuid.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/getuid.2 diff -u src/lib/libc/sys/getuid.2:1.16 src/lib/libc/sys/getuid.2:1.17 --- src/lib/libc/sys/getuid.2:1.16 Sat Apr 3 15:13:43 2010 +++ src/lib/libc/sys/getuid.2 Mon Apr 5 07:44:28 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: getuid.2,v 1.16 2010/04/03 15:13:43 jruoho Exp $ +.\" $NetBSD: getuid.2,v 1.17 2010/04/05 07:44:28 wiz Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)getuid.2 8.1 (Berkeley) 6/4/93 .\" -.Dd Arpil 3, 2010 +.Dd April 3, 2010 .Dt GETUID 2 .Os .Sh NAME Index: src/lib/libc/sys/setuid.2 diff -u src/lib/libc/sys/setuid.2:1.21 src/lib/libc/sys/setuid.2:1.22 --- src/lib/libc/sys/setuid.2:1.21 Sat Apr 3 15:13:43 2010 +++ src/lib/libc/sys/setuid.2 Mon Apr 5 07:44:28 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: setuid.2,v 1.21 2010/04/03 15:13:43 jruoho Exp $ +.\" $NetBSD: setuid.2,v 1.22 2010/04/05 07:44:28 wiz Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)setuid.2 8.1 (Berkeley) 6/4/93 .\" -.Dd Arpil 3, 2010 +.Dd April 3, 2010 .Dt SETUID 2 .Os .Sh NAME
CVS commit: src
Module Name:src
Committed By: he
Date: Mon Apr 5 07:16:13 UTC 2010
Modified Files:
src/sys/kern: kern_malloc.c
src/sys/sys: mallocvar.h param.h
src/usr.bin/vmstat: vmstat.c
Log Message:
Extend struct malloc_type to count the number of active allocations
per size, and make vmstat report this information under the "Memory
statistics by type" display, which is only printed when the kernel
has been compiled with KMEMSTATS defined, like this:
Memory statistics by typeType Kern
Type InUse MemUse HighUse Limit Requests Limit Limit Size(s)
wapbl15 4192K 4192K 78644K 376426 0 0
32:0,256:3,512:6,131072:1,262144:2,524288:3
Since struct malloc_type is user-visible and is changed, bump kernel
revision to 5.99.26.
While it is true that malloc(9) is in general on the path of slowly
being replaced by kmem(9) (kmem_alloc/kmem_free), there remains a
lot of points of usage of malloc/free, and this could aid in finding
any leaks. (It helped finding the leak fixed in PR#42661.)
This was discussed with and somewhat hestitantly OKed by rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/kern/kern_malloc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/mallocvar.h
cvs rdiff -u -r1.360 -r1.361 src/sys/sys/param.h
cvs rdiff -u -r1.166 -r1.167 src/usr.bin/vmstat/vmstat.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/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.128 src/sys/kern/kern_malloc.c:1.129
--- src/sys/kern/kern_malloc.c:1.128 Fri Jan 22 08:32:05 2010
+++ src/sys/kern/kern_malloc.c Mon Apr 5 07:16:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.128 2010/01/22 08:32:05 hubertf Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.129 2010/04/05 07:16:13 he Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.128 2010/01/22 08:32:05 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.129 2010/04/05 07:16:13 he Exp $");
#include
#include
@@ -371,6 +371,7 @@
&malloc_lock);
}
ksp->ks_size |= 1 << indx;
+ ksp->ks_active[indx]++;
#endif
#ifdef DIAGNOSTIC
copysize = 1 << indx < MAX_COPY ? 1 << indx : MAX_COPY;
@@ -604,6 +605,7 @@
#ifdef KMEMSTATS
size = kup->ku_pagecnt << PGSHIFT;
ksp->ks_memuse -= size;
+ ksp->ks_active[kup->ku_indx]--;
kup->ku_indx = 0;
kup->ku_pagecnt = 0;
if (ksp->ks_memuse + size >= ksp->ks_limit &&
@@ -660,6 +662,7 @@
}
kbp->kb_totalfree++;
ksp->ks_memuse -= size;
+ ksp->ks_active[kup->ku_indx]--;
if (ksp->ks_memuse + size >= ksp->ks_limit &&
ksp->ks_memuse < ksp->ks_limit)
wakeup((void *)ksp);
Index: src/sys/sys/mallocvar.h
diff -u src/sys/sys/mallocvar.h:1.7 src/sys/sys/mallocvar.h:1.8
--- src/sys/sys/mallocvar.h:1.7 Wed Nov 7 16:12:25 2007
+++ src/sys/sys/mallocvar.h Mon Apr 5 07:16:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mallocvar.h,v 1.7 2007/11/07 16:12:25 matt Exp $ */
+/* $NetBSD: mallocvar.h,v 1.8 2010/04/05 07:16:12 he Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -56,7 +56,7 @@
u_long ks_maxused; /* maximum number ever used */
u_long ks_limit; /* most that are allowed to exist */
u_long ks_size; /* sizes of this thing that are allocated */
- u_long ks_spare;
+ u_int ks_active[32]; /* number of active allocations per size */
};
#ifdef _KERNEL
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.360 src/sys/sys/param.h:1.361
--- src/sys/sys/param.h:1.360 Mon Mar 29 13:41:06 2010
+++ src/sys/sys/param.h Mon Apr 5 07:16:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.360 2010/03/29 13:41:06 pooka Exp $ */
+/* $NetBSD: param.h,v 1.361 2010/04/05 07:16:12 he Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 599002500 /* NetBSD 5.99.25 */
+#define __NetBSD_Version__ 599002600 /* NetBSD 5.99.26 */
#define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
(m) * 100) + (p) * 100) <= __NetBSD_Version__)
Index: src/usr.bin/vmstat/vmstat.c
diff -u src/usr.bin/vmstat/vmstat.c:1.166 src/usr.bin/vmstat/vmstat.c:1.167
--- src/usr.bin/vmstat/vmstat.c:1.166 Wed Oct 21 21:12:07 2009
+++ src/usr.bin/vmstat/vmstat.c Mon Apr 5 07:16:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.166 2009/10/21 21:12:07 rmind Exp $ */
+/* $NetBSD: vmstat.c,v 1.167 2010/04/05 07:16:13 he Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95";
#else
-__RCSID("$NetBSD: vmstat.c,v 1.166 2009/10/21 21:12:07 rmind Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.167 2010/04/05 07:16:13 he Exp $");
#endif
#endif /* not lint */
@@ -1172,7 +1172,10 @@
howmany(ks.ks_limit, KILO), ks.ks_calls,
ks.ks_limblocks, ks.ks_mapblo
