PERFORCE change 132547 for review
John Birrell
jb at FreeBSD.org
Fri Jan 4 20:48:57 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=132547
Change 132547 by jb at jb_freebsd1 on 2008/01/05 04:48:08
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#57 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#36 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/flyer.tex#6 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#28 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/flyer/flyer.tex#2 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#29 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#28 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/wxs.key#1 branch
.. //depot/projects/dtrace/ports/MOVED#60 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#26 integrate
.. //depot/projects/dtrace/src/share/man/man4/edsc.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/ipmi.4#8 integrate
.. //depot/projects/dtrace/src/share/man/man4/mxge.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/pci.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/pcib.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/snd_envy24.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/snd_envy24ht.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/snd_hda.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/snd_spicds.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man5/linsysfs.5#6 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_map.c#14 integrate
.. //depot/projects/dtrace/src/usr.bin/netstat/inet.c#9 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#26 integrate
.. //depot/projects/dtrace/www/en/news/2006/Makefile#1 branch
.. //depot/projects/dtrace/www/en/news/2006/news.xml#1 branch
.. //depot/projects/dtrace/www/en/news/2006/press.xml#1 branch
.. //depot/projects/dtrace/www/en/news/Makefile#5 integrate
.. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#4 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#32 integrate
.. //depot/projects/dtrace/www/share/sgml/press.xml#19 integrate
.. //depot/projects/dtrace/www/share/sgml/templates.oldnewsflash.xsl#4 integrate
.. //depot/projects/dtrace/www/share/sgml/templates.oldpress.xsl#4 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#57 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.750 2007/12/31 21:50:51 lwhsu Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.751 2008/01/04 16:27:49 wxs Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -9811,11 +9811,6 @@
</listitem>
<listitem>
- <para>Wesley Shields
- <email>wxs at csh.rit.edu</email></para>
- </listitem>
-
- <listitem>
<para>Wietse Venema
<email>wietse at wzv.win.tue.nl</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#36 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.214 2007/12/28 06:23:18 weongyo Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.215 2008/01/04 16:27:49 wxs Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -1154,6 +1154,10 @@
</listitem>
<listitem>
+ <para>&a.wxs;</para>
+ </listitem>
+
+ <listitem>
<para>&a.nork;</para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/flyer.tex#6 (text+ko) ====
@@ -1,4 +1,4 @@
-% Copyright (c) 2004-2007 Marc Fonvieille
+% Copyright (c) 2004-2008 Marc Fonvieille
% All rights reserved.
%
% Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
% OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
% SUCH DAMAGE.
%
-% $FreeBSD: doc/en_US.ISO8859-1/flyer/flyer.tex,v 1.15 2007/12/16 13:58:35 gabor Exp $
+% $FreeBSD: doc/en_US.ISO8859-1/flyer/flyer.tex,v 1.16 2008/01/04 13:41:07 gabor Exp $
%
% FreeBSD Flyer
% Use make FORMAT (with FORMAT: pdf, ps or dvi) to build the flyer.
@@ -199,7 +199,7 @@
%
% Copyrights
\begin{center}
-\tiny \copyright 2004-2007 The FreeBSD Project\\
+\tiny \copyright 2004-2008 The FreeBSD Project\\
\ifthenelse{\equal{\logo}{true}}{
FreeBSD and the FreeBSD Logo are registered trademarks of the FreeBSD
Foundation.\\}
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#28 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.435 2007/12/28 06:11:21 weongyo Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.436 2008/01/04 16:25:00 wxs Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -1058,6 +1058,8 @@
<!ENTITY a.wes "Wes Peters <email>wes at FreeBSD.org</email>">
+<!ENTITY a.wxs "Wesley Shields <email>wxs at FreeBSD.org</email>">
+
<!ENTITY a.whiteside "Don Whiteside <email>whiteside at acm.org</email>">
<!ENTITY a.wilko "Wilko Bulte <email>wilko at FreeBSD.org</email>">
==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/flyer/flyer.tex#2 (text+ko) ====
@@ -1,4 +1,4 @@
-% Copyright (c) 2004-2007 Marc Fonvieille
+% Copyright (c) 2004-2008 Marc Fonvieille
% All rights reserved.
%
% Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
% OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
% SUCH DAMAGE.
%
-% $FreeBSD: doc/hu_HU.ISO8859-2/flyer/flyer.tex,v 1.1 2007/12/16 14:03:45 gabor Exp $
+% $FreeBSD: doc/hu_HU.ISO8859-2/flyer/flyer.tex,v 1.2 2008/01/04 13:41:37 gabor Exp $
%
% FreeBSD Flyer
% Use make FORMAT (with FORMAT: pdf, ps or dvi) to build the flyer.
@@ -31,7 +31,7 @@
% the \logo variable. By default the Beastie layout is enabled.
%
% The FreeBSD Hungarian Documentation Project
-% Original Revision: r1.15
+% Original Revision: r1.16
% Translated by: Gabor Kovesdan <gabor at FreeBSD.org>
\documentclass[11pt]{article}
\usepackage[T1]{fontenc}
@@ -198,7 +198,7 @@
%
% Copyrights
\begin{center}
-\tiny \copyright 2004-2007 A FreeBSD Projekt\\
+\tiny \copyright 2004-2008 A FreeBSD Projekt\\
\ifthenelse{\equal{\logo}{true}}{
A FreeBSD és a FreeBSD Logo a FreeBSD Alapítvány bejegyzett védjegyei.\\}
{A FreeBSD a FreeBSD Alapítvány bejegyzett védjegye.\\}
==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#29 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.59 2008/01/01 10:33:27 weongyo Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.60 2008/01/04 21:00:54 wxs Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -944,6 +944,11 @@
&pgpkey.gshapiro;
</sect2>
+ <sect2 id="pgpkey-wxs">
+ <title>&a.wxs;</title>
+ &pgpkey.wxs;
+ </sect2>
+
<sect2 id="pgpkey-arun">
<title>&a.arun;</title>
&pgpkey.arun;
==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#28 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.155 2008/01/01 10:33:27 weongyo Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.156 2008/01/04 21:00:54 wxs Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -272,6 +272,7 @@
<!ENTITY pgpkey.wkoszek SYSTEM "wkoszek.key">
<!ENTITY pgpkey.wollman SYSTEM "wollman.key">
<!ENTITY pgpkey.wosch SYSTEM "wosch.key">
+<!ENTITY pgpkey.wxs SYSTEM "wxs.key">
<!ENTITY pgpkey.xride SYSTEM "xride.key">
<!ENTITY pgpkey.yoichi SYSTEM "yoichi.key">
<!ENTITY section.pgpkeys-core SYSTEM "pgpkeys-core.sgml">
==== //depot/projects/dtrace/ports/MOVED#60 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1526 2008/01/01 22:41:52 marcus Exp $
+# $FreeBSD: ports/MOVED,v 1.1527 2008/01/04 18:34:11 alepulver Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -1530,7 +1530,6 @@
net/openldap21-sasl-client|net/openldap22-sasl-client|2005-07-17|removed EOL version of OpenLDAP
net/openldap21-sasl-server|net/openldap22-sasl-server|2005-07-17|removed EOL version of OpenLDAP
net/openldap21-server|net/openldap22-server|2005-07-17|removed EOL version of OpenLDAP
-devel/aegis||2005-07-18|install problems; upstream authors did not respond
devel/linux-understand_ada||2005-07-18|unfetchable; new version requires support contract
devel/linux-understand_c||2005-07-18|unfetchable; new version requires support contract
devel/linux-understand_java||2005-07-18|unfetchable; new version requires support contract
==== //depot/projects/dtrace/src/share/man/man4/Makefile#26 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.401 2007/12/26 11:35:06 rwatson Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.402 2008/01/04 08:26:22 imp Exp $
MAN= aac.4 \
acpi.4 \
@@ -259,6 +259,7 @@
pccard.4 \
pccbb.4 \
pci.4 \
+ pcib.4 \
pcic.4 \
pcm.4 \
pcn.4 \
==== //depot/projects/dtrace/src/share/man/man4/edsc.4#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)lo.4 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man4/edsc.4,v 1.1 2007/03/26 04:39:18 yar Exp $
+.\" $FreeBSD: src/share/man/man4/edsc.4,v 1.2 2008/01/04 12:55:02 gabor Exp $
.\"
.Dd March 25, 2007
.Dt EDSC 4
@@ -88,7 +88,7 @@
device was derived from the
.Xr disc 4
device and first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
This manpage was adapted from
.Xr disc 4 .
.Sh CAVEATS
==== //depot/projects/dtrace/src/share/man/man4/ipmi.4#8 (text) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.8 2007/07/16 17:03:48 ambrisko Exp $
+.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.9 2008/01/04 12:55:23 gabor Exp $
.\"
.Dd July 10, 2007
.Dt IPMI 4
@@ -186,7 +186,7 @@
The
.Nm
driver first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/dtrace/src/share/man/man4/mxge.4#5 (text+ko) ====
@@ -29,7 +29,7 @@
.\"
.\" * Other names and brands may be claimed as the property of others.
.\"
-.\" $FreeBSD: src/share/man/man4/mxge.4,v 1.7 2007/01/30 08:17:45 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/mxge.4,v 1.8 2008/01/04 12:55:54 gabor Exp $
.\"
.Dd September 15, 2006
.Dt MXGE 4
@@ -142,7 +142,7 @@
The
.Nm
device driver first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
.Sh AUTHORS
The
.Nm
==== //depot/projects/dtrace/src/share/man/man4/pci.4#6 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/pci.4,v 1.19 2007/09/30 11:05:12 marius Exp $
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.20 2008/01/04 08:19:52 imp Exp $
.\"
-.Dd September 30, 2007
+.Dd January 3, 2008
.Dt PCI 4
.Os
.Sh NAME
@@ -54,13 +54,21 @@
device.
If used improperly, this driver can allow userland applications to
crash a machine or cause data loss.
+.Pp
+The
+.Nm
+driver implements the pci bus in the kernel.
+It enumerates and devices on the pci bus and gives pci client drivers the
+chance to attach to them.
+It assigns resources to children, when the BIOS doesn't.
+It takes care of routing interrupts when necessary.
+It reprobes the unattached pci children when pci client drivers are dynamically
+loaded at runtime.
.Sh KERNEL CONFIGURATION
-It is only necessary to specify one
+The
.Nm
-controller in the kernel.
-Additional
-.Tn PCI
-busses are handled automatically as they are encountered.
+device is included in the kernel as described in the SYNOPSIS section.
+The pci driver cannot be built as a kld.
.Sh IOCTLS
The following
.Xr ioctl 2
==== //depot/projects/dtrace/src/share/man/man4/snd_envy24.4#4 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/snd_envy24.4,v 1.3 2006/09/30 17:19:22 netchild Exp $
+.\" $FreeBSD: src/share/man/man4/snd_envy24.4,v 1.4 2008/01/04 12:56:24 gabor Exp $
.\"
.Dd September 30, 2006
.Dt SND_ENVY24 4
@@ -71,7 +71,7 @@
The
.Nm
device driver first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/dtrace/src/share/man/man4/snd_envy24ht.4#4 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/snd_envy24ht.4,v 1.2 2007/05/28 15:57:22 joel Exp $
+.\" $FreeBSD: src/share/man/man4/snd_envy24ht.4,v 1.3 2008/01/04 12:56:45 gabor Exp $
.\"
.Dd May 28, 2007
.Dt SND_ENVY24HT 4
@@ -91,7 +91,7 @@
The
.Nm
device driver first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/dtrace/src/share/man/man4/snd_hda.4#7 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.12 2007/07/14 12:35:29 joel Exp $
+.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.13 2008/01/04 12:57:06 gabor Exp $
.\"
.Dd July 14, 2007
.Dt SND_HDA 4
@@ -234,7 +234,7 @@
The
.Nm
device driver first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/dtrace/src/share/man/man4/snd_spicds.4#5 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/snd_spicds.4,v 1.3 2007/05/28 16:00:08 joel Exp $
+.\" $FreeBSD: src/share/man/man4/snd_spicds.4,v 1.4 2008/01/04 12:57:34 gabor Exp $
.\"
.Dd May 28, 2007
.Dt SND_SPICDS 4
@@ -75,7 +75,7 @@
The
.Nm
device driver first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/dtrace/src/share/man/man5/linsysfs.5#6 (text) ====
@@ -1,7 +1,7 @@
.\" Written by Garrett Wollman
.\" This file is in the public domain.
.\"
-.\" $FreeBSD: src/share/man/man5/linsysfs.5,v 1.6 2007/02/05 22:45:58 ambrisko Exp $
+.\" $FreeBSD: src/share/man/man5/linsysfs.5,v 1.7 2008/01/04 12:58:09 gabor Exp $
.\"
.Dd February 5, 2007
.Dt LINSYSFS 5
@@ -82,7 +82,7 @@
The
.Nm
driver first appeared in
-.Fx 7.0 .
+.Fx 6.2 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/dtrace/src/sys/vm/vm_map.c#14 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.391 2007/11/07 21:56:58 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.392 2008/01/04 04:33:13 kib Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2712,7 +2712,9 @@
cow &= ~orient;
KASSERT(orient != 0, ("No stack grow direction"));
- if (addrbos < vm_map_min(map) || addrbos > map->max_offset)
+ if (addrbos < vm_map_min(map) ||
+ addrbos > vm_map_max(map) ||
+ addrbos + max_ssize < addrbos)
return (KERN_NO_SPACE);
init_ssize = (max_ssize < sgrowsiz) ? max_ssize : sgrowsiz;
==== //depot/projects/dtrace/src/usr.bin/netstat/inet.c#9 (text+ko) ====
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/netstat/inet.c,v 1.80 2008/01/02 23:26:11 obrien Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/inet.c,v 1.82 2008/01/04 03:09:28 obrien Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -366,8 +366,7 @@
#endif /* INET6 */
|| (af1 == AF_UNSPEC && ((inp->inp_vflag & INP_IPV4) == 0
#ifdef INET6
- && (inp->inp_vflag &
- INP_IPV6) == 0
+ && (inp->inp_vflag & INP_IPV6) == 0
#endif /* INET6 */
))
)
@@ -405,14 +404,14 @@
printf("%-8.8s ", "Tcpcb");
if (Lflag)
printf("%-5.5s %-14.14s %-22.22s\n",
- "Proto", "Listen", "Local Address");
+ "Proto", "Listen", "Local Address");
else
printf((Aflag && !Wflag) ?
"%-5.5s %-6.6s %-6.6s %-18.18s %-18.18s %s\n" :
"%-5.5s %-6.6s %-6.6s %-22.22s %-22.22s %s\n",
- "Proto", "Recv-Q", "Send-Q",
- "Local Address", "Foreign Address",
- "(state)");
+ "Proto", "Recv-Q", "Send-Q",
+ "Local Address", "Foreign Address",
+ "(state)");
first = 0;
}
if (Lflag && so->so_qlimit == 0)
@@ -425,77 +424,73 @@
}
#ifdef INET6
if ((inp->inp_vflag & INP_IPV6) != 0)
- vchar = ((inp->inp_vflag & INP_IPV4) != 0)
- ? "46" : "6 ";
+ vchar = ((inp->inp_vflag & INP_IPV4) != 0) ?
+ "46" : "6 ";
else
#endif
- vchar = ((inp->inp_vflag & INP_IPV4) != 0)
- ? "4 " : " ";
+ vchar = ((inp->inp_vflag & INP_IPV4) != 0) ?
+ "4 " : " ";
printf("%-3.3s%-2.2s ", name, vchar);
if (Lflag) {
char buf1[15];
snprintf(buf1, 15, "%d/%d/%d", so->so_qlen,
- so->so_incqlen, so->so_qlimit);
+ so->so_incqlen, so->so_qlimit);
printf("%-14.14s ", buf1);
} else {
- printf("%6u %6u ",
- so->so_rcv.sb_cc,
- so->so_snd.sb_cc);
+ printf("%6u %6u ", so->so_rcv.sb_cc, so->so_snd.sb_cc);
}
if (numeric_port) {
if (inp->inp_vflag & INP_IPV4) {
inetprint(&inp->inp_laddr, (int)inp->inp_lport,
- name, 1);
+ name, 1);
if (!Lflag)
inetprint(&inp->inp_faddr,
- (int)inp->inp_fport, name, 1);
+ (int)inp->inp_fport, name, 1);
}
#ifdef INET6
else if (inp->inp_vflag & INP_IPV6) {
inet6print(&inp->in6p_laddr,
- (int)inp->inp_lport, name, 1);
+ (int)inp->inp_lport, name, 1);
if (!Lflag)
inet6print(&inp->in6p_faddr,
- (int)inp->inp_fport, name, 1);
+ (int)inp->inp_fport, name, 1);
} /* else nothing printed now */
#endif /* INET6 */
} else if (inp->inp_flags & INP_ANONPORT) {
if (inp->inp_vflag & INP_IPV4) {
inetprint(&inp->inp_laddr, (int)inp->inp_lport,
- name, 1);
+ name, 1);
if (!Lflag)
inetprint(&inp->inp_faddr,
- (int)inp->inp_fport, name, 0);
+ (int)inp->inp_fport, name, 0);
}
#ifdef INET6
else if (inp->inp_vflag & INP_IPV6) {
inet6print(&inp->in6p_laddr,
- (int)inp->inp_lport, name, 1);
+ (int)inp->inp_lport, name, 1);
if (!Lflag)
inet6print(&inp->in6p_faddr,
- (int)inp->inp_fport, name, 0);
+ (int)inp->inp_fport, name, 0);
} /* else nothing printed now */
#endif /* INET6 */
} else {
if (inp->inp_vflag & INP_IPV4) {
inetprint(&inp->inp_laddr, (int)inp->inp_lport,
- name, 0);
+ name, 0);
if (!Lflag)
inetprint(&inp->inp_faddr,
- (int)inp->inp_fport, name,
- inp->inp_lport !=
- inp->inp_fport);
+ (int)inp->inp_fport, name,
+ inp->inp_lport != inp->inp_fport);
}
#ifdef INET6
else if (inp->inp_vflag & INP_IPV6) {
inet6print(&inp->in6p_laddr,
- (int)inp->inp_lport, name, 0);
+ (int)inp->inp_lport, name, 0);
if (!Lflag)
inet6print(&inp->in6p_faddr,
- (int)inp->inp_fport, name,
- inp->inp_lport !=
- inp->inp_fport);
+ (int)inp->inp_fport, name,
+ inp->inp_lport != inp->inp_fport);
} /* else nothing printed now */
#endif /* INET6 */
}
@@ -505,24 +500,25 @@
else {
printf("%s", tcpstates[tp->t_state]);
#if defined(TF_NEEDSYN) && defined(TF_NEEDFIN)
- /* Show T/TCP `hidden state' */
- if (tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN))
- putchar('*');
+ /* Show T/TCP `hidden state' */
+ if (tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN))
+ putchar('*');
#endif /* defined(TF_NEEDSYN) && defined(TF_NEEDFIN) */
- }
+ }
}
putchar('\n');
}
if (xig != oxig && xig->xig_gen != oxig->xig_gen) {
if (oxig->xig_count > xig->xig_count) {
printf("Some %s sockets may have been deleted.\n",
- name);
+ name);
} else if (oxig->xig_count < xig->xig_count) {
printf("Some %s sockets may have been created.\n",
- name);
+ name);
} else {
- printf("Some %s sockets may have been created or deleted.\n",
- name);
+ printf(
+ "Some %s sockets may have been created or deleted.\n",
+ name);
}
}
free(buf);
@@ -569,34 +565,34 @@
printf(m, tcpstat.f, pluralies(tcpstat.f))
p(tcps_sndtotal, "\t%lu packet%s sent\n");
- p2(tcps_sndpack,tcps_sndbyte,
- "\t\t%lu data packet%s (%lu byte%s)\n");
+ p2(tcps_sndpack,tcps_sndbyte, "\t\t%lu data packet%s (%lu byte%s)\n");
p2(tcps_sndrexmitpack, tcps_sndrexmitbyte,
- "\t\t%lu data packet%s (%lu byte%s) retransmitted\n");
+ "\t\t%lu data packet%s (%lu byte%s) retransmitted\n");
p(tcps_sndrexmitbad,
- "\t\t%lu data packet%s unnecessarily retransmitted\n");
+ "\t\t%lu data packet%s unnecessarily retransmitted\n");
p(tcps_mturesent, "\t\t%lu resend%s initiated by MTU discovery\n");
p2a(tcps_sndacks, tcps_delack,
- "\t\t%lu ack-only packet%s (%lu delayed)\n");
+ "\t\t%lu ack-only packet%s (%lu delayed)\n");
p(tcps_sndurg, "\t\t%lu URG only packet%s\n");
p(tcps_sndprobe, "\t\t%lu window probe packet%s\n");
p(tcps_sndwinup, "\t\t%lu window update packet%s\n");
p(tcps_sndctrl, "\t\t%lu control packet%s\n");
p(tcps_rcvtotal, "\t%lu packet%s received\n");
- p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%lu ack%s (for %lu byte%s)\n");
+ p2(tcps_rcvackpack, tcps_rcvackbyte,
+ "\t\t%lu ack%s (for %lu byte%s)\n");
p(tcps_rcvdupack, "\t\t%lu duplicate ack%s\n");
p(tcps_rcvacktoomuch, "\t\t%lu ack%s for unsent data\n");
p2(tcps_rcvpack, tcps_rcvbyte,
- "\t\t%lu packet%s (%lu byte%s) received in-sequence\n");
+ "\t\t%lu packet%s (%lu byte%s) received in-sequence\n");
p2(tcps_rcvduppack, tcps_rcvdupbyte,
- "\t\t%lu completely duplicate packet%s (%lu byte%s)\n");
+ "\t\t%lu completely duplicate packet%s (%lu byte%s)\n");
p(tcps_pawsdrop, "\t\t%lu old duplicate packet%s\n");
p2(tcps_rcvpartduppack, tcps_rcvpartdupbyte,
- "\t\t%lu packet%s with some dup. data (%lu byte%s duped)\n");
+ "\t\t%lu packet%s with some dup. data (%lu byte%s duped)\n");
p2(tcps_rcvoopack, tcps_rcvoobyte,
- "\t\t%lu out-of-order packet%s (%lu byte%s)\n");
+ "\t\t%lu out-of-order packet%s (%lu byte%s)\n");
p2(tcps_rcvpackafterwin, tcps_rcvbyteafterwin,
- "\t\t%lu packet%s (%lu byte%s) of data after window\n");
+ "\t\t%lu packet%s (%lu byte%s) of data after window\n");
p(tcps_rcvwinprobe, "\t\t%lu window probe%s\n");
p(tcps_rcvwinupd, "\t\t%lu window update packet%s\n");
p(tcps_rcvafterclose, "\t\t%lu packet%s received after close\n");
@@ -611,20 +607,21 @@
p(tcps_badrst, "\t%lu ignored RSTs in the window%s\n");
p(tcps_connects, "\t%lu connection%s established (including accepts)\n");
p2(tcps_closed, tcps_drops,
- "\t%lu connection%s closed (including %lu drop%s)\n");
+ "\t%lu connection%s closed (including %lu drop%s)\n");
p(tcps_cachedrtt, "\t\t%lu connection%s updated cached RTT on close\n");
p(tcps_cachedrttvar,
- "\t\t%lu connection%s updated cached RTT variance on close\n");
+ "\t\t%lu connection%s updated cached RTT variance on close\n");
p(tcps_cachedssthresh,
- "\t\t%lu connection%s updated cached ssthresh on close\n");
+ "\t\t%lu connection%s updated cached ssthresh on close\n");
p(tcps_conndrops, "\t%lu embryonic connection%s dropped\n");
p2(tcps_rttupdated, tcps_segstimed,
- "\t%lu segment%s updated rtt (of %lu attempt%s)\n");
+ "\t%lu segment%s updated rtt (of %lu attempt%s)\n");
p(tcps_rexmttimeo, "\t%lu retransmit timeout%s\n");
p(tcps_timeoutdrop, "\t\t%lu connection%s dropped by rexmit timeout\n");
p(tcps_persisttimeo, "\t%lu persist timeout%s\n");
p(tcps_persistdrop, "\t\t%lu connection%s dropped by persist timeout\n");
- p(tcps_finwait2_drops, "\t%lu Connection%s (fin_wait_2) dropped because of timeout\n");
+ p(tcps_finwait2_drops,
+ "\t%lu Connection%s (fin_wait_2) dropped because of timeout\n");
p(tcps_keeptimeo, "\t%lu keepalive timeout%s\n");
p(tcps_keepprobe, "\t\t%lu keepalive probe%s sent\n");
p(tcps_keepdrops, "\t\t%lu connection%s dropped by keepalive\n");
@@ -649,11 +646,11 @@
p(tcps_sack_recovery_episode, "\t%lu SACK recovery episode%s\n");
p(tcps_sack_rexmits,
- "\t%lu segment rexmit%s in SACK recovery episodes\n");
+ "\t%lu segment rexmit%s in SACK recovery episodes\n");
p(tcps_sack_rexmit_bytes,
- "\t%lu byte rexmit%s in SACK recovery episodes\n");
+ "\t%lu byte rexmit%s in SACK recovery episodes\n");
p(tcps_sack_rcv_blocks,
- "\t%lu SACK option%s (SACK blocks) received\n");
+ "\t%lu SACK option%s (SACK blocks) received\n");
p(tcps_sack_send_blocks, "\t%lu SACK option%s (SACK blocks) sent\n");
p1a(tcps_sack_sboverflow, "\t%lu SACK scoreboard overflow\n");
@@ -823,12 +820,12 @@
putchar('\n');
p(ips_cantforward, "\t%lu packet%s not forwardable\n");
p(ips_notmember,
- "\t%lu packet%s received for unknown multicast group\n");
+ "\t%lu packet%s received for unknown multicast group\n");
p(ips_redirectsent, "\t%lu redirect%s sent\n");
p(ips_localout, "\t%lu packet%s sent from this host\n");
p(ips_rawout, "\t%lu packet%s sent with fabricated ip header\n");
p(ips_odropped,
- "\t%lu output packet%s dropped due to no bufs, etc.\n");
+ "\t%lu output packet%s dropped due to no bufs, etc.\n");
p(ips_noroute, "\t%lu output packet%s discarded due to no route\n");
p(ips_fragmented, "\t%lu output datagram%s fragmented\n");
p(ips_ofragments, "\t%lu fragment%s created\n");
@@ -931,8 +928,8 @@
icmpstat.icps_outhist[i]);
}
p(icps_badcode, "\t%lu message%s with bad code fields\n");
- p(icps_tooshort, "\t%lu message%s < minimum length\n");
- p(icps_checksum, "\t%lu bad checksum%s\n");
+ p(icps_tooshort, "\t%lu message%s less than the minimum length\n");
+ p(icps_checksum, "\t%lu message%s with bad checksum\n");
p(icps_badlen, "\t%lu message%s with bad length\n");
p1a(icps_bmcastecho, "\t%lu multicast echo requests ignored\n");
p1a(icps_bmcasttstamp, "\t%lu multicast timestamp requests ignored\n");
@@ -944,10 +941,10 @@
}
if (icmpnames[i] != NULL)
printf("\t\t%s: %lu\n", icmpnames[i],
- icmpstat.icps_inhist[i]);
+ icmpstat.icps_inhist[i]);
else
printf("\t\tunknown ICMP #%d: %lu\n", i,
- icmpstat.icps_inhist[i]);
+ icmpstat.icps_inhist[i]);
}
p(icps_reflect, "\t%lu message response%s generated\n");
p2(icps_badaddr, "\t%lu invalid return address%s\n");
@@ -992,13 +989,16 @@
#define py(f, m) if (igmpstat.f || sflag <= 1) \
printf(m, igmpstat.f, igmpstat.f != 1 ? "ies" : "y")
p(igps_rcv_total, "\t%u message%s received\n");
- p(igps_rcv_tooshort, "\t%u message%s received with too few bytes\n");
- p(igps_rcv_badsum, "\t%u message%s received with bad checksum\n");
- py(igps_rcv_queries, "\t%u membership quer%s received\n");
- py(igps_rcv_badqueries, "\t%u membership quer%s received with invalid field(s)\n");
- p(igps_rcv_reports, "\t%u membership report%s received\n");
- p(igps_rcv_badreports, "\t%u membership report%s received with invalid field(s)\n");
- p(igps_rcv_ourreports, "\t%u membership report%s received for groups to which we belong\n");
+ p(igps_rcv_tooshort, "\t%u message%s received with too few bytes\n");
+ p(igps_rcv_badsum, "\t%u message%s received with bad checksum\n");
+ py(igps_rcv_queries, "\t%u membership quer%s received\n");
+ py(igps_rcv_badqueries,
+ "\t%u membership quer%s received with invalid field(s)\n");
+ p(igps_rcv_reports, "\t%u membership report%s received\n");
+ p(igps_rcv_badreports,
+ "\t%u membership report%s received with invalid field(s)\n");
+ p(igps_rcv_ourreports,
+"\t%u membership report%s received for groups to which we belong\n");
p(igps_snd_reports, "\t%u membership report%s sent\n");
#undef p
#undef py
@@ -1042,7 +1042,8 @@
p(pims_rcv_badversion, "\t%ju message%s received with bad version\n");
p(pims_rcv_registers_msgs, "\t%ju data register message%s received\n");
p(pims_rcv_registers_bytes, "\t%ju data register byte%s received\n");
- p(pims_rcv_registers_wrongiif, "\t%ju data register message%s received on wrong iif\n");
+ p(pims_rcv_registers_wrongiif,
+ "\t%ju data register message%s received on wrong iif\n");
p(pims_rcv_badregisters, "\t%ju bad register%s received\n");
p(pims_snd_registers_msgs, "\t%ju data register message%s sent\n");
p(pims_snd_registers_bytes, "\t%ju data register byte%s sent\n");
==== //depot/projects/dtrace/www/en/developers.sgml#26 (text+ko) ====
@@ -6,7 +6,7 @@
us to update author names, or the representation of those names (such
as adding email addresses), by just editing a single file.
-$FreeBSD: www/en/developers.sgml,v 1.180 2007/12/28 06:16:05 weongyo Exp $
+$FreeBSD: www/en/developers.sgml,v 1.181 2008/01/04 16:22:54 wxs Exp $
-->
@@ -531,6 +531,7 @@
<!ENTITY a.vsevolod "Vsevolod Stakhov">
<!ENTITY a.weongyo "Weongyo Jeong">
<!ENTITY a.wes "Wes Peters">
+<!ENTITY a.wxs "Wesley Shields">
<!ENTITY a.whiteside "Don Whiteside">
<!ENTITY a.wilko "Wilko Bulte">
<!ENTITY a.will "Will Andrews">
==== //depot/projects/dtrace/www/en/news/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/Makefile,v 1.47 2007/03/15 16:21:15 murray Exp $
+# $FreeBSD: www/en/news/Makefile,v 1.48 2008/01/04 21:16:27 jkois Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -43,6 +43,7 @@
SUBDIR+= 2003
SUBDIR+= 2004
SUBDIR+= 2005
+SUBDIR+= 2006
SUBDIR+= status
.include "${WEB_PREFIX}/share/mk/web.site.mk"
==== //depot/projects/dtrace/www/share/sgml/libcommon.xsl#4 (text+ko) ====
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
-<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.7 2007/03/15 16:21:15 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.9 2008/01/04 22:28:53 jkois Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0"
@@ -277,6 +277,7 @@
<!-- template: "html-news-make-olditems-list" -->
<xsl:template name="html-news-make-olditems-list">
<p>Old announcements:
+ <a href="2006/index.html">2006</a>,
<a href="2005/index.html">2005</a>,
<a href="2004/index.html">2004</a>,
<a href="2003/index.html">2003</a>,
@@ -320,7 +321,7 @@
<!-- template: "html-news-list-newsflash-homelink" -->
<xsl:template name="html-news-list-newsflash-homelink">
- <a href="news.html">News Home</a>
+ <a href="&base;/news/news.html">News Home</a>
</xsl:template>
<!-- template: "html-news-list-press-preface" -->
==== //depot/projects/dtrace/www/share/sgml/news.xml#32 (text+ko) ====
@@ -20,11 +20,27 @@
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/news.xml,v 1.133 2007/12/31 14:32:15 danger Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.135 2008/01/04 21:16:27 jkois Exp $
</cvs:keyword>
</cvs:keywords>
<year>
+ <name>2008</name>
+
+ <month>
+ <name>1</name>
+
+ <day>
+ <name>4</name>
+ <event>
+ <p>New committer: <a href="mailto:wxs at FreeBSD.org">Wesley Shields</a>
+ (ports)</p>
+ </event>
+ </day>
+ </month>
+ </year>
+
+ <year>
<name>2007</name>
<month>
@@ -833,982 +849,4 @@
</month>
</year>
- <year>
- <name>2006</name>
- <month>
- <name>12</name>
-
- <day>
- <name>27</name>
- <event>
- <p>New committer: <a href="mailto:jls at FreeBSD.org">Jordan Sissel</a>
- (src)</p>
- </event>
-
- <event>
- <title>FreeBSD 6.2-RC2 Available</title>
-
- <p>The second release candidate of FreeBSD 6.2 has been <a
- href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-December/031742.html">announced</a>.
- ISO images and distributions for Tier-1 architectures are now available on most of the
- <a href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">
- FreeBSD mirror sites</a>.</p>
- </event>
- </day>
-
- <day>
- <name>26</name>
- <event>
- <p>New committer: <a href="mailto:dryice at FreeBSD.org">Dryice Liu</a>
- (ports)</p>
- </event>
- </day>
-
- <day>
- <name>22</name>
- <event>
- <p>New committer: <a href="mailto:nox at FreeBSD.org">Juergen Lock</a>
- (ports)</p>
- </event>
- </day>
-
- <day>
- <name>10</name>
- <event>
- <title>Podcast Interview with FreeBSD Developer Joseph Koshy</title>
-
- <p>In his latest <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
- podcast, Will Backman interviews FreeBSD Developer Joseph Koshy
- about his recent work on libElf. The podcast is
- available at
- <a
- href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk087.mp3">
- http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk087.mp3</a>.</p>
- </event>
- </day>
-
- <day>
- <name>7</name>
- <event>
- <title>Podcast Interview with FreeBSD Developer Kip Macy</title>
-
- <p>In his latest <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
- podcast, Will Backman interviews FreeBSD Developer Kip Macy
- about the FreeBSD/sun4v port. The podcast is
- available at
- <a
- href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk086.mp3">
- http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk086.mp3</a>.</p>
- </event>
- </day>
-
- <day>
- <name>5</name>
- <event>
- <p>New committer: <a href="mailto:nivit at FreeBSD.org">Nicola Vitale</a>
- (ports)</p>
- </event>
-
- <event>
- <title>New committer: <a href="mailto:gabor at FreeBSD.org">Gábor Kövesdán</a>
- (ports). An SoC2006 alumnus.</title>
-
- <p><a href="mailto:gabor at FreeBSD.org">Gábor Kövesdán</a>, a
- successful student from last year's Summer of Code
- program, has continued working with the FreeBSD Project
- and is now a full ports/ committer.</p>
-
- </event>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list