PERFORCE change 88145 for review
Peter Wemm
peter at FreeBSD.org
Tue Dec 13 13:04:24 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=88145
Change 88145 by peter at peter_daintree on 2005/12/13 21:03:28
IFC @88141
Affected files ...
.. //depot/projects/hammer/bin/setfacl/setfacl.1#8 integrate
.. //depot/projects/hammer/lib/libarchive/tar.5#11 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#19 integrate
.. //depot/projects/hammer/lib/libc/sys/aio_read.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/aio_write.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/lio_listio.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/mq_notify.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/sigaction.2#13 integrate
.. //depot/projects/hammer/lib/libc/sys/sigqueue.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/sigwaitinfo.2#3 integrate
.. //depot/projects/hammer/lib/libc/sys/timer_create.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/timer_settime.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/wait.2#8 integrate
.. //depot/projects/hammer/lib/msun/src/s_cbrt.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_cbrtf.c#3 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#50 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#47 integrate
.. //depot/projects/hammer/share/man/man3/Makefile#12 integrate
.. //depot/projects/hammer/share/man/man3/siginfo.3#1 branch
.. //depot/projects/hammer/share/man/man9/bus_dma.9#22 integrate
.. //depot/projects/hammer/share/man/man9/namei.9#8 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#62 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#26 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#59 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#22 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#30 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#26 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#69 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#33 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#46 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#21 integrate
.. //depot/projects/hammer/usr.sbin/lmcconfig/lmcconfig.8#3 integrate
Differences ...
==== //depot/projects/hammer/bin/setfacl/setfacl.1#8 (text+ko) ====
@@ -23,7 +23,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.13 2005/02/09 17:37:39 ru Exp $
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.14 2005/12/13 17:07:52 ru Exp $
.\"
.Dd January 7, 2001
.Dt SETFACL 1
@@ -252,7 +252,7 @@
.Pp
Remove the group mail ACL entry containing read/write permissions
from
-.Pa file.
+.Pa file .
.Pp
.Dl setfacl -bn file
.Pp
==== //depot/projects/hammer/lib/libarchive/tar.5#11 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.12 2005/06/15 19:04:03 ru Exp $
+.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.13 2005/12/13 17:07:52 ru Exp $
.\"
.Dd May 20, 2004
.Dt TAR 5
@@ -591,7 +591,7 @@
.It Va atime , Va ctime
The time the file was last accessed and the time of
last change of file information, stored in octal as with
-.Va mtime.
+.Va mtime .
.It Va longnames
This field is apparently no longer used.
.It Sparse Va offset / Va numbytes
==== //depot/projects/hammer/lib/libc/stdio/vfprintf.c#19 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.70 2005/07/24 12:12:44 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.71 2005/12/13 13:23:27 phk Exp $");
/*
* Actual printf innards.
@@ -528,8 +528,8 @@
static char zeroes[PADSIZE] =
{'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
- static const char xdigs_lower[16] = "0123456789abcdef";
- static const char xdigs_upper[16] = "0123456789ABCDEF";
+ static const char xdigs_lower[17] = "0123456789abcdef?";
+ static const char xdigs_upper[17] = "0123456789ABCDEF?";
/*
* BEWARE, these `goto error' on error, and PAD uses `n'.
==== //depot/projects/hammer/lib/libc/sys/aio_read.2#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/lib/libc/sys/aio_read.2,v 1.21 2004/07/03 22:30:09 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/aio_read.2,v 1.23 2005/12/13 13:43:35 davidxu Exp $
.\"
.Dd November 17, 1998
.Dt AIO_READ 2
@@ -192,6 +192,7 @@
.Xr aio_suspend 2 ,
.Xr aio_waitcomplete 2 ,
.Xr aio_write 2 ,
+.Xr siginfo 3 ,
.Xr aio 4
.Sh STANDARDS
The
==== //depot/projects/hammer/lib/libc/sys/aio_write.2#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/lib/libc/sys/aio_write.2,v 1.18 2004/07/03 22:30:09 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/aio_write.2,v 1.20 2005/12/13 13:43:35 davidxu Exp $
.\"
.Dd June 2, 1999
.Dt AIO_WRITE 2
@@ -187,6 +187,7 @@
.Xr aio_return 2 ,
.Xr aio_suspend 2 ,
.Xr aio_waitcomplete 2 ,
+.Xr siginfo 3 ,
.Xr aio 4
.Sh STANDARDS
The
==== //depot/projects/hammer/lib/libc/sys/lio_listio.2#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/lib/libc/sys/lio_listio.2,v 1.3 2005/12/03 09:00:43 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.5 2005/12/13 13:43:35 davidxu Exp $
.\"
.Dd January 12, 2003
.Dt LIO_LISTIO 2
@@ -166,6 +166,7 @@
.Xr aio_write 2 ,
.Xr read 2 ,
.Xr write 2 ,
+.Xr siginfo 3 ,
.Xr aio 4
.Sh STANDARDS
The
==== //depot/projects/hammer/lib/libc/sys/mq_notify.2#2 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.6 2005/12/06 09:52:54 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.7 2005/12/13 03:05:58 davidxu Exp $
.\"
.Dd November 29, 2005
.Dt MQ_NOTIFY 2
@@ -117,7 +117,8 @@
.Sh SEE ALSO
.Xr mq_open 2 ,
.Xr mq_send 2 ,
-.Xr mq_timedsend 2
+.Xr mq_timedsend 2 ,
+.Xr siginfo 3
.Sh STANDARDS
The
.Fn mq_notify
==== //depot/projects/hammer/lib/libc/sys/sigaction.2#13 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)sigaction.2 8.2 (Berkeley) 4/3/94
-.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.56 2005/01/20 09:17:05 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.57 2005/12/13 03:05:58 davidxu Exp $
.\"
.Dd June 7, 2004
.Dt SIGACTION 2
@@ -618,6 +618,7 @@
.Xr wait 2 ,
.Xr fpsetmask 3 ,
.Xr setjmp 3 ,
+.Xr siginfo 3 ,
.Xr siginterrupt 3 ,
.Xr sigsetops 3 ,
.Xr ucontext 3 ,
==== //depot/projects/hammer/lib/libc/sys/sigqueue.2#4 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/sigqueue.2,v 1.5 2005/11/30 04:15:44 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/sys/sigqueue.2,v 1.7 2005/12/13 13:43:35 davidxu Exp $
.\"
.Dd November 11, 2005
.Dt SIGQUEUE 2
@@ -135,6 +135,7 @@
.Xr sigwaitinfo 2 ,
.Xr pause 3 ,
.Xr pthread_sigmask 3
+.Xr siginfo 3
.Sh STANDARDS
The
.Fn sigqueue
==== //depot/projects/hammer/lib/libc/sys/sigwaitinfo.2#3 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/sigwaitinfo.2,v 1.5 2005/11/18 11:53:23 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/sigwaitinfo.2,v 1.7 2005/12/13 13:43:35 davidxu Exp $
.\"
.Dd November 11, 2005
.Dt SIGTIMEDWAIT 2
@@ -188,7 +188,8 @@
.Xr sigsuspend 2 ,
.Xr sigwait 2 ,
.Xr pause 3 ,
-.Xr pthread_sigmask 3
+.Xr pthread_sigmask 3 ,
+.Xr siginfo 3
.Sh STANDARDS
The
.Fn sigtimedwait
==== //depot/projects/hammer/lib/libc/sys/timer_create.2#4 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/timer_create.2,v 1.5 2005/11/30 04:15:44 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/sys/timer_create.2,v 1.7 2005/12/13 13:43:35 davidxu Exp $
.\"
.Dd September 11, 2000
.Dt TIMER_CREATE 2
@@ -150,7 +150,8 @@
.Sh SEE ALSO
.Xr clock_getres 2 ,
.Xr timer_delete 2 ,
-.Xr timer_getoverun 2
+.Xr timer_getoverun 2 ,
+.Xr siginfo 3
.Sh STANDARDS
The
.Fn timer_create
==== //depot/projects/hammer/lib/libc/sys/timer_settime.2#4 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/timer_settime.2,v 1.4 2005/11/30 04:15:44 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/sys/timer_settime.2,v 1.6 2005/12/13 13:43:35 davidxu Exp $
.\"
.Dd September 11, 2000
.Dt TIMER_SETTIME 2
@@ -248,7 +248,8 @@
.El
.Sh SEE ALSO
.Xr clock_getres 2 ,
-.Xr timer_create 2
+.Xr timer_create 2 ,
+.Xr siginfo 3
.Sh STANDARDS
The
.Fn timer_getoverrun ,
==== //depot/projects/hammer/lib/libc/sys/wait.2#8 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)wait.2 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.24 2005/11/17 13:00:00 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.26 2005/12/13 13:43:35 davidxu Exp $
.\"
.Dd November 12, 2005
.Dt WAIT 2
@@ -322,7 +322,8 @@
.Xr _exit 2 ,
.Xr ptrace 2 ,
.Xr sigaction 2 ,
-.Xr exit 3
+.Xr exit 3 ,
+.Xr siginfo 3
.Sh STANDARDS
The
.Fn wait
==== //depot/projects/hammer/lib/msun/src/s_cbrt.c#3 (text+ko) ====
@@ -8,10 +8,12 @@
* software is freely granted, provided that this notice
* is preserved.
* ====================================================
+ *
+ * Optimized by Bruce D. Evans.
*/
#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.8 2005/12/11 19:51:30 bde Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.10 2005/12/13 20:17:23 bde Exp $";
#endif
#include "math.h"
@@ -47,7 +49,6 @@
if((hx|low)==0)
return(x); /* cbrt(0) is itself */
- SET_HIGH_WORD(x,hx); /* x <- |x| */
/*
* Rough cbrt to 5 bits:
* cbrt(2**e*(1+m) ~= 2**(e/3)*(1+(e%3+m)/3)
@@ -63,19 +64,20 @@
* subtraction virtually to keep e >= 0 so that ordinary integer
* division rounds towards minus infinity; this is also efficient.
*/
- if(hx<0x00100000) /* subnormal number */
- {SET_HIGH_WORD(t,0x43500000); /* set t= 2**54 */
- t*=x; GET_HIGH_WORD(high,t); SET_HIGH_WORD(t,high/3+B2);
- }
- else
- SET_HIGH_WORD(t,hx/3+B1);
+ if(hx<0x00100000) { /* subnormal number */
+ SET_HIGH_WORD(t,0x43500000); /* set t= 2**54 */
+ t*=x;
+ GET_HIGH_WORD(high,t);
+ SET_HIGH_WORD(t,sign|((high&0x7fffffff)/3+B2));
+ } else
+ SET_HIGH_WORD(t,sign|(hx/3+B1));
/* new cbrt to 23 bits; may be implemented in single precision */
r=t*t/x;
s=C+r*t;
t*=G+F/(s+E+D/s);
- /* chop t to 20 bits and make it larger than cbrt(x) */
+ /* chop t to 20 bits and make it larger in magnitude than cbrt(x) */
GET_HIGH_WORD(high,t);
INSERT_WORDS(t,high+0x00000001,0);
@@ -86,8 +88,5 @@
r=(r-t)/(w+r); /* r-t is exact */
t=t+t*r;
- /* restore the sign bit */
- GET_HIGH_WORD(high,t);
- SET_HIGH_WORD(t,high|sign);
return(t);
}
==== //depot/projects/hammer/lib/msun/src/s_cbrtf.c#3 (text+ko) ====
@@ -1,6 +1,6 @@
/* s_cbrtf.c -- float version of s_cbrt.c.
* Conversion to float by Ian Lance Taylor, Cygnus Support, ian at cygnus.com.
- * Debugged by Bruce D. Evans.
+ * Debugged and optimized by Bruce D. Evans.
*/
/*
@@ -15,7 +15,7 @@
*/
#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.10 2005/12/11 19:51:30 bde Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.12 2005/12/13 20:17:23 bde Exp $";
#endif
#include "math.h"
@@ -50,21 +50,21 @@
if(hx==0)
return(x); /* cbrt(0) is itself */
- SET_FLOAT_WORD(x,hx); /* x <- |x| */
/* rough cbrt to 5 bits */
- if(hx<0x00800000) /* subnormal number */
- {SET_FLOAT_WORD(t,0x4b800000); /* set t= 2**24 */
- t*=x; GET_FLOAT_WORD(high,t); SET_FLOAT_WORD(t,high/3+B2);
- }
- else
- SET_FLOAT_WORD(t,hx/3+B1);
+ if(hx<0x00800000) { /* subnormal number */
+ SET_FLOAT_WORD(t,0x4b800000); /* set t= 2**24 */
+ t*=x;
+ GET_FLOAT_WORD(high,t);
+ SET_FLOAT_WORD(t,sign|((high&0x7fffffff)/3+B2));
+ } else
+ SET_FLOAT_WORD(t,sign|(hx/3+B1));
/* new cbrt to 23 bits */
r=t*t/x;
s=C+r*t;
t*=G+F/(s+E+D/s);
- /* chop t to 12 bits and make it larger than cbrt(x) */
+ /* chop t to 12 bits and make it larger in magnitude than cbrt(x) */
GET_FLOAT_WORD(high,t);
SET_FLOAT_WORD(t,(high&0xfffff000)+0x00001000);
@@ -75,8 +75,5 @@
r=(r-t)/(w+r); /* r-t is exact */
t=t+t*r;
- /* restore the sign bit */
- GET_FLOAT_WORD(high,t);
- SET_FLOAT_WORD(t,high|sign);
return(t);
}
==== //depot/projects/hammer/sbin/ipfw/ipfw.8#50 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.180 2005/11/29 15:25:08 ume Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.181 2005/12/13 17:07:52 ru Exp $
.\"
.Dd August 13, 2005
.Dt IPFW 8
@@ -1587,7 +1587,7 @@
and
.Cm limit
options of
-.Nm rules.
+.Nm rules .
.Pp
Dynamic rules are created when a packet matches a
.Cm keep-state
==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#47 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.81 2005/12/09 13:03:30 glebius Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.82 2005/12/13 12:16:02 glebius Exp $
*/
#include <sys/param.h>
@@ -420,6 +420,8 @@
{ NULL, 0 } /* terminator */
};
+#define TABLEARG "tablearg"
+
static __inline uint64_t
align_uint64(uint64_t *pll) {
uint64_t ret;
@@ -1457,33 +1459,28 @@
print_unreach6_code(cmd->arg1);
break;
- case O_SKIPTO:
- printf("skipto %u", cmd->arg1);
+#define PRINT_WITH_ARG(o) \
+ if (cmd->arg1 == IP_FW_TABLEARG) \
+ printf("%s tablearg", (o)); \
+ else \
+ printf("%s %u", (o), cmd->arg1); \
break;
+ case O_SKIPTO:
+ PRINT_WITH_ARG("skipto");
case O_PIPE:
- printf("pipe %u", cmd->arg1);
- break;
-
+ PRINT_WITH_ARG("pipe");
case O_QUEUE:
- printf("queue %u", cmd->arg1);
- break;
-
+ PRINT_WITH_ARG("queue");
case O_DIVERT:
- printf("divert %u", cmd->arg1);
- break;
-
+ PRINT_WITH_ARG("divert");
case O_TEE:
- printf("tee %u", cmd->arg1);
- break;
-
+ PRINT_WITH_ARG("tee");
case O_NETGRAPH:
- printf("netgraph %u", cmd->arg1);
- break;
-
+ PRINT_WITH_ARG("netgraph");
case O_NGTEE:
- printf("ngtee %u", cmd->arg1);
- break;
+ PRINT_WITH_ARG("ngtee");
+#undef PRINT_WITH_ARG
case O_FORWARD_IP:
{
@@ -3863,26 +3860,36 @@
break;
case TOK_QUEUE:
+ action->opcode = O_QUEUE;
+ goto chkarg;
case TOK_PIPE:
- action->len = F_INSN_SIZE(ipfw_insn);
+ action->opcode = O_PIPE;
+ goto chkarg;
case TOK_SKIPTO:
- if (i == TOK_QUEUE)
- action->opcode = O_QUEUE;
- else if (i == TOK_PIPE)
- action->opcode = O_PIPE;
- else if (i == TOK_SKIPTO)
- action->opcode = O_SKIPTO;
- NEED1("missing skipto/pipe/queue number");
- action->arg1 = strtoul(*av, NULL, 10);
- av++; ac--;
- break;
-
+ action->opcode = O_SKIPTO;
+ goto chkarg;
+ case TOK_NETGRAPH:
+ action->opcode = O_NETGRAPH;
+ goto chkarg;
+ case TOK_NGTEE:
+ action->opcode = O_NGTEE;
+ goto chkarg;
case TOK_DIVERT:
+ action->opcode = O_DIVERT;
+ goto chkarg;
case TOK_TEE:
- action->opcode = (i == TOK_DIVERT) ? O_DIVERT : O_TEE;
- NEED1("missing divert/tee port");
- action->arg1 = strtoul(*av, NULL, 0);
- if (action->arg1 == 0) {
+ action->opcode = O_TEE;
+chkarg:
+ if (!ac)
+ errx(EX_USAGE, "missing argument for %s", *(av - 1));
+ if (isdigit(**av)) {
+ action->arg1 = strtoul(*av, NULL, 10);
+ if (action->arg1 <= 0 || action->arg1 >= IP_FW_TABLEARG)
+ errx(EX_DATAERR, "illegal argument for %s",
+ *(av - 1));
+ } else if (_substrcmp(*av, TABLEARG) == 0) {
+ action->arg1 = IP_FW_TABLEARG;
+ } else if (i == TOK_DIVERT || i == TOK_TEE) {
struct servent *s;
setservent(1);
s = getservbyname(av[0], "divert");
@@ -3890,17 +3897,8 @@
action->arg1 = ntohs(s->s_port);
else
errx(EX_DATAERR, "illegal divert/tee port");
- }
- ac--; av++;
- break;
-
- case TOK_NETGRAPH:
- case TOK_NGTEE:
- action->opcode = (i == TOK_NETGRAPH ) ? O_NETGRAPH : O_NGTEE;
- NEED1("missing netgraph cookie");
- action->arg1 = strtoul(*av, NULL, 0);
- if (action->arg1 == 0)
- errx(EX_DATAERR, "illegal netgraph cookie");
+ } else
+ errx(EX_DATAERR, "illegal argument for %s", *(av - 1));
ac--; av++;
break;
==== //depot/projects/hammer/share/man/man3/Makefile#12 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 12/13/93
-# $FreeBSD: src/share/man/man3/Makefile,v 1.36 2005/05/18 16:23:11 keramida Exp $
+# $FreeBSD: src/share/man/man3/Makefile,v 1.37 2005/12/13 00:28:09 davidxu Exp $
MAN= assert.3 \
bitstring.3 \
@@ -8,6 +8,7 @@
intro.3 \
${PTHREAD_MAN} \
queue.3 \
+ siginfo.3 \
stdarg.3 \
sysexits.3 \
tgmath.3 \
==== //depot/projects/hammer/share/man/man9/bus_dma.9#22 (text+ko) ====
@@ -57,7 +57,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/bus_dma.9,v 1.30 2005/12/05 23:25:59 scottl Exp $
+.\" $FreeBSD: src/share/man/man9/bus_dma.9,v 1.31 2005/12/13 17:07:52 ru Exp $
.\" $NetBSD: bus_dma.9,v 1.25 2002/10/14 13:43:16 wiz Exp $
.\"
.Dd December 5, 2005
@@ -337,7 +337,7 @@
for byte alignment.
Hardware requiring DMA transfers to start on a multiple of 4K
would specify
-.Em 4096.
+.Em 4096 .
.It Fa boundary
Boundary constraint, in bytes, of the target DMA memory region.
The boundary indicates the set of addresses, all multiples of the
@@ -376,7 +376,7 @@
map memory into the window described by
.Fa lowaddr
and
-.Fa highaddr.
+.Fa highaddr .
A filter function is only required when the single window described
by
.Fa lowaddr
@@ -496,7 +496,7 @@
.Bl -tag -width buflen -compact
.It Fa dmat
DMA tag used to allocate
-.Fa map.
+.Fa map .
.It Fa map
A DMA map without a currently active mapping.
.It Fa buf
==== //depot/projects/hammer/share/man/man9/namei.9#8 (text+ko) ====
@@ -31,7 +31,7 @@
.\" If you integrate this manpage in another OS, I'd appreciate a note
.\" - eivind at FreeBSD.org
.\"
-.\" $FreeBSD: src/share/man/man9/namei.9,v 1.28 2005/11/18 10:52:24 ru Exp $
+.\" $FreeBSD: src/share/man/man9/namei.9,v 1.29 2005/12/13 17:07:52 ru Exp $
.\"
.Dd September 21, 2005
.Os
@@ -82,7 +82,7 @@
in which case the caller must later release
.Va Giant
based on the results of
-.Fn NDHASGIANT.
+.Fn NDHASGIANT .
.Pp
The
.Fn NDINIT
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#62 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.20 2005/12/08 18:33:29 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.22 2005/12/13 18:29:09 jhb Exp $");
#include "opt_hwpmc_hooks.h"
==== //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#26 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.130 2005/08/28 13:11:08 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.131 2005/12/13 15:32:52 delphij Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -806,22 +806,22 @@
}
case LINUX_TCFLSH: {
- args->cmd = TIOCFLUSH;
+ int val;
switch (args->arg) {
case LINUX_TCIFLUSH:
- args->arg = FREAD;
+ val = FREAD;
break;
case LINUX_TCOFLUSH:
- args->arg = FWRITE;
+ val = FWRITE;
break;
case LINUX_TCIOFLUSH:
- args->arg = FREAD | FWRITE;
+ val = FREAD | FWRITE;
break;
default:
fdrop(fp, td);
return (EINVAL);
}
- error = (ioctl(td, (struct ioctl_args *)args));
+ error = (fo_ioctl(fp,TIOCFLUSH,(caddr_t)&val,td->td_ucred,td));
break;
}
==== //depot/projects/hammer/sys/dev/bge/if_bge.c#59 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.103 2005/12/08 16:11:45 glebius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.104 2005/12/13 06:14:14 marcel Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -3750,10 +3750,8 @@
* periods of heavy traffic. (There should be no
* effect on copper NICs.)
*/
- if (sc->bge_tbi) status = CSR_READ_4(sc, BGE_MAC_STS);
-
- if (!sc->bge_tbi || !(status & (BGE_MACSTAT_PORT_DECODE_ERROR |
- BGE_MACSTAT_MI_COMPLETE))) {
+ if (!sc->bge_tbi || ((status = CSR_READ_4(sc, BGE_MAC_STS)) &
+ (BGE_MACSTAT_PORT_DECODE_ERROR | BGE_MACSTAT_MI_COMPLETE)) == 0) {
sc->bge_link = 0;
callout_stop(&sc->bge_stat_ch);
bge_tick_locked(sc);
==== //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 (text+ko) ====
@@ -118,20 +118,8 @@
#define NBPC PAGE_SIZE /* Number of bytes per click */
#define BPCSHIFT PAGE_SHIFT /* LOG2(NBPC) if exact */
-/*
- * Size of block device i/o is parameterized here.
- * Currently the system supports page-sized i/o.
- */
-#define BLKDEV_IOSHIFT BPCSHIFT
-#ifndef BLKDEV_IOSIZE
-#define BLKDEV_IOSIZE (1<<BLKDEV_IOSHIFT)
-#else
-# if NBPC != BLKDEV_IOSIZE
-# error Wrong BLKDEV_IOSIZE
-# endif
-#endif
/* number of BB's per block device block */
-#define BLKDEV_BB BTOBB(BLKDEV_IOSIZE)
+#define BLKDEV_BB BTOBB(BLKDEV_IOSIZE)
/* bytes to clicks */
#define btoct(x) ((__psunsigned_t)(x)>>BPCSHIFT)
==== //depot/projects/hammer/sys/i386/i386/local_apic.c#22 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.22 2005/12/05 22:39:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.24 2005/12/13 18:29:10 jhb Exp $");
#include "opt_hwpmc_hooks.h"
==== //depot/projects/hammer/sys/i386/isa/clock.c#30 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.224 2005/11/09 03:55:40 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.225 2005/12/13 19:08:55 peter Exp $");
/*
* Routines to handle clock hardware.
@@ -64,6 +64,7 @@
#include <sys/kernel.h>
#include <sys/limits.h>
#include <sys/module.h>
+#include <sys/sched.h>
#include <sys/sysctl.h>
#include <sys/cons.h>
#include <sys/power.h>
@@ -288,7 +289,21 @@
int getit_calls = 1;
int n1;
static int state = 0;
+#endif
+ if (tsc_freq != 0 && !tsc_is_broken) {
+ uint64_t start, end, now;
+
+ sched_pin();
+ start = rdtsc();
+ end = start + (tsc_freq * n) / 1000000;
+ do {
+ now = rdtsc();
+ } while (now < end || (now > start && end < start));
+ sched_unpin();
+ return;
+ }
+#ifdef DELAYDEBUG
if (state == 0) {
state = 1;
for (n1 = 1; n1 <= 10000000; n1 *= 10)
==== //depot/projects/hammer/sys/netinet/ip_fw.h#26 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.102 2005/11/29 08:59:41 glebius Exp $
+ * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.103 2005/12/13 12:16:02 glebius Exp $
*/
#ifndef _IPFW2_H
@@ -461,6 +461,8 @@
ipfw_table_entry ent[0]; /* entries */
} ipfw_table;
+#define IP_FW_TABLEARG 65535
+
/*
* Main firewall chains definitions and global var's definitions.
*/
==== //depot/projects/hammer/sys/netinet/ip_fw2.c#69 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.118 2005/12/06 10:45:49 glebius Exp $
+ * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.119 2005/12/13 12:16:03 glebius Exp $
*/
#define DEB(x)
@@ -2383,9 +2383,9 @@
* Now scan the rules, and parse microinstructions for each rule.
*/
for (; f; f = f->next) {
- int l, cmdlen;
ipfw_insn *cmd;
- int skip_or; /* skip rest of OR block */
+ uint32_t tablearg = 0;
+ int l, cmdlen, skip_or; /* skip rest of OR block */
again:
if (set_disable & (1 << f->set) )
@@ -2548,6 +2548,8 @@
if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
match =
((ipfw_insn_u32 *)cmd)->d[0] == v;
+ else
+ tablearg = v;
}
break;
@@ -2999,7 +3001,10 @@
case O_PIPE:
case O_QUEUE:
args->rule = f; /* report matching rule */
- args->cookie = cmd->arg1;
+ if (cmd->arg1 == IP_FW_TABLEARG)
+ args->cookie = tablearg;
+ else
+ args->cookie = cmd->arg1;
retval = IP_FW_DUMMYNET;
goto done;
@@ -3020,7 +3025,10 @@
}
dt = (struct divert_tag *)(mtag+1);
dt->cookie = f->rulenum;
- dt->info = cmd->arg1;
+ if (cmd->arg1 == IP_FW_TABLEARG)
+ dt->info = tablearg;
+ else
+ dt->info = cmd->arg1;
m_tag_prepend(m, mtag);
retval = (cmd->opcode == O_DIVERT) ?
IP_FW_DIVERT : IP_FW_TEE;
@@ -3085,7 +3093,10 @@
case O_NETGRAPH:
case O_NGTEE:
args->rule = f; /* report matching rule */
- args->cookie = cmd->arg1;
+ if (cmd->arg1 == IP_FW_TABLEARG)
+ args->cookie = tablearg;
+ else
+ args->cookie = cmd->arg1;
retval = (cmd->opcode == O_NETGRAPH) ?
IP_FW_NETGRAPH : IP_FW_NGTEE;
goto done;
==== //depot/projects/hammer/sys/nfsclient/nfs_socket.c#33 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.133 2005/11/21 19:25:24 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.134 2005/12/12 23:18:05 ps Exp $");
/*
* Socket operations for use by nfs
@@ -523,17 +523,6 @@
return (error);
}
-static __inline int
-nfs_cantrecvmore(struct socket *so)
-{
- int ret;
-
- SOCKBUF_LOCK(&so->so_rcv);
- ret = (so->so_rcv.sb_state & SBS_CANTRCVMORE);
- SOCKBUF_UNLOCK(&so->so_rcv);
- return ret;
-}
-
int
nfs_reply(struct nfsreq *rep)
{
@@ -563,7 +552,7 @@
}
so = rep->r_nmp->nm_so;
mtx_lock(&rep->r_nmp->nm_nfstcpstate.mtx);
- if (!so || nfs_cantrecvmore(so) ||
+ if (!so ||
(rep->r_nmp->nm_nfstcpstate.flags & NFS_TCP_FORCE_RECONNECT)) {
mtx_unlock(&rep->r_nmp->nm_nfstcpstate.mtx);
error = nfs_reconnect(rep);
@@ -767,7 +756,7 @@
SOCKBUF_LOCK(&so->so_rcv);
retval = (so->so_rcv.sb_cc >= (bytes) ||
- (so->so_state & SBS_CANTRCVMORE) ||
+ (so->so_rcv.sb_state & SBS_CANTRCVMORE) ||
so->so_error);
SOCKBUF_UNLOCK(&so->so_rcv);
return (retval);
==== //depot/projects/hammer/sys/vm/vm_page.c#46 (text+ko) ====
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.308 2005/11/08 06:33:21 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.309 2005/12/13 19:59:09 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1012,6 +1012,8 @@
struct vpgqueues *pq;
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ KASSERT(!pmap_page_is_mapped(m),
+ ("vm_page_free_toq: freeing mapped page %p", m));
cnt.v_tfree++;
if (m->busy || ((m->queue - m->pc) == PQ_FREE)) {
==== //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#21 (text+ko) ====
@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/tools/tools/tinderbox/tinderbox.pl,v 1.44 2005/11/14 12:59:10 des Exp $
+# $FreeBSD: src/tools/tools/tinderbox/tinderbox.pl,v 1.45 2005/12/13 17:51:56 des Exp $
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list