From owner-p4-projects@FreeBSD.ORG Sun Oct 28 00:28:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5615A16A41B; Sun, 28 Oct 2007 00:28:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08C4216A419 for ; Sun, 28 Oct 2007 00:28:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBDDD13C4BD for ; Sun, 28 Oct 2007 00:28:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9S0SvUk081551 for ; Sun, 28 Oct 2007 00:28:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9S0SvXU081548 for perforce@freebsd.org; Sun, 28 Oct 2007 00:28:57 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 00:28:57 GMT Message-Id: <200710280028.l9S0SvXU081548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 00:28:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=128216 Change 128216 by jb@jb_freebsd1 on 2007/10/28 00:28:14 The comment "Solaris defines _LITTLE_ENDIAN or _BIG_ENDIAN, but never both and decides which architecture it is based on which thing is defined." is true, but undefining _LITTLE_ENDIAN or _BIG_ENDIAN breaks lots of FreeBSD header files which all assume that both _LITTLE_ENDIAN and _BIG_ENDIAN are defined and that BYTE_ORDER is set to the one that matches the host. This was a hack to get ZFS working on FreeBSD, but it prevents DTrace code from using FreeBSD headers which include _BIG_ENDIAN and _LITTLE_ENDIAN. ZFS (and other Solaris) code will _have _to be changed to do what FreeBSD does: e.g. if BYTE_ORDER == _LITTLE_ENDIAN rather than ifdef _LITTLE_ENDIAN. Without this change, I can't share the OpenSolaris compatibility headers that pjd@ has created. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/machine/endian.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 28 01:05:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5EE316A41B; Sun, 28 Oct 2007 01:05:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E1B116A419 for ; Sun, 28 Oct 2007 01:05:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C17413C4B0 for ; Sun, 28 Oct 2007 01:05:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9S15cFf093538 for ; Sun, 28 Oct 2007 01:05:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9S15cWi093535 for perforce@freebsd.org; Sun, 28 Oct 2007 01:05:38 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 01:05:38 GMT Message-Id: <200710280105.l9S15cWi093535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 01:05:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=128218 Change 128218 by jb@jb_freebsd1 on 2007/10/28 01:05:18 Check endian the FreeBSD way. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#6 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#6 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#9 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#9 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#25 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#8 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#6 (text) ==== @@ -267,7 +267,7 @@ * properties are used to compute shift as USHIFT or SSHIFT, below. */ if (dnp->dn_flags & DT_NF_SIGNED) { -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN shift = clp2(P2ROUNDUP(e.cte_bits, NBBY) / NBBY) * NBBY - mp->ctm_offset % NBBY; #else @@ -281,7 +281,7 @@ instr = DIF_INSTR_FMT(DIF_OP_SRA, r1, r2, r1); dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr)); } else { -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN shift = clp2(P2ROUNDUP(e.cte_bits, NBBY) / NBBY) * NBBY - (mp->ctm_offset % NBBY + e.cte_bits); #else ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#6 (text) ==== @@ -427,7 +427,7 @@ xyerror(D_CHR_OFLOW, "character constant is " "too long"); } -#ifdef _LITTLE_ENDIAN +#if BYTE_ORDER == _LITTLE_ENDIAN p = ((char *)&yylval.l_int) + nbytes - 1; for (q = s; nbytes != 0; nbytes--) *p-- = *q++; ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#9 (text) ==== @@ -493,9 +493,9 @@ elf_file.ehdr.e_ident[EI_MAG3] = ELFMAG3; elf_file.ehdr.e_ident[EI_VERSION] = EV_CURRENT; elf_file.ehdr.e_ident[EI_CLASS] = ELFCLASS32; -#if defined(_BIG_ENDIAN) +#if BYTE_ORDER == _BIG_ENDIAN elf_file.ehdr.e_ident[EI_DATA] = ELFDATA2MSB; -#elif defined(_LITTLE_ENDIAN) +#else elf_file.ehdr.e_ident[EI_DATA] = ELFDATA2LSB; #endif elf_file.ehdr.e_type = ET_REL; @@ -630,9 +630,9 @@ elf_file.ehdr.e_ident[EI_MAG3] = ELFMAG3; elf_file.ehdr.e_ident[EI_VERSION] = EV_CURRENT; elf_file.ehdr.e_ident[EI_CLASS] = ELFCLASS64; -#if defined(_BIG_ENDIAN) +#if BYTE_ORDER == _BIG_ENDIAN elf_file.ehdr.e_ident[EI_DATA] = ELFDATA2MSB; -#elif defined(_LITTLE_ENDIAN) +#else elf_file.ehdr.e_ident[EI_DATA] = ELFDATA2LSB; #endif elf_file.ehdr.e_type = ET_REL; ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#9 (text) ==== @@ -934,7 +934,7 @@ ml->ml_size = tdesc_bitsize(ml->ml_type); if (die_unsigned(dw, mem, DW_AT_bit_offset, &bitoff, 0)) { -#ifdef FROGFACE_BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN ml->ml_offset += bitoff; #else ml->ml_offset += tdesc_bitsize(ml->ml_type) - bitoff - ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 (text+ko) ==== @@ -1918,7 +1918,7 @@ int err = 0; nvstream_t nvs; int nvl_endian; -#ifdef _LITTLE_ENDIAN +#if BYTE_ORDER == _LITTLE_ENDIAN int host_endian = 1; #else int host_endian = 0; ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 (text+ko) ==== @@ -295,7 +295,7 @@ * Note: the byteorder is either 0 or -1, both of which are palindromes. * This simplifies the endianness handling a bit. */ -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN #define ZFS_HOST_BYTEORDER (0ULL) #else #define ZFS_HOST_BYTEORDER (-1ULL) ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 (text+ko) ==== @@ -54,11 +54,13 @@ #pragma weak xdr_int64_t = xdr_longlong_t #pragma weak xdr_uint64_t = xdr_u_longlong_t +#if defined(sun) #if !defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) #error "Exactly one of _BIG_ENDIAN or _LITTLE_ENDIAN must be defined" #elif defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN) #error "Only one of _BIG_ENDIAN or _LITTLE_ENDIAN may be defined" #endif +#endif /* * constants specific to the xdr "protocol" @@ -174,12 +176,12 @@ xdr_longlong_t(XDR *xdrs, longlong_t *hp) { if (xdrs->x_op == XDR_ENCODE) { -#if defined(_LITTLE_ENDIAN) +#if BYTE_ORDER == _LITTLE_ENDIAN if (XDR_PUTINT32(xdrs, (int32_t *)((char *)hp + BYTES_PER_XDR_UNIT)) == TRUE) { return (XDR_PUTINT32(xdrs, (int32_t *)hp)); } -#elif defined(_BIG_ENDIAN) +#else if (XDR_PUTINT32(xdrs, (int32_t *)hp) == TRUE) { return (XDR_PUTINT32(xdrs, (int32_t *)((char *)hp + BYTES_PER_XDR_UNIT))); @@ -189,12 +191,12 @@ } if (xdrs->x_op == XDR_DECODE) { -#if defined(_LITTLE_ENDIAN) +#if BYTE_ORDER == _LITTLE_ENDIAN if (XDR_GETINT32(xdrs, (int32_t *)((char *)hp + BYTES_PER_XDR_UNIT)) == TRUE) { return (XDR_GETINT32(xdrs, (int32_t *)hp)); } -#elif defined(_BIG_ENDIAN) +#else if (XDR_GETINT32(xdrs, (int32_t *)hp) == TRUE) { return (XDR_GETINT32(xdrs, (int32_t *)((char *)hp + BYTES_PER_XDR_UNIT))); @@ -213,12 +215,12 @@ { if (xdrs->x_op == XDR_ENCODE) { -#if defined(_LITTLE_ENDIAN) +#if BYTE_ORDER == _LITTLE_ENDIAN if (XDR_PUTINT32(xdrs, (int32_t *)((char *)hp + BYTES_PER_XDR_UNIT)) == TRUE) { return (XDR_PUTINT32(xdrs, (int32_t *)hp)); } -#elif defined(_BIG_ENDIAN) +#else if (XDR_PUTINT32(xdrs, (int32_t *)hp) == TRUE) { return (XDR_PUTINT32(xdrs, (int32_t *)((char *)hp + BYTES_PER_XDR_UNIT))); @@ -228,12 +230,12 @@ } if (xdrs->x_op == XDR_DECODE) { -#if defined(_LITTLE_ENDIAN) +#if BYTE_ORDER == _LITTLE_ENDIAN if (XDR_GETINT32(xdrs, (int32_t *)((char *)hp + BYTES_PER_XDR_UNIT)) == TRUE) { return (XDR_GETINT32(xdrs, (int32_t *)hp)); } -#elif defined(_BIG_ENDIAN) +#else if (XDR_GETINT32(xdrs, (int32_t *)hp) == TRUE) { return (XDR_GETINT32(xdrs, (int32_t *)((char *)hp + BYTES_PER_XDR_UNIT))); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 (text+ko) ==== @@ -365,7 +365,7 @@ #endif -#ifndef _LITTLE_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN #define IXDR_GET_HYPER(buf, v) { \ *((int32_t *)(&v)) = ntohl(*(uint32_t *)buf++); \ *((int32_t *)(((char *)&v) + BYTES_PER_XDR_UNIT)) \ ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 (text+ko) ==== @@ -58,7 +58,7 @@ * macros for conversion between host and (internet) network byte order */ -#if defined(_BIG_ENDIAN) && !defined(ntohl) && !defined(__lint) +#if BYTE_ORDER == _BIG_ENDIAN && !defined(ntohl) && !defined(__lint) /* big-endian */ #define ntohl(x) (x) #define ntohs(x) (x) @@ -108,7 +108,7 @@ /* * Macros to convert from a specific byte order to/from native byte order */ -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN #define BE_8(x) BMASK_8(x) #define BE_16(x) BMASK_16(x) #define BE_32(x) BMASK_32(x) ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#25 (text) ==== @@ -514,7 +514,7 @@ ((((uint64_t)(y)) << 32) | ((x) & UINT32_MAX)) #ifndef _LP64 -#ifndef _LITTLE_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN #define DTRACE_PTR(type, name) uint32_t name##pad; type *name #else #define DTRACE_PTR(type, name) type *name; uint32_t name##pad @@ -624,7 +624,7 @@ #define DOF_ENCODE_LSB 1 #define DOF_ENCODE_MSB 2 -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN #define DOF_ENCODE_NATIVE DOF_ENCODE_MSB #else #define DOF_ENCODE_NATIVE DOF_ENCODE_LSB ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#8 (text) ==== From owner-p4-projects@FreeBSD.ORG Sun Oct 28 01:43:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56B2416A41B; Sun, 28 Oct 2007 01:43:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3BB916A418 for ; Sun, 28 Oct 2007 01:43:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E256C13C49D for ; Sun, 28 Oct 2007 01:43:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9S1hIRI095467 for ; Sun, 28 Oct 2007 01:43:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9S1hIQs095464 for perforce@freebsd.org; Sun, 28 Oct 2007 01:43:18 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 01:43:18 GMT Message-Id: <200710280143.l9S1hIQs095464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 01:43:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=128220 Change 128220 by kmacy@kmacy:storage:toestack on 2007/10/28 01:42:24 fix bitmap macros to behave correctly when passed something other than a char * Affected files ... .. //depot/projects/toestack/sys/sys/param.h#6 edit Differences ... ==== //depot/projects/toestack/sys/sys/param.h#6 (text+ko) ==== @@ -238,10 +238,10 @@ #define MAXSYMLINKS 32 /* Bit map related macros. */ -#define setbit(a,i) ((a)[(i)/NBBY] |= 1<<((i)%NBBY)) -#define clrbit(a,i) ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY))) -#define isset(a,i) ((a)[(i)/NBBY] & (1<<((i)%NBBY))) -#define isclr(a,i) (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0) +#define setbit(a,i) (((uint8_t *)a)[(i)/NBBY] |= 1<<((i)%NBBY)) +#define clrbit(a,i) (((uint8_t *)a)[(i)/NBBY] &= ~(1<<((i)%NBBY))) +#define isset(a,i) (((uint8_t *)a)[(i)/NBBY] & (1<<((i)%NBBY))) +#define isclr(a,i) ((((uint8_t *)a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0) /* Macros for counting and rounding. */ #ifndef howmany From owner-p4-projects@FreeBSD.ORG Sun Oct 28 02:00:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F18016A475; Sun, 28 Oct 2007 02:00:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F61416A417 for ; Sun, 28 Oct 2007 02:00:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D5BA13C4B7 for ; Sun, 28 Oct 2007 02:00:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9S20cR1096215 for ; Sun, 28 Oct 2007 02:00:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9S20cvF096212 for perforce@freebsd.org; Sun, 28 Oct 2007 02:00:38 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 02:00:38 GMT Message-Id: <200710280200.l9S20cvF096212@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 02:00:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=128221 Change 128221 by kmacy@kmacy:storage:toestack on 2007/10/28 02:00:27 re-make the bitmap macros expression safe pointed out by Sam Leffler Affected files ... .. //depot/projects/toestack/sys/sys/param.h#7 edit Differences ... ==== //depot/projects/toestack/sys/sys/param.h#7 (text+ko) ==== @@ -238,10 +238,10 @@ #define MAXSYMLINKS 32 /* Bit map related macros. */ -#define setbit(a,i) (((uint8_t *)a)[(i)/NBBY] |= 1<<((i)%NBBY)) -#define clrbit(a,i) (((uint8_t *)a)[(i)/NBBY] &= ~(1<<((i)%NBBY))) -#define isset(a,i) (((uint8_t *)a)[(i)/NBBY] & (1<<((i)%NBBY))) -#define isclr(a,i) ((((uint8_t *)a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0) +#define setbit(a,i) (((uint8_t *)(a))[(i)/NBBY] |= 1<<((i)%NBBY)) +#define clrbit(a,i) (((uint8_t *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY))) +#define isset(a,i) (((uint8_t *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) +#define isclr(a,i) ((((uint8_t *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0) /* Macros for counting and rounding. */ #ifndef howmany From owner-p4-projects@FreeBSD.ORG Sun Oct 28 02:53:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BE3416A46C; Sun, 28 Oct 2007 02:53:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FCF616A419 for ; Sun, 28 Oct 2007 02:53:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F03F713C480 for ; Sun, 28 Oct 2007 02:53:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9S2rgIe001137 for ; Sun, 28 Oct 2007 02:53:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9S2rbmW001134 for perforce@freebsd.org; Sun, 28 Oct 2007 02:53:37 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 02:53:37 GMT Message-Id: <200710280253.l9S2rbmW001134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 02:53:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=128222 Change 128222 by kmacy@kmacy_home:ethng on 2007/10/28 02:53:30 IFC #128215 Affected files ... .. //depot/projects/ethng/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/ethng/src/UPDATING#6 integrate .. //depot/projects/ethng/src/bin/ps/extern.h#2 integrate .. //depot/projects/ethng/src/bin/ps/keyword.c#2 integrate .. //depot/projects/ethng/src/bin/ps/print.c#3 integrate .. //depot/projects/ethng/src/bin/ps/ps.c#3 integrate .. //depot/projects/ethng/src/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/ethng/src/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/ethng/src/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/ethng/src/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/ethng/src/etc/rc.d/Makefile#7 integrate .. //depot/projects/ethng/src/etc/rc.d/amd#3 integrate .. //depot/projects/ethng/src/etc/rc.d/named#2 integrate .. //depot/projects/ethng/src/etc/rc.d/nfslocking#3 delete .. //depot/projects/ethng/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/ethng/src/include/_ctype.h#3 integrate .. //depot/projects/ethng/src/lib/Makefile#3 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/ethng/src/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/ethng/src/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf_update.3#3 integrate .. //depot/projects/ethng/src/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/gelf_newphdr.3#3 integrate .. //depot/projects/ethng/src/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/ethng/src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/ethng/src/lib/libstand/Makefile#3 integrate .. //depot/projects/ethng/src/lib/libthr/libthr.3#2 integrate .. //depot/projects/ethng/src/rescue/rescue/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/gpt/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/gpt/add.c#2 integrate .. //depot/projects/ethng/src/sbin/gpt/boot.c#1 branch .. //depot/projects/ethng/src/sbin/gpt/gpt.8#2 integrate .. //depot/projects/ethng/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/ethng/src/sbin/gpt/gpt.h#2 integrate .. //depot/projects/ethng/src/sbin/gpt/show.c#2 integrate .. //depot/projects/ethng/src/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/ethng/src/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_barrier_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_barrierattr.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_detach.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_exit.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_once.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_spin_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_spin_lock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_switch_add_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_testcancel.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_yield.3#2 integrate .. //depot/projects/ethng/src/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/ethng/src/share/man/man9/Makefile#6 integrate .. //depot/projects/ethng/src/share/man/man9/kproc.9#2 integrate .. //depot/projects/ethng/src/share/man/man9/kthread.9#3 integrate .. //depot/projects/ethng/src/share/misc/committers-doc.dot#2 integrate .. //depot/projects/ethng/src/share/misc/committers-src.dot#3 integrate .. //depot/projects/ethng/src/share/mk/sys.mk#3 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/ethng/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/ethng/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/ethng/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/ethng/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/ethng/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/ethng/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/ethng/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/ethng/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/ethng/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/ethng/src/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/ethng/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/ethng/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/ethng/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/ethng/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/ethng/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/ethng/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/ethng/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/ethng/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/ethng/src/sys/conf/files#8 integrate .. //depot/projects/ethng/src/sys/conf/files.amd64#7 integrate .. //depot/projects/ethng/src/sys/conf/files.arm#2 integrate .. //depot/projects/ethng/src/sys/conf/files.i386#5 integrate .. //depot/projects/ethng/src/sys/conf/files.ia64#2 integrate .. //depot/projects/ethng/src/sys/conf/files.pc98#2 integrate .. //depot/projects/ethng/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/ethng/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/ethng/src/sys/conf/options.arm#2 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/ethng/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/ethng/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/ethng/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/ethng/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/ethng/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/ethng/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/ethng/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/ethng/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/ethng/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/ethng/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/ethng/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/ethng/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/ethng/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/msi.c#2 integrate .. //depot/projects/ethng/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/ethng/src/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/ethng/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/ethng/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/ethng/src/sys/kern/init_main.c#5 integrate .. //depot/projects/ethng/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_idle.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/ethng/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/ethng/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/ethng/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/ethng/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/ethng/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/ethng/src/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/ethng/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/ethng/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/ethng/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/ethng/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/ethng/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/ethng/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/ethng/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/ethng/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/ethng/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/ethng/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/ethng/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/modules/Makefile#6 integrate .. //depot/projects/ethng/src/sys/modules/geom/Makefile#2 integrate .. //depot/projects/ethng/src/sys/modules/nvram/Makefile#1 branch .. //depot/projects/ethng/src/sys/net/bpf.c#4 integrate .. //depot/projects/ethng/src/sys/net/bsd_comp.c#2 integrate .. //depot/projects/ethng/src/sys/net/if.c#4 integrate .. //depot/projects/ethng/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_disc.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/ethng/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_gif.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_loop.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_stf.c#3 integrate .. //depot/projects/ethng/src/sys/net/if_tun.c#2 integrate .. //depot/projects/ethng/src/sys/net/route.c#8 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/ethng/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/ethng/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/ethng/src/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/ethng/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/ethng/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/ethng/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/ethng/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/ethng/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/ethng/src/sys/sys/gpt.h#3 integrate .. //depot/projects/ethng/src/sys/sys/kthread.h#3 integrate .. //depot/projects/ethng/src/sys/sys/linker.h#2 integrate .. //depot/projects/ethng/src/sys/sys/param.h#7 integrate .. //depot/projects/ethng/src/sys/sys/pciio.h#3 integrate .. //depot/projects/ethng/src/sys/sys/priv.h#2 integrate .. //depot/projects/ethng/src/sys/sys/proc.h#4 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/ethng/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/ethng/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/ethng/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/ethng/src/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/init-a.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/init.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-copy.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-data.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-hmac.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/onetime-a.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/onetime.t#3 integrate .. //depot/projects/ethng/src/usr.bin/awk/Makefile#2 integrate .. //depot/projects/ethng/src/usr.bin/awk/lib.c.diff#2 delete .. //depot/projects/ethng/src/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/ethng/src/usr.bin/top/machine.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/traceroute6/traceroute6.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/wpa/hostapd/hostapd.8#2 integrate Differences ... ==== //depot/projects/ethng/src/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd +OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached @@ -579,11 +581,17 @@ # 20070201: remove libmytinfo link OLD_FILES+=usr/lib/libmytinfo.a OLD_FILES+=usr/lib/libmytinfo.so -OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfow.a +OLD_FILES+=usr/lib/libmytinfow.so +OLD_FILES+=usr/lib/libmytinfow_p.a .if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libmytinfo.a OLD_FILES+=usr/lib32/libmytinfo.so OLD_FILES+=usr/lib32/libmytinfo_p.a +OLD_FILES+=usr/lib32/libmytinfow.a +OLD_FILES+=usr/lib32/libmytinfow.so +OLD_FILES+=usr/lib32/libmytinfow_p.a .endif # 20070128: remove vnconfig OLD_FILES+=usr/sbin/vnconfig ==== //depot/projects/ethng/src/UPDATING#6 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20071024: + It has been decided that it is desirable to provide ABI + backwards compatibility to the FreeBSD 4/5/6 versions of the + PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was + broken with the introduction of PCI domain support (see the + 20070930 entry). Unfortunately, this required the ABI of + PCIOCGETCONF to be broken again in order to be able to + provide backwards compatibility to the old version of that + IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled + again. As for prominent ports this affects neither pciutils + nor xorg-server this time, the hal port needs to be rebuilt + however. + 20071020: The misnamed kthread_create() and friends have been renamed to kproc_create() etc. Many of the callers already @@ -921,4 +934,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $ +$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $ ==== //depot/projects/ethng/src/bin/ps/extern.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $ */ struct kinfo; @@ -39,7 +39,7 @@ extern int cflag, eval, fscale, nlistread, rawcpu; extern unsigned long mempages; extern time_t now; -extern int sumrusage, termwidth, totwidth; +extern int showthreads, sumrusage, termwidth, totwidth; extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS @@ -78,6 +78,7 @@ void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); ==== //depot/projects/ethng/src/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -187,6 +187,8 @@ UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, + {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, + NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, ==== //depot/projects/ethng/src/bin/ps/print.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -129,9 +129,11 @@ v = ve->var; if (cflag) { /* If it is the last field, then don't pad */ - if (STAILQ_NEXT(ve, next_ve) == NULL) + if (STAILQ_NEXT(ve, next_ve) == NULL) { (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); return; } @@ -178,13 +180,28 @@ VAR *v; v = ve->var; - if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); } void +tdnam(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + if (showthreads && k->ki_p->ki_numthreads > 1) + (void)printf("%-*s", v->width, k->ki_p->ki_ocomm); + else + (void)printf("%-*s", v->width, " " ); + +} + +void logname(KINFO *k, VARENT *ve) { VAR *v; ==== //depot/projects/ethng/src/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -98,6 +98,7 @@ int sumrusage; /* -S */ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ +int showthreads; /* will threads be shown? */ struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); @@ -175,7 +176,7 @@ char *cols; int all, ch, elem, flag, _fmt, i, lineno; int nentries, nkept, nselectors; - int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; + int prtheader, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; (void) setlocale(LC_ALL, ""); ==== //depot/projects/ethng/src/contrib/one-true-awk/FIXES#2 (text+ko) ==== @@ -25,6 +25,14 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Oct 23, 2007: + minor fix in lib.c: increase inputFS to 100, change malloc + for fields to n+1. + + fixed memory fault caused by out of order test in setsval. + + thanks to david o'brien, freebsd, for both fixes. + May 1, 2007: fiddle in makefile to fix for BSD make; thanks to igor sobrado. ==== //depot/projects/ethng/src/contrib/one-true-awk/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $ Import of the 2005/04/24 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). -Original sources were taken from the Brian Kernighan's home page -(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -May 01, 2007. +Original sources were taken from the Brian Kernighan's AWK page +http://www.cs.princeton.edu/~bwk/btl.mirror +and include bug fixes up thru Oct 23, 2007. The following files were removed for this import: @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023 ==== //depot/projects/ethng/src/contrib/one-true-awk/lib.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ int fieldssize = RECSIZE; Cell **fldtab; /* pointers to Cells */ -char inputFS[10] = " "; +char inputFS[100] = " "; #define MAXFLD 2 int nfields = MAXFLD; /* last allocated slot for $i */ @@ -58,7 +58,7 @@ void recinit(unsigned int n) { if ( (record = (char *) malloc(n)) == NULL - || (fields = (char *) malloc(n)) == NULL + || (fields = (char *) malloc(n+1)) == NULL || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL ) FATAL("out of space for $0 and fields"); ==== //depot/projects/ethng/src/contrib/one-true-awk/tran.c#2 (text+ko) ==== @@ -332,10 +332,10 @@ donerec = 1; } t = tostring(s); /* in case it's self-assign */ + if (freeable(vp)) + xfree(vp->sval); vp->tval &= ~NUM; vp->tval |= STR; - if (freeable(vp)) - xfree(vp->sval); vp->tval &= ~DONTFREE; dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); ==== //depot/projects/ethng/src/etc/rc.d/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ .include @@ -25,7 +25,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/ethng/src/etc/rc.d/amd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ # # PROVIDE: amd @@ -47,7 +47,7 @@ ;; *) rc_flags="-p ${rc_flags}" - command_args=" > /var/run/amd.pid 2> /dev/null" + command_args="> /var/run/amd.pid 2> /dev/null" ;; esac return 0 ==== //depot/projects/ethng/src/etc/rc.d/named#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $ # # PROVIDE: named @@ -82,20 +82,28 @@ named_reload() { - rndc reload + ${command%/named}/rndc reload } named_stop() { - echo -n "Stopping named" - if rndc stop 2>/dev/null; then - echo . + # This duplicates an undesirably large amount of code from the stop + # routine in rc.subr in order to use rndc to shut down the process, + # and to give it a second chance in case rndc fails. + rc_pid=$(check_pidfile $pidfile $command) + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping named.' + if ${command%/named}/rndc stop 2>/dev/null; then + wait_for_pids $rc_pid else - echo -n ": rndc failed, trying killall: " - if killall named; then - echo . - fi - fi + echo -n 'rndc failed, trying kill: ' + kill -TERM $rc_pid + wait_for_pids $rc_pid + fi } named_poststop() @@ -121,13 +129,13 @@ if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then return 0 fi - confgen_command="rndc-confgen -a -b256 -u $named_uid \ + confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \ -c ${named_chrootdir}/etc/namedb/rndc.key" if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then - if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \ - "$named_uid" ]; then - $confgen_command - fi + case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in + root|$named_uid) ;; + *) $confgen_command ;; + esac else $confgen_command fi ==== //depot/projects/ethng/src/gnu/usr.bin/groff/tmac/mdoc.local#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/gnu/usr.bin/groff/tmac/mdoc.local,v 1.60 2007/10/15 08:06:42 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.61 2007/10/22 10:01:58 ru Exp $ .\" .\" %beginstrip% . @@ -48,6 +48,7 @@ .ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) .ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) .ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) +.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse) .ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) .ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat) .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) ==== //depot/projects/ethng/src/include/_ctype.h#3 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.31 2007/10/13 16:28:21 ache Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $ */ #ifndef __CTYPE_H_ @@ -126,7 +126,7 @@ static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c < 0 || _c >= __mb_sb_limit) ? 0 : + return (_c & ~0x7F) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } ==== //depot/projects/ethng/src/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.224 2007/10/09 23:31:10 obrien Exp $ +# $FreeBSD: src/lib/Makefile,v 1.225 2007/10/26 11:07:25 ru Exp $ .include @@ -7,7 +7,7 @@ # built are visible: # # csu must be built before all shared libaries for ELF. -# libc must be built before all other shared libraries +# libc must be built before all other shared libraries. # libcom_err must be built before libkrb5 and libpam. # libcrypt must be built before libkrb5 and libpam. # libkvm must be built before libdevstat. ==== //depot/projects/ethng/src/lib/libarchive/archive_read_support_compression_none.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.17 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.18 2007/10/27 22:45:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -334,7 +334,7 @@ const void* dummy_buffer; ssize_t bytes_read; bytes_read = archive_decompressor_none_read_ahead(a, - &dummy_buffer, request); + &dummy_buffer, 1); if (bytes_read < 0) return (bytes_read); if (bytes_read == 0) { ==== //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_tar.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.61 2007/08/18 21:53:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.62 2007/10/24 04:01:31 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -164,6 +164,7 @@ struct sparse_block *sparse_last; int64_t sparse_offset; int64_t sparse_numbytes; + int64_t sparse_realsize; int sparse_gnu_major; int sparse_gnu_minor; char sparse_gnu_pending; @@ -440,6 +441,7 @@ free(sp); } tar->sparse_last = NULL; + tar->sparse_realsize = -1; /* Mark this as "unset" */ r = tar_read_header(a, tar, entry); @@ -1388,9 +1390,10 @@ } if (wcscmp(key, L"GNU.sparse.name") == 0) archive_entry_copy_pathname_w(entry, value); - if (wcscmp(key, L"GNU.sparse.realsize") == 0) - archive_entry_set_size(entry, - tar_atol10(value, wcslen(value))); + if (wcscmp(key, L"GNU.sparse.realsize") == 0) { + tar->sparse_realsize = tar_atol10(value, wcslen(value)); + archive_entry_set_size(entry, tar->sparse_realsize); + } break; case 'L': /* Our extensions */ @@ -1471,11 +1474,22 @@ /* POSIX has reserved 'security.*' */ /* Someday: if (wcscmp(key, L"security.acl")==0) { ... } */ if (wcscmp(key, L"size")==0) { - tar->entry_bytes_remaining = tar_atol10(value, wcslen(value)); - archive_entry_set_size(entry, tar->entry_bytes_remaining); + /* "size" is the size of the data in the entry. */ + tar->entry_bytes_remaining + = tar_atol10(value, wcslen(value)); + /* + * But, "size" is not necessarily the size of + * the file on disk; if this is a sparse file, + * the disk size may have already been set from + * GNU.sparse.realsize. + */ + if (tar->sparse_realsize < 0) { + archive_entry_set_size(entry, + tar->entry_bytes_remaining); + tar->sparse_realsize + = tar->entry_bytes_remaining; + } } - tar->entry_bytes_remaining = 0; - break; case 'u': if (wcscmp(key, L"uid")==0) ==== //depot/projects/ethng/src/lib/libc/locale/iswctype.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.9 2007/10/23 17:39:28 ache Exp $"); #include @@ -61,7 +61,7 @@ iswascii(wc) wint_t wc; { - return (wc < 0x80); + return ((wc & ~0x7F) == 0); } #undef iswblank ==== //depot/projects/ethng/src/lib/libc/sys/kldstat.2#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.22 2007/10/22 21:49:39 jb Exp $ .\" .Dd March 3, 1999 .Dt KLDSTAT 2 @@ -53,6 +53,7 @@ int id; caddr_t address; /* load address */ size_t size; /* size in bytes */ + char pathname[MAXPATHLEN]; }; .Ed .Pp @@ -77,6 +78,10 @@ The load address of the kld file. .It size The size of the file. +.It pathname +The full name of the file referred to by +.Fa fileid , +including the path. .El .Sh RETURN VALUES .Rv -std kldstat @@ -123,3 +128,7 @@ .Nm kld interface first appeared in .Fx 3.0 . +.Sh BUGS +The pathname many not be accurate if the file system mounts have +changed since the module was loaded, or if this function is called +within a chrooted environment. ==== //depot/projects/ethng/src/lib/libelf/elf_flagdata.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $ .\" -.Dd August 10, 2006 +.Dd October 22, 2007 .Os .Dt ELF_FLAGDATA 3 .Sh NAME @@ -51,7 +51,7 @@ .Ft "unsigned int" .Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags" .Sh DESCRIPTION -These functions are used to query, set or reset flag bits on data +These functions are used to query, set or reset flags on data structures associated with an ELF file. .Pp Arguments @@ -59,7 +59,7 @@ .Ar elf and .Ar scn -denote the data structures whose status bits need to be changed. +denote the data structures whose flags need to be changed. These values are allowed to be NULL to simplify error handling in application code. .Pp @@ -70,16 +70,16 @@ .It Dv ELF_C_CLR The argument .Ar flags -specifies the bits to be cleared. +specifies the flags to be cleared. .It Dv ELF_C_SET >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 28 03:12:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AAFB16A41A; Sun, 28 Oct 2007 03:12:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF13716A417 for ; Sun, 28 Oct 2007 03:12:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9AB7913C4A5 for ; Sun, 28 Oct 2007 03:12:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9S3CBnZ003555 for ; Sun, 28 Oct 2007 03:12:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9S3C3ZV003550 for perforce@freebsd.org; Sun, 28 Oct 2007 03:12:03 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 03:12:03 GMT Message-Id: <200710280312.l9S3C3ZV003550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 03:12:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=128223 Change 128223 by kmacy@kmacy:storage:toestack on 2007/10/28 03:11:14 IFethng 128222 Affected files ... .. //depot/projects/toestack/ObsoleteFiles.inc#4 integrate .. //depot/projects/toestack/UPDATING#6 integrate .. //depot/projects/toestack/bin/ps/extern.h#2 integrate .. //depot/projects/toestack/bin/ps/keyword.c#2 integrate .. //depot/projects/toestack/bin/ps/print.c#3 integrate .. //depot/projects/toestack/bin/ps/ps.c#3 integrate .. //depot/projects/toestack/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/toestack/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/toestack/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/toestack/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/toestack/etc/rc.d/Makefile#6 integrate .. //depot/projects/toestack/etc/rc.d/amd#3 integrate .. //depot/projects/toestack/etc/rc.d/named#2 integrate .. //depot/projects/toestack/etc/rc.d/nfslocking#2 delete .. //depot/projects/toestack/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/toestack/include/_ctype.h#3 integrate .. //depot/projects/toestack/lib/Makefile#3 integrate .. //depot/projects/toestack/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/toestack/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/toestack/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/toestack/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/toestack/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/toestack/lib/libelf/elf_update.3#3 integrate .. //depot/projects/toestack/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/toestack/lib/libelf/gelf_newphdr.3#3 integrate .. //depot/projects/toestack/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/toestack/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/toestack/lib/libstand/Makefile#3 integrate .. //depot/projects/toestack/lib/libthr/libthr.3#2 integrate .. //depot/projects/toestack/rescue/rescue/Makefile#2 integrate .. //depot/projects/toestack/sbin/gpt/Makefile#2 integrate .. //depot/projects/toestack/sbin/gpt/add.c#2 integrate .. //depot/projects/toestack/sbin/gpt/boot.c#1 branch .. //depot/projects/toestack/sbin/gpt/gpt.8#2 integrate .. //depot/projects/toestack/sbin/gpt/gpt.c#2 integrate .. //depot/projects/toestack/sbin/gpt/gpt.h#2 integrate .. //depot/projects/toestack/sbin/gpt/show.c#2 integrate .. //depot/projects/toestack/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/toestack/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/toestack/share/man/man3/pthread.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_barrier_destroy.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_barrierattr.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_detach.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_exit.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_once.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_spin_init.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_spin_lock.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_switch_add_np.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_testcancel.3#2 integrate .. //depot/projects/toestack/share/man/man3/pthread_yield.3#2 integrate .. //depot/projects/toestack/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/toestack/share/man/man9/Makefile#6 integrate .. //depot/projects/toestack/share/man/man9/kproc.9#2 integrate .. //depot/projects/toestack/share/man/man9/kthread.9#3 integrate .. //depot/projects/toestack/share/misc/committers-doc.dot#2 integrate .. //depot/projects/toestack/share/misc/committers-src.dot#3 integrate .. //depot/projects/toestack/share/mk/sys.mk#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/toestack/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/toestack/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/toestack/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/toestack/sys/amd64/include/clock.h#2 integrate .. //depot/projects/toestack/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/toestack/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/toestack/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/toestack/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/toestack/sys/arm/at91/std.at91#2 integrate .. //depot/projects/toestack/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/toestack/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/toestack/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/toestack/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/toestack/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/toestack/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/toestack/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/toestack/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/toestack/sys/boot/i386/Makefile#2 integrate .. //depot/projects/toestack/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/toestack/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/toestack/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/toestack/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/toestack/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/toestack/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/toestack/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/toestack/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/toestack/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/toestack/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/toestack/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/toestack/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/toestack/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/toestack/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/toestack/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/toestack/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/toestack/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/toestack/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/toestack/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/toestack/sys/conf/files#6 integrate .. //depot/projects/toestack/sys/conf/files.amd64#5 integrate .. //depot/projects/toestack/sys/conf/files.arm#2 integrate .. //depot/projects/toestack/sys/conf/files.i386#4 integrate .. //depot/projects/toestack/sys/conf/files.ia64#2 integrate .. //depot/projects/toestack/sys/conf/files.pc98#2 integrate .. //depot/projects/toestack/sys/conf/files.powerpc#2 integrate .. //depot/projects/toestack/sys/conf/files.sun4v#2 integrate .. //depot/projects/toestack/sys/conf/options.arm#2 integrate .. //depot/projects/toestack/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/toestack/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/toestack/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/toestack/sys/ddb/db_examine.c#2 integrate .. //depot/projects/toestack/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/toestack/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/toestack/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/toestack/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/toestack/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/toestack/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/toestack/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/toestack/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/toestack/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/toestack/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/toestack/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/toestack/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/toestack/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/toestack/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/toestack/sys/geom/geom_io.c#2 integrate .. //depot/projects/toestack/sys/geom/part/g_part.c#3 integrate .. //depot/projects/toestack/sys/geom/part/g_part.h#3 integrate .. //depot/projects/toestack/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/toestack/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/toestack/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/toestack/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/toestack/sys/i386/conf/PAE#2 integrate .. //depot/projects/toestack/sys/i386/i386/msi.c#2 integrate .. //depot/projects/toestack/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/toestack/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/toestack/sys/i386/include/clock.h#2 integrate .. //depot/projects/toestack/sys/i386/isa/clock.c#2 integrate .. //depot/projects/toestack/sys/kern/init_main.c#5 integrate .. //depot/projects/toestack/sys/kern/kern_acct.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_alq.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_environment.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_exec.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_exit.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_fork.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_idle.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_intr.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_jail.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_linker.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/toestack/sys/kern/kern_prot.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_sig.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_thread.c#3 integrate .. //depot/projects/toestack/sys/kern/link_elf.c#2 integrate .. //depot/projects/toestack/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/toestack/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/toestack/sys/kern/sched_ule.c#6 integrate .. //depot/projects/toestack/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/toestack/sys/kern/sys_socket.c#2 integrate .. //depot/projects/toestack/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/toestack/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/toestack/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/toestack/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/toestack/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/toestack/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/toestack/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/toestack/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/toestack/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/toestack/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/toestack/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/toestack/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/toestack/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/toestack/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/toestack/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/toestack/sys/modules/Makefile#5 integrate .. //depot/projects/toestack/sys/modules/geom/Makefile#2 integrate .. //depot/projects/toestack/sys/modules/nvram/Makefile#1 branch .. //depot/projects/toestack/sys/net/bpf.c#4 integrate .. //depot/projects/toestack/sys/net/bsd_comp.c#2 integrate .. //depot/projects/toestack/sys/net/if.c#2 integrate .. //depot/projects/toestack/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/toestack/sys/net/if_disc.c#2 integrate .. //depot/projects/toestack/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/toestack/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/toestack/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/toestack/sys/net/if_gif.c#2 integrate .. //depot/projects/toestack/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/toestack/sys/net/if_loop.c#2 integrate .. //depot/projects/toestack/sys/net/if_ppp.c#2 integrate .. //depot/projects/toestack/sys/net/if_stf.c#3 integrate .. //depot/projects/toestack/sys/net/if_tun.c#2 integrate .. //depot/projects/toestack/sys/net/route.c#4 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/toestack/sys/netatalk/aarp.c#2 integrate .. //depot/projects/toestack/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/toestack/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/toestack/sys/netinet/if_ether.c#5 integrate .. //depot/projects/toestack/sys/netinet/igmp.c#3 integrate .. //depot/projects/toestack/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/toestack/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/toestack/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/toestack/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/toestack/sys/netinet/ip_input.c#3 integrate .. //depot/projects/toestack/sys/netinet/ip_options.c#3 integrate .. //depot/projects/toestack/sys/netinet/ip_output.c#3 integrate .. //depot/projects/toestack/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/toestack/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/toestack/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/toestack/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/toestack/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/toestack/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/toestack/sys/netinet6/nd6.c#2 integrate .. //depot/projects/toestack/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/toestack/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/toestack/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/toestack/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/toestack/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/toestack/sys/security/audit/audit.c#2 integrate .. //depot/projects/toestack/sys/security/audit/audit.h#2 integrate .. //depot/projects/toestack/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/toestack/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/toestack/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/toestack/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/toestack/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/toestack/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/toestack/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/toestack/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/toestack/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/toestack/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/toestack/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/toestack/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/toestack/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/toestack/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/toestack/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/toestack/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/toestack/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/toestack/sys/sys/gpt.h#3 integrate .. //depot/projects/toestack/sys/sys/kthread.h#3 integrate .. //depot/projects/toestack/sys/sys/linker.h#2 integrate .. //depot/projects/toestack/sys/sys/param.h#8 integrate .. //depot/projects/toestack/sys/sys/pciio.h#3 integrate .. //depot/projects/toestack/sys/sys/priv.h#2 integrate .. //depot/projects/toestack/sys/sys/proc.h#4 integrate .. //depot/projects/toestack/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/toestack/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/toestack/sys/vm/swap_pager.c#2 integrate .. //depot/projects/toestack/sys/vm/vm_map.c#3 integrate .. //depot/projects/toestack/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/toestack/sys/vm/vm_page.c#4 integrate .. //depot/projects/toestack/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/toestack/tools/regression/geom_eli/init-a.t#2 integrate .. //depot/projects/toestack/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/toestack/tools/regression/geom_eli/integrity-copy.t#2 integrate .. //depot/projects/toestack/tools/regression/geom_eli/integrity-data.t#2 integrate .. //depot/projects/toestack/tools/regression/geom_eli/integrity-hmac.t#2 integrate .. //depot/projects/toestack/tools/regression/geom_eli/onetime-a.t#2 integrate .. //depot/projects/toestack/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/toestack/usr.bin/awk/Makefile#2 integrate .. //depot/projects/toestack/usr.bin/awk/lib.c.diff#2 delete .. //depot/projects/toestack/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/toestack/usr.bin/top/machine.c#3 integrate .. //depot/projects/toestack/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/toestack/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/toestack/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/toestack/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/toestack/usr.sbin/traceroute6/traceroute6.c#2 integrate .. //depot/projects/toestack/usr.sbin/wpa/hostapd/hostapd.8#2 integrate Differences ... ==== //depot/projects/toestack/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd +OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached @@ -579,11 +581,17 @@ # 20070201: remove libmytinfo link OLD_FILES+=usr/lib/libmytinfo.a OLD_FILES+=usr/lib/libmytinfo.so -OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfow.a +OLD_FILES+=usr/lib/libmytinfow.so +OLD_FILES+=usr/lib/libmytinfow_p.a .if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libmytinfo.a OLD_FILES+=usr/lib32/libmytinfo.so OLD_FILES+=usr/lib32/libmytinfo_p.a +OLD_FILES+=usr/lib32/libmytinfow.a +OLD_FILES+=usr/lib32/libmytinfow.so +OLD_FILES+=usr/lib32/libmytinfow_p.a .endif # 20070128: remove vnconfig OLD_FILES+=usr/sbin/vnconfig ==== //depot/projects/toestack/UPDATING#6 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20071024: + It has been decided that it is desirable to provide ABI + backwards compatibility to the FreeBSD 4/5/6 versions of the + PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was + broken with the introduction of PCI domain support (see the + 20070930 entry). Unfortunately, this required the ABI of + PCIOCGETCONF to be broken again in order to be able to + provide backwards compatibility to the old version of that + IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled + again. As for prominent ports this affects neither pciutils + nor xorg-server this time, the hal port needs to be rebuilt + however. + 20071020: The misnamed kthread_create() and friends have been renamed to kproc_create() etc. Many of the callers already @@ -921,4 +934,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $ +$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $ ==== //depot/projects/toestack/bin/ps/extern.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $ */ struct kinfo; @@ -39,7 +39,7 @@ extern int cflag, eval, fscale, nlistread, rawcpu; extern unsigned long mempages; extern time_t now; -extern int sumrusage, termwidth, totwidth; +extern int showthreads, sumrusage, termwidth, totwidth; extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS @@ -78,6 +78,7 @@ void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); ==== //depot/projects/toestack/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -187,6 +187,8 @@ UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, + {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, + NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, ==== //depot/projects/toestack/bin/ps/print.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -129,9 +129,11 @@ v = ve->var; if (cflag) { /* If it is the last field, then don't pad */ - if (STAILQ_NEXT(ve, next_ve) == NULL) + if (STAILQ_NEXT(ve, next_ve) == NULL) { (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); return; } @@ -178,13 +180,28 @@ VAR *v; v = ve->var; - if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); } void +tdnam(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + if (showthreads && k->ki_p->ki_numthreads > 1) + (void)printf("%-*s", v->width, k->ki_p->ki_ocomm); + else + (void)printf("%-*s", v->width, " " ); + +} + +void logname(KINFO *k, VARENT *ve) { VAR *v; ==== //depot/projects/toestack/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -98,6 +98,7 @@ int sumrusage; /* -S */ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ +int showthreads; /* will threads be shown? */ struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); @@ -175,7 +176,7 @@ char *cols; int all, ch, elem, flag, _fmt, i, lineno; int nentries, nkept, nselectors; - int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; + int prtheader, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; (void) setlocale(LC_ALL, ""); ==== //depot/projects/toestack/contrib/one-true-awk/FIXES#2 (text+ko) ==== @@ -25,6 +25,14 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Oct 23, 2007: + minor fix in lib.c: increase inputFS to 100, change malloc + for fields to n+1. + + fixed memory fault caused by out of order test in setsval. + + thanks to david o'brien, freebsd, for both fixes. + May 1, 2007: fiddle in makefile to fix for BSD make; thanks to igor sobrado. ==== //depot/projects/toestack/contrib/one-true-awk/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $ Import of the 2005/04/24 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). -Original sources were taken from the Brian Kernighan's home page -(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -May 01, 2007. +Original sources were taken from the Brian Kernighan's AWK page +http://www.cs.princeton.edu/~bwk/btl.mirror +and include bug fixes up thru Oct 23, 2007. The following files were removed for this import: @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023 ==== //depot/projects/toestack/contrib/one-true-awk/lib.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ int fieldssize = RECSIZE; Cell **fldtab; /* pointers to Cells */ -char inputFS[10] = " "; +char inputFS[100] = " "; #define MAXFLD 2 int nfields = MAXFLD; /* last allocated slot for $i */ @@ -58,7 +58,7 @@ void recinit(unsigned int n) { if ( (record = (char *) malloc(n)) == NULL - || (fields = (char *) malloc(n)) == NULL + || (fields = (char *) malloc(n+1)) == NULL || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL ) FATAL("out of space for $0 and fields"); ==== //depot/projects/toestack/contrib/one-true-awk/tran.c#2 (text+ko) ==== @@ -332,10 +332,10 @@ donerec = 1; } t = tostring(s); /* in case it's self-assign */ + if (freeable(vp)) + xfree(vp->sval); vp->tval &= ~NUM; vp->tval |= STR; - if (freeable(vp)) - xfree(vp->sval); vp->tval &= ~DONTFREE; dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); ==== //depot/projects/toestack/etc/rc.d/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ .include @@ -25,7 +25,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/toestack/etc/rc.d/amd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ # # PROVIDE: amd @@ -47,7 +47,7 @@ ;; *) rc_flags="-p ${rc_flags}" - command_args=" > /var/run/amd.pid 2> /dev/null" + command_args="> /var/run/amd.pid 2> /dev/null" ;; esac return 0 ==== //depot/projects/toestack/etc/rc.d/named#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $ # # PROVIDE: named @@ -82,20 +82,28 @@ named_reload() { - rndc reload + ${command%/named}/rndc reload } named_stop() { - echo -n "Stopping named" - if rndc stop 2>/dev/null; then - echo . + # This duplicates an undesirably large amount of code from the stop + # routine in rc.subr in order to use rndc to shut down the process, + # and to give it a second chance in case rndc fails. + rc_pid=$(check_pidfile $pidfile $command) + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping named.' + if ${command%/named}/rndc stop 2>/dev/null; then + wait_for_pids $rc_pid else - echo -n ": rndc failed, trying killall: " - if killall named; then - echo . - fi - fi + echo -n 'rndc failed, trying kill: ' + kill -TERM $rc_pid + wait_for_pids $rc_pid + fi } named_poststop() @@ -121,13 +129,13 @@ if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then return 0 fi - confgen_command="rndc-confgen -a -b256 -u $named_uid \ + confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \ -c ${named_chrootdir}/etc/namedb/rndc.key" if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then - if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \ - "$named_uid" ]; then - $confgen_command - fi + case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in + root|$named_uid) ;; + *) $confgen_command ;; + esac else $confgen_command fi ==== //depot/projects/toestack/gnu/usr.bin/groff/tmac/mdoc.local#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/gnu/usr.bin/groff/tmac/mdoc.local,v 1.60 2007/10/15 08:06:42 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.61 2007/10/22 10:01:58 ru Exp $ .\" .\" %beginstrip% . @@ -48,6 +48,7 @@ .ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) .ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) .ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) +.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse) .ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) .ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat) .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) ==== //depot/projects/toestack/include/_ctype.h#3 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.31 2007/10/13 16:28:21 ache Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $ */ #ifndef __CTYPE_H_ @@ -126,7 +126,7 @@ static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c < 0 || _c >= __mb_sb_limit) ? 0 : + return (_c & ~0x7F) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } ==== //depot/projects/toestack/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.224 2007/10/09 23:31:10 obrien Exp $ +# $FreeBSD: src/lib/Makefile,v 1.225 2007/10/26 11:07:25 ru Exp $ .include @@ -7,7 +7,7 @@ # built are visible: # # csu must be built before all shared libaries for ELF. -# libc must be built before all other shared libraries +# libc must be built before all other shared libraries. # libcom_err must be built before libkrb5 and libpam. # libcrypt must be built before libkrb5 and libpam. # libkvm must be built before libdevstat. ==== //depot/projects/toestack/lib/libarchive/archive_read_support_compression_none.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.17 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.18 2007/10/27 22:45:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -334,7 +334,7 @@ const void* dummy_buffer; ssize_t bytes_read; bytes_read = archive_decompressor_none_read_ahead(a, - &dummy_buffer, request); + &dummy_buffer, 1); if (bytes_read < 0) return (bytes_read); if (bytes_read == 0) { ==== //depot/projects/toestack/lib/libarchive/archive_read_support_format_tar.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.61 2007/08/18 21:53:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.62 2007/10/24 04:01:31 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -164,6 +164,7 @@ struct sparse_block *sparse_last; int64_t sparse_offset; int64_t sparse_numbytes; + int64_t sparse_realsize; int sparse_gnu_major; int sparse_gnu_minor; char sparse_gnu_pending; @@ -440,6 +441,7 @@ free(sp); } tar->sparse_last = NULL; + tar->sparse_realsize = -1; /* Mark this as "unset" */ r = tar_read_header(a, tar, entry); @@ -1388,9 +1390,10 @@ } if (wcscmp(key, L"GNU.sparse.name") == 0) archive_entry_copy_pathname_w(entry, value); - if (wcscmp(key, L"GNU.sparse.realsize") == 0) - archive_entry_set_size(entry, - tar_atol10(value, wcslen(value))); + if (wcscmp(key, L"GNU.sparse.realsize") == 0) { + tar->sparse_realsize = tar_atol10(value, wcslen(value)); + archive_entry_set_size(entry, tar->sparse_realsize); + } break; case 'L': /* Our extensions */ @@ -1471,11 +1474,22 @@ /* POSIX has reserved 'security.*' */ /* Someday: if (wcscmp(key, L"security.acl")==0) { ... } */ if (wcscmp(key, L"size")==0) { - tar->entry_bytes_remaining = tar_atol10(value, wcslen(value)); - archive_entry_set_size(entry, tar->entry_bytes_remaining); + /* "size" is the size of the data in the entry. */ + tar->entry_bytes_remaining + = tar_atol10(value, wcslen(value)); + /* + * But, "size" is not necessarily the size of + * the file on disk; if this is a sparse file, + * the disk size may have already been set from + * GNU.sparse.realsize. + */ + if (tar->sparse_realsize < 0) { + archive_entry_set_size(entry, + tar->entry_bytes_remaining); + tar->sparse_realsize + = tar->entry_bytes_remaining; + } } - tar->entry_bytes_remaining = 0; - break; case 'u': if (wcscmp(key, L"uid")==0) ==== //depot/projects/toestack/lib/libc/locale/iswctype.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.9 2007/10/23 17:39:28 ache Exp $"); #include @@ -61,7 +61,7 @@ iswascii(wc) wint_t wc; { - return (wc < 0x80); + return ((wc & ~0x7F) == 0); } #undef iswblank ==== //depot/projects/toestack/lib/libc/sys/kldstat.2#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.22 2007/10/22 21:49:39 jb Exp $ .\" .Dd March 3, 1999 .Dt KLDSTAT 2 @@ -53,6 +53,7 @@ int id; caddr_t address; /* load address */ size_t size; /* size in bytes */ + char pathname[MAXPATHLEN]; }; .Ed .Pp @@ -77,6 +78,10 @@ The load address of the kld file. .It size The size of the file. +.It pathname +The full name of the file referred to by +.Fa fileid , +including the path. .El .Sh RETURN VALUES .Rv -std kldstat @@ -123,3 +128,7 @@ .Nm kld interface first appeared in .Fx 3.0 . +.Sh BUGS +The pathname many not be accurate if the file system mounts have +changed since the module was loaded, or if this function is called +within a chrooted environment. ==== //depot/projects/toestack/lib/libelf/elf_flagdata.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $ .\" -.Dd August 10, 2006 +.Dd October 22, 2007 .Os .Dt ELF_FLAGDATA 3 .Sh NAME @@ -51,7 +51,7 @@ .Ft "unsigned int" .Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags" .Sh DESCRIPTION -These functions are used to query, set or reset flag bits on data +These functions are used to query, set or reset flags on data structures associated with an ELF file. .Pp Arguments @@ -59,7 +59,7 @@ .Ar elf and .Ar scn -denote the data structures whose status bits need to be changed. +denote the data structures whose flags need to be changed. These values are allowed to be NULL to simplify error handling in application code. .Pp @@ -70,16 +70,16 @@ .It Dv ELF_C_CLR The argument .Ar flags -specifies the bits to be cleared. +specifies the flags to be cleared. .It Dv ELF_C_SET >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 28 03:31:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2520B16A419; Sun, 28 Oct 2007 03:31:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B40E516A41B for ; Sun, 28 Oct 2007 03:31:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A29E713C48A for ; Sun, 28 Oct 2007 03:31:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9S3VVje005272 for ; Sun, 28 Oct 2007 03:31:31 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9S3VVBT005269 for perforce@freebsd.org; Sun, 28 Oct 2007 03:31:31 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 03:31:31 GMT Message-Id: <200710280331.l9S3VVBT005269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 03:31:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=128224 Change 128224 by kmacy@kmacy:storage:toestack on 2007/10/28 03:30:37 make sure to call tcp_output on connect if we aren't offloading Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#3 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#3 (text+ko) ==== @@ -16,17 +16,19 @@ int ofld_rcvd(struct tcpcb *tp); + static __inline int tcp_gen_connect(struct socket *so, struct sockaddr *nam) { int error; struct tcpcb *tp = sototcpcb(so); - if (SO_OFFLOADABLE(so)) - error = ofld_connect(so, nam); - else + if (!SO_OFFLOADABLE(so) || (error = ofld_connect(so, nam)) == 0) error = tcp_output(tp); - + else + printf("connection offloaded\n"); + + return (error); } From owner-p4-projects@FreeBSD.ORG Sun Oct 28 03:33:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2D3416A420; Sun, 28 Oct 2007 03:33:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FFF916A41A for ; Sun, 28 Oct 2007 03:33:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D55F13C48A for ; Sun, 28 Oct 2007 03:33:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9S3XY4G005488 for ; Sun, 28 Oct 2007 03:33:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9S3XYY6005485 for perforce@freebsd.org; Sun, 28 Oct 2007 03:33:34 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 03:33:34 GMT Message-Id: <200710280333.l9S3XYY6005485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 03:33:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=128225 Change 128225 by kmacy@kmacy:storage:toestack on 2007/10/28 03:32:55 fix offload path so that offload can actually be enabled disable offload by default until an outstanding bug with t3_offload_tx is fixed Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#5 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#11 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#7 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#8 edit .. //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#3 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#6 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#5 (text+ko) ==== @@ -95,6 +95,9 @@ typedef void (*arp_failure_handler_func)(struct t3cdev *dev, struct mbuf *m); +typedef void (*opaque_arp_failure_handler_func)(void *dev, + struct mbuf *m); + /* * Callback stored in an skb to handle address resolution failure. */ @@ -108,11 +111,13 @@ #define L2T_MBUF_CB(skb) ((struct l2t_mbuf_cb *)(skb)->cb) -static __inline void set_arp_failure_handler(struct toe_mbuf *m, +static __inline void set_arp_failure_handler(struct mbuf *m, arp_failure_handler_func hnd) { - m->m_toe.mt_arp_fail = hnd; - panic("implement me"); + struct toe_mbuf *tm = (struct toe_mbuf *)m; + + tm->m_toe.mt_arp_fail = (opaque_arp_failure_handler_func)hnd; + } /* ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#11 (text+ko) ==== @@ -120,10 +120,7 @@ static int cxgb_get_regs_len(void); static int offload_open(struct port_info *pi); static void touch_bars(device_t dev); - -#ifdef notyet static int offload_close(struct t3cdev *tdev); -#endif static device_method_t cxgb_controller_methods[] = { DEVMETHOD(device_probe, cxgb_controller_probe), @@ -206,7 +203,7 @@ * The driver enables offload as a default. * To disable it, use ofld_disable = 1. */ -static int ofld_disable = 0; +static int ofld_disable = 1; TUNABLE_INT("hw.cxgb.ofld_disable", &ofld_disable); SYSCTL_UINT(_hw_cxgb, OID_AUTO, ofld_disable, CTLFLAG_RDTUN, &ofld_disable, 0, "disable ULP offload"); @@ -694,14 +691,14 @@ bus_generic_detach(sc->dev); if (sc->tq != NULL) taskqueue_free(sc->tq); -#ifdef notyet if (is_offload(sc)) { cxgb_adapter_unofld(sc); if (isset(&sc->open_device_map, OFFLOAD_DEVMAP_BIT)) offload_close(&sc->tdev); - } -#endif - + else + printf("cxgb_free: DEVMAP_BIT not set\n"); + } else + printf("not offloading set\n"); #ifndef IFNET_MULTIQUEUE t3_free_sge_resources(sc); #endif @@ -1039,7 +1036,7 @@ ether_ifdetach(p->ifp); printf("waiting for callout to stop ..."); - DELAY(100000); + DELAY(1000000); printf("done\n"); /* * the lock may be acquired in ifdetach @@ -1289,9 +1286,7 @@ { int ret; - critical_enter(); ret = t3_offload_tx(tdev, m); - critical_exit(); return (ret); } @@ -1606,15 +1601,22 @@ offload_open(struct port_info *pi) { struct adapter *adapter = pi->adapter; - struct t3cdev *tdev = T3CDEV(pi->ifp); + struct t3cdev *tdev = &adapter->tdev; +#ifdef notyet + T3CDEV(pi->ifp); +#endif int adap_up = adapter->open_device_map & PORT_MASK; int err = 0; + printf("device_map=0x%x\n", adapter->open_device_map); if (atomic_cmpset_int(&adapter->open_device_map, - (adapter->open_device_map & ~OFFLOAD_DEVMAP_BIT), - (adapter->open_device_map | OFFLOAD_DEVMAP_BIT)) == 0) + (adapter->open_device_map & ~(1<open_device_map | (1<open_device_map, OFFLOAD_DEVMAP_BIT)) + printf("offload_open: DEVMAP_BIT did not get set 0x%x\n", adapter->open_device_map); ADAPTER_LOCK(pi->adapter); if (!adap_up) err = cxgb_up(adapter); @@ -1623,7 +1625,7 @@ return (err); t3_tp_set_offload_mode(adapter, 1); - tdev->lldev = adapter->port[0].ifp; + tdev->lldev = pi->ifp; err = cxgb_offload_activate(adapter); if (err) goto out; @@ -1647,15 +1649,18 @@ } return (err); } -#ifdef notyet + static int offload_close(struct t3cdev *tdev) { struct adapter *adapter = tdev2adap(tdev); - if (!isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT)) + if (!isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT)) { + printf("offload_close: DEVMAP_BIT not set\n"); + return (0); - + } + /* Call back all registered clients */ cxgb_remove_clients(tdev); tdev->lldev = NULL; @@ -1663,13 +1668,15 @@ t3_tp_set_offload_mode(adapter, 0); clrbit(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT); + ADAPTER_LOCK(adapter); if (!adapter->open_device_map) - cxgb_down(adapter); - + cxgb_down_locked(adapter); + else + ADAPTER_UNLOCK(adapter); cxgb_offload_deactivate(adapter); return (0); } -#endif + static void cxgb_init(void *arg) ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#7 (text+ko) ==== @@ -629,7 +629,7 @@ t3_free_qset(qs->port->adapter, qs); qs->qs_flags &= ~QS_RUNNING; - kthread_exit(0); + kproc_exit(0); } static int @@ -663,7 +663,7 @@ qs->qs_cpuid = ((pi->first_qset + j) % mp_ncpus); device_printf(sc->dev, "starting thread for %d\n", qs->qs_cpuid); - kthread_create(cxgb_pcpu_start_proc, qs, &p, + kproc_create(cxgb_pcpu_start_proc, qs, &p, RFNOWAIT, 0, "cxgbsp"); DELAY(200); } ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#8 (text+ko) ==== @@ -1281,7 +1281,7 @@ cxgb_alloc_mem(unsigned long size) { - return malloc(size, M_DEVBUF, M_ZERO); + return malloc(size, M_DEVBUF, M_ZERO|M_NOWAIT); } /* @@ -1320,8 +1320,8 @@ t->afree = NULL; t->stids_in_use = t->atids_in_use = 0; atomic_set_int(&t->tids_in_use, 0); - mtx_init(&t->stid_lock, "stid", NULL, MTX_DEF); - mtx_init(&t->atid_lock, "atid", NULL, MTX_DEF); + mtx_init(&t->stid_lock, "stid", NULL, MTX_DUPOK|MTX_DEF); + mtx_init(&t->atid_lock, "atid", NULL, MTX_DUPOK|MTX_DEF); /* * Setup the free lists for stid_tab and atid_tab. @@ -1376,7 +1376,7 @@ struct mtutab mtutab; unsigned int l2t_capacity; - t = malloc(sizeof(*t), M_DEVBUF, M_WAITOK); + t = malloc(sizeof(*t), M_DEVBUF, M_WAITOK|M_ZERO); if (!t) return (ENOMEM); @@ -1386,25 +1386,32 @@ dev->ctl(dev, GET_L2T_CAPACITY, &l2t_capacity) < 0 || dev->ctl(dev, GET_MTUS, &mtutab) < 0 || dev->ctl(dev, GET_TID_RANGE, &tid_range) < 0 || - dev->ctl(dev, GET_STID_RANGE, &stid_range) < 0) + dev->ctl(dev, GET_STID_RANGE, &stid_range) < 0) { + device_printf(adapter->dev, "%s: dev->ctl check failed\n", __FUNCTION__); goto out_free; - + } + err = (ENOMEM); L2DATA(dev) = t3_init_l2t(l2t_capacity); - if (!L2DATA(dev)) + if (!L2DATA(dev)) { + device_printf(adapter->dev, "%s: t3_init_l2t failed\n", __FUNCTION__); goto out_free; + } + natids = min(tid_range.num / 2, MAX_ATIDS); err = init_tid_tabs(&t->tid_maps, tid_range.num, natids, stid_range.num, ATID_BASE, stid_range.base); - if (err) + if (err) { + device_printf(adapter->dev, "%s: init_tid_tabs failed\n", __FUNCTION__); goto out_free_l2t; - + } + t->mtus = mtutab.mtus; t->nmtus = mtutab.size; TASK_INIT(&t->tid_release_task, 0 /* XXX? */, t3_process_tid_release_list, dev); - mtx_init(&t->tid_release_lock, "tid release", NULL, MTX_DEF); + mtx_init(&t->tid_release_lock, "tid release", NULL, MTX_DUPOK|MTX_DEF); t->dev = dev; T3C_DATA (dev) = t; @@ -1420,15 +1427,21 @@ log(LOG_ERR, "Unable to set offload capabilities\n"); #endif } + printf("adding adapter %p\n", adapter); add_adapter(adapter); - return 0; + device_printf(adapter->dev, "offload started\n"); +#if 0 + printf("failing as test\n"); + return (ENOMEM); +#endif + return (0); out_free_l2t: t3_free_l2t(L2DATA(dev)); L2DATA(dev) = NULL; out_free: free(t, M_DEVBUF); - return err; + return (err); } @@ -1438,6 +1451,7 @@ struct t3cdev *tdev = &adapter->tdev; struct t3c_data *t = T3C_DATA(tdev); + printf("removing adapter %p\n", adapter); remove_adapter(adapter); if (TAILQ_EMPTY(&adapter_list)) { #if defined(CONFIG_CHELSIO_T3_MODULE) @@ -1507,10 +1521,8 @@ { int i; - if (inited) + if (inited++) return; - else - inited = 1; mtx_init(&cxgb_db_lock, "ofld db", NULL, MTX_DEF); rw_init(&adapter_list_lock, "ofld adap list"); @@ -1554,12 +1566,10 @@ void cxgb_offload_exit(void) { - static int deinited = 0; - if (deinited) + if (--inited) return; - deinited = 1; mtx_destroy(&cxgb_db_lock); rw_destroy(&adapter_list_lock); #if 0 ==== //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#3 (text+ko) ==== @@ -4,7 +4,7 @@ #define T3CNAMSIZ 16 /* Get the t3cdev associated with an ifnet */ -#define T3CDEV(ifp) (struct t3cdev *)((ifp)->if_spare2) +#define T3CDEV(ifp) (&(((struct port_info *)(ifp)->if_softc))->adapter->tdev) struct cxgb3_client; ==== //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#6 (text+ko) ==== @@ -166,7 +166,7 @@ struct toepcb; struct m_toe_ { - void (*mt_arp_fail)(struct t3cdev *, struct mbuf *); + void (*mt_arp_fail)(void *, struct mbuf *); void (*mt_backlog_rcv)(struct toepcb *, struct mbuf *); int priority; struct toepcb *mt_toepcb; ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 (text+ko) ==== @@ -406,7 +406,7 @@ m = (struct toe_mbuf *)m_gethdr(MT_DATA, M_WAITOK); m->m_toe.mt_toepcb = tp->t_toe; - set_arp_failure_handler(m, act_open_req_arp_failure); + set_arp_failure_handler((struct mbuf *)m, act_open_req_arp_failure); if ((err = init_offload_socket(so, tdev, atid, e, dst))) return (err); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Oct 28 17:59:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C088016A468; Sun, 28 Oct 2007 17:59:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6432D16A417; Sun, 28 Oct 2007 17:59:07 +0000 (UTC) (envelope-from zec@icir.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id CA04913C4AC; Sun, 28 Oct 2007 17:59:06 +0000 (UTC) (envelope-from zec@icir.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 6F35D9B64D; Sun, 28 Oct 2007 18:59:04 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, HTML_MESSAGE autolearn=ham version=3.1.7 Received: from [192.168.200.100] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id C49869B64D; Sun, 28 Oct 2007 18:59:02 +0100 (CET) From: Marko Zec To: Julian Elischer Date: Sun, 28 Oct 2007 18:59:00 +0100 User-Agent: KMail/1.9.7 References: <200710250015.l9P0FXwh015801@repoman.freebsd.org> <472028E6.6090809@elischer.org> In-Reply-To: <472028E6.6090809@elischer.org> MIME-Version: 1.0 Message-Id: <200710281859.00823.zec@icir.org> Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Perforce Change Reviews , Marko Zec Subject: Re: PERFORCE change 128041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 17:59:08 -0000 On Thursday 25 October 2007 07:25:58 Julian Elischer wrote: > Marko Zec wrote: > > http://perforce.freebsd.org/chv.cgi?CH=128041 > > > > Change 128041 by zec@zec_tpx32 on 2007/10/25 00:15:01 > > > > A hack to allow for bpf taps to be open directly on ifnets > > attached to foreign vnets. > > > > ifname@vimage_name is the form that should be used for > > tcpdump or ethereal to attach directly to an ifnet in > > a foerign vnet. > > by definition it would have to be a child vnet right? Yes. vimage_by_name(struct thread *toplevel, char *name) searches for a vimage bellow the position in the hierarchy pointed by toplevel, so it can never return a ptr to a vimage above the toplevel position, i.e. it can find only children of *toplevel. > > Affected files ... > > > > .. //depot/projects/vimage/src/sys/net/bpf.c#15 edit > > > > Differences ... > > > > ==== //depot/projects/vimage/src/sys/net/bpf.c#15 (text+ko) ==== > > > > @@ -1156,9 +1156,32 @@ > > struct bpf_if *bp; > > struct ifnet *theywant; > > > > +#define IMUNES_BPF_HACK > > +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK) > > + struct vnet *target_vnet = curvnet; > > + char *c; > > + > > + /* Hack to support tapping in foreign vnets */ > > + c = rindex(ifr->ifr_name, '@'); > > + if ( c != NULL ) { > > + struct vimage *target_vimage; > > + > > + *c++ = 0; > > + target_vimage = vimage_by_name(TD_TO_VIMAGE(curthread), c); > > + if (target_vimage == NULL) > > + return ENXIO; > > + target_vnet = target_vimage->v_net; > > + } > > + CURVNET_SET_QUIET(target_vnet); > > +#endif > > + > > theywant = ifunit(ifr->ifr_name); > > - if (theywant == NULL || theywant->if_bpf == NULL) > > + if (theywant == NULL || theywant->if_bpf == NULL) { > > +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK) > > + CURVNET_RESTORE(); > > +#endif > > return (ENXIO); > > + } > > > > bp = theywant->if_bpf; > > /* > > @@ -1180,6 +1203,9 @@ > > BPFD_LOCK(d); > > reset_d(d); > > BPFD_UNLOCK(d); > > +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK) > > + CURVNET_RESTORE(); > > +#endif > > return (0); > > } From owner-p4-projects@FreeBSD.ORG Sun Oct 28 20:48:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CEBF16A41A; Sun, 28 Oct 2007 20:48:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66C1D16A419 for ; Sun, 28 Oct 2007 20:48:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 546D413C481 for ; Sun, 28 Oct 2007 20:48:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SKmUph044243 for ; Sun, 28 Oct 2007 20:48:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SKmThf044240 for perforce@freebsd.org; Sun, 28 Oct 2007 20:48:29 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 20:48:29 GMT Message-Id: <200710282048.l9SKmThf044240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 20:48:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=128247 Change 128247 by jb@jb_freebsd1 on 2007/10/28 20:47:42 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#43 integrate .. //depot/projects/dtrace/ports/Mk/bsd.java.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.lua.mk#9 integrate .. //depot/projects/dtrace/src/bin/ps/keyword.c#5 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#21 integrate .. //depot/projects/dtrace/src/include/_ctype.h#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_none.c#9 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#13 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#20 integrate .. //depot/projects/dtrace/src/sys/conf/files#48 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci_link.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#24 integrate .. //depot/projects/dtrace/src/sys/netatalk/aarp.c#7 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/igmp.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#13 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#9 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#13 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#11 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_net.c#11 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#7 integrate .. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#11 integrate .. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#10 integrate .. //depot/projects/dtrace/www/en/features.sgml#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#43 (text+ko) ==== @@ -1,7 +1,7 @@ 700054 + 700055 after ABI backwards compatibility + to the FreeBSD 4/5/6 versions of the PCIOCGETCONF, + PCIOCREAD and PCIOCWRITE IOCTLs was MFC'ed, which + required the ABI of the PCIOCGETCONF IOCTL to be + broken again + 700055 + 8.0-CURRENT. Separating wide and single byte ctype. 800000 @@ -11604,7 +11611,7 @@ to the FreeBSD 4/5/6 versions of the PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs was added, which required the ABI of the PCIOCGETCONF IOCTL to be - broken again + broken again 800003 ==== //depot/projects/dtrace/ports/Mk/bsd.java.mk#6 (text+ko) ==== @@ -9,7 +9,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.java.mk,v 1.81 2007/10/07 14:42:03 glewis Exp $ +# $FreeBSD: ports/Mk/bsd.java.mk,v 1.82 2007/10/28 15:09:43 hq Exp $ # .if !defined(Java_Include) @@ -25,7 +25,7 @@ # # JAVA_VERSION List of space-separated suitable java versions for the # port. An optional "+" allows you to specify a range of -# versions. (allowed values: 1.1[+] 1.2[+] 1.3[+] 1.4[+]) +# versions. (allowed values: 1.3[+] 1.4[+] 1.5[+] 1.6[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -70,13 +70,13 @@ # '/usr/local/jdk1.3.1') # # JAVAC Path to the Java compiler to use. (e.g. -# '/usr/local/jdk1.1.8/bin/javac' or '/usr/local/bin/jikes') +# '/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/jikes') # # JAR Path to the JAR tool to use. (e.g. -# '/usr/local/jdk1.2.2/bin/jar' or '/usr/local/bin/fastjar') +# '/usr/local/jdk1.5.0/bin/jar' or '/usr/local/bin/fastjar') # # APPLETVIEWER Path to the appletviewer utility. (e.g. -# '/usr/local/linux-jdk1.2.2/bin/appletviewer') +# '/usr/local/linux-jdk1.3.1/bin/appletviewer') # # JAVA Path to the java executable. Use this for executing Java # programs. (e.g. '/usr/local/jdk1.3.1/bin/java') @@ -87,13 +87,11 @@ # # JAVAP Path to the javap program. # -# JAVA_KEYTOOL Path to the keytool utility program. This settings is -# availble only if the JDK is Java 1.2 or higher. +# JAVA_KEYTOOL Path to the keytool utility program. # # JAVA_N2A Path to the native2ascii tool. # -# JAVA_POLICYTOOL Path to the policytool program. This variable is available -# only if the JDK is Java 1.2 or higher. +# JAVA_POLICYTOOL Path to the policytool program. # # JAVA_SERIALVER Path to the serialver utility program. # @@ -101,12 +99,10 @@ # # RMIREGISTRY Path to the RMI registry program, rmiregistry. # -# RMID Path to the RMI daemon program. This settings is only -# available if the JDK is Java 1.2 or higher. +# RMID Path to the RMI daemon program. # # JAVA_CLASSES Path to the archive that contains the JDK class files. On -# JDK 1.2 or later, this is ${JAVA_HOME}/jre/lib/rt.jar. -# Earlier JDK's use ${JAVA_HOME}/lib/classes.zip. +# most JDKs, this is ${JAVA_HOME}/jre/lib/rt.jar. # # JAVASHAREDIR The base directory for all shared Java resources. # @@ -166,8 +162,8 @@ . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5 1.6 -_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} +__JAVA_VERSION_LIST= 1.3 1.4 1.5 1.6 +_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} 1.1+ 1.2+ _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown @@ -175,10 +171,6 @@ # port location, corresponding JAVA_HOME, JDK version, OS, vendor _JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \ VERSION=1.5.0 OS=native VENDOR=freebsd -_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO= PORT=java/jdk11 HOME=${LOCALBASE}/jdk1.1.8 \ - VERSION=1.1.8 OS=native VENDOR=bsdjava -_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO= PORT=java/jdk12 HOME=${LOCALBASE}/jdk1.2.2 \ - VERSION=1.2.2 OS=native VENDOR=bsdjava _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO= PORT=java/jdk13 HOME=${LOCALBASE}/jdk1.3.1 \ VERSION=1.3.1 OS=native VENDOR=bsdjava _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO= PORT=java/jdk14 HOME=${LOCALBASE}/jdk1.4.2 \ @@ -187,12 +179,8 @@ VERSION=1.5.0 OS=native VENDOR=bsdjava _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO= PORT=java/jdk16 HOME=${LOCALBASE}/jdk1.6.0 \ VERSION=1.6.0 OS=native VENDOR=bsdjava -_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO= PORT=java/linux-blackdown-jdk12 HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \ - VERSION=1.2.2 OS=linux VENDOR=blackdown _JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \ VERSION=1.4.2 OS=linux VENDOR=blackdown -_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO= PORT=java/linux-sun-jdk12 HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \ - VERSION=1.2.2 OS=linux VENDOR=sun _JAVA_PORT_LINUX_SUN_JDK_1_3_INFO= PORT=java/linux-sun-jdk13 HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \ VERSION=1.3.1 OS=linux VENDOR=sun _JAVA_PORT_LINUX_SUN_JDK_1_4_INFO= PORT=java/linux-sun-jdk14 HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \ @@ -226,15 +214,11 @@ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \ - JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \ - JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \ JAVA_PORT_LINUX_SUN_JDK_1_6 \ JAVA_PORT_LINUX_SUN_JDK_1_5 \ JAVA_PORT_LINUX_SUN_JDK_1_4 \ JAVA_PORT_LINUX_SUN_JDK_1_3 \ - JAVA_PORT_LINUX_SUN_JDK_1_2 \ - JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \ - JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2 + JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ ${_JAVA_PREFERRED_PORTS} \ ${__JAVA_PORTS_ALL} @@ -308,7 +292,7 @@ . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5 1.6/:S/1.2+/1.2 1.3 1.4 1.5 1.6/:S/1.3+/1.3 1.4 1.5 1.6/:S/1.4+/1.4 1.5 1.6/:S/1.5+/1.5 1.6/:S/1.6+/1.6/} +_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.3+/:S/1.2+/1.3+/:S/1.3+/1.3 1.4+/:S/1.4+/1.4 1.5+/:S/1.5+/1.5 1.6+/:S/1.6+/1.6/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif @@ -490,20 +474,12 @@ JAVA_SERIALVER?=${JAVA_HOME}/bin/serialver RMIC?= ${JAVA_HOME}/bin/rmic RMIREGISTRY?= ${JAVA_HOME}/bin/rmiregistry - -# Some executables only exists in JDK 1.2 and up -. if ${_JAVA_PORT} != "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1" JAVA_KEYTOOL?= ${JAVA_HOME}/bin/keytool JAVA_POLICYTOOL?= ${JAVA_HOME}/bin/policytool RMID?= ${JAVA_HOME}/bin/rmid -. endif # Set the location of the ZIP or JAR file with all standard Java classes. -. if ${_JAVA_PORT} == "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1" -JAVA_CLASSES= ${JAVA_HOME}/lib/classes.zip -. else JAVA_CLASSES= ${JAVA_HOME}/jre/lib/rt.jar -. endif #------------------------------------------------------------------------------- ==== //depot/projects/dtrace/ports/Mk/bsd.lua.mk#9 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.13 2007/04/11 03:22:34 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.14 2007/10/28 19:43:49 pav Exp $ # # bsd.lua.mk - Support for Lua based ports. # @@ -38,7 +38,7 @@ # Other components (modules): # 5.0 - app, compat51, dfui, filename, gettext, # posix, pty, socket. -# 5.1 - filename, gettext, posix, pty. +# 5.1 - filename, gettext, posix, pty, socket. # The available dependency types are: # build - Requires component for building. # lib - Requires component for building and running. @@ -159,7 +159,7 @@ _LUA_PORT_gettext_5.0= devel/lua50-gettext _LUA_PORT_posix_5.0= devel/lua50-posix _LUA_PORT_pty_5.0= devel/lua50-pty -_LUA_PORT_socket_5.0= net/luasocket +_LUA_PORT_socket_5.0= net/lua50-luasocket _LUA_PORT_lua_5.1= lang/lua _LUA_DEPTYPE_lua_5.1= build @@ -168,6 +168,7 @@ _LUA_PORT_gettext_5.1= devel/lua-gettext _LUA_PORT_posix_5.1= devel/lua-posix _LUA_PORT_pty_5.1= devel/lua-pty +_LUA_PORT_socket_5.1= net/luasocket . for comp in ${_LUA_COMPS_ALL} _LUA_COMP= ${comp} ==== //depot/projects/dtrace/src/bin/ps/keyword.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $"); #include #include @@ -186,9 +186,8 @@ {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, + {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, - {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, - NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, ==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#21 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.243 2007/10/21 05:16:52 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.244 2007/10/28 07:02:10 dougb Exp $ % ======================================================================= @@ -16494,10 +16494,10 @@ you through times of no dope. -- Gilbert Shelton % -Dorothy: But how can you talk without a brain? -Scarecrow: Well, I don't know... but some people - without brains do an awful lot of talking. - -- The Wizard of Oz +Dorothy: How can you talk if you haven't got a brain? +Scarecrow: I don't know. But some people without brains do an + awful lot of talking, don't they? + -- Judy Garland and Ray Bolger, "The Wizard of Oz" % Double! % @@ -20094,8 +20094,6 @@ think not, my friend, I think not. -- Arthur Naiman, "Every Goy's Guide to Yiddish" % -"Gee, Toto, I don't think we are in Kansas anymore." -% GEMINI (May 21 - June 20) A day to take the initiative. Put the garbage out, for instance, and pick up the stuff at the dry cleaners. Watch @@ -22013,7 +22011,7 @@ Guernsey cows? It's gonna be the herd shot 'round the world. % Hearts will never be practical until they can be made unbreakable. - -- The Wizard of Oz + -- Frank Morgan as The Wizard, "The Wizard of Oz" % Heaven and earth were created all together in the same instant, on October 23rd, 4004 B.C. at nine o'clock in the morning. @@ -23447,6 +23445,9 @@ I can't believe that out of 100,000 sperm, you were the quickest. -- Steven Pearl % +I CAN'T come back, I don't know how it works. + -- Frank Morgan as The Wizard, "The Wizard of Oz" +% I can't complain, but sometimes I still do. -- Joe Walsh % @@ -28015,6 +28016,9 @@ thank everyone for making this night necessary. -- Yogi Berra at a dinner in his honor % +Oh no my dear, I'm a very good man. I'm just a very bad wizard. + -- Frank Morgan as The Wizard, "The Wizard of Oz" +% I'm all for computer dating, but I wouldn't want one to marry my sister. % @@ -38585,6 +38589,9 @@ % Pause for storage relocation. % +Pay no attention to that man behind the curtain. + -- Frank Morgan as The Wizard, "The Wizard of Oz" +% paycheck: The weekly $5.27 that remains after deductions for federal withholding, state withholding, city withholding, FICA, @@ -53297,8 +53304,8 @@ TOTD (T-shirt Of The Day): I'm the person your mother warned you about. % -Toto, I don't think we're in Kansas anymore. - -- Judy Garland, "Wizard of Oz" +Toto, I have a feeling we're not in Kansas anymore. + -- Judy Garland as Dorothy Gale, "The Wizard of Oz" % Tourists -- have some fun with New York's hard-boiled cabbies. When you get to your destination, say to your driver, "Pay? I was hitch-hiking." @@ -56222,6 +56229,9 @@ % What will you do if all your problems aren't solved by the time you die? % +What would you do with a brain if you had one? + -- Judy Garland as Dorothy Gale, "The Wizard of Oz" +% What you don't know can hurt you, only you won't know it. % What you don't know won't help you much either. ==== //depot/projects/dtrace/src/include/_ctype.h#6 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.32 2007/10/27 09:32:32 ache Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $ */ #ifndef __CTYPE_H_ @@ -126,7 +126,7 @@ static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c < 0 || _c >= 128) ? 0 : + return (_c & ~0x7F) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } ==== //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_none.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.17 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.18 2007/10/27 22:45:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -334,7 +334,7 @@ const void* dummy_buffer; ssize_t bytes_read; bytes_read = archive_decompressor_none_read_ahead(a, - &dummy_buffer, request); + &dummy_buffer, 1); if (bytes_read < 0) return (bytes_read); if (bytes_read == 0) { ==== //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#13 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.109 2007/10/19 12:48:02 rpaulo Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.110 2007/10/27 22:04:19 maxim Exp $ */ #include @@ -6226,16 +6226,16 @@ config_pipe(ac, av); else if (do_nat && _substrcmp(*av, "config") == 0) config_nat(ac, av); - else if (_substrcmp(*av, "set") == 0) - sets_handler(ac, av); - else if (_substrcmp(*av, "table") == 0) - table_handler(ac, av); - else if (_substrcmp(*av, "enable") == 0) - sysctl_handler(ac, av, 1); - else if (_substrcmp(*av, "disable") == 0) - sysctl_handler(ac, av, 0); - else - try_next = 1; + else if (_substrcmp(*av, "set") == 0) + sets_handler(ac, av); + else if (_substrcmp(*av, "table") == 0) + table_handler(ac, av); + else if (_substrcmp(*av, "enable") == 0) + sysctl_handler(ac, av, 1); + else if (_substrcmp(*av, "disable") == 0) + sysctl_handler(ac, av, 0); + else + try_next = 1; } if (use_set || try_next) { ==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#20 (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/man5/rc.conf.5,v 1.330 2007/10/15 20:00:20 netchild Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.331 2007/10/28 13:33:25 miwi Exp $ .\" -.Dd September 3, 2007 +.Dd October 27, 2007 .Dt RC.CONF 5 .Os .Sh NAME @@ -1127,7 +1127,9 @@ ifconfig_ed0="DHCP" .Ed .Pp -Also, if your interface needs WPA authentication, it is possible to add +Also, if you want to configure your wireless interface with +.Xr wpa_supplicant 8 +for use with WPA, EAP/LEAP or WEP, you need to add .Dq Li WPA to the .Va ifconfig_ Ns Aq Ar interface ==== //depot/projects/dtrace/src/sys/conf/files#48 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1248 2007/10/27 15:31:50 sam Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1249 2007/10/28 15:55:20 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2031,9 +2031,11 @@ security/audit/audit_syscalls.c standard security/audit/audit_trigger.c optional audit security/audit/audit_worker.c optional audit +security/mac/mac_atalk.c optional mac netatalk security/mac/mac_audit.c optional mac audit security/mac/mac_framework.c optional mac security/mac/mac_inet.c optional mac inet +security/mac/mac_inet6.c optional mac inet6 security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac ==== //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#11 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.49 2007/10/26 13:18:36 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.50 2007/10/28 17:12:46 rwatson Exp $"); #endif #ifdef __FreeBSD__ @@ -1818,7 +1818,7 @@ #ifdef __FreeBSD__ #ifdef MAC if (replyto) - mac_mbuf_create_netlayer(replyto, m); + mac_netinet_firewall_reply(replyto, m); else mac_netinet_firewall_send(m); #else ==== //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci_link.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.57 2007/10/27 13:12:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.58 2007/10/27 22:14:17 jhb Exp $"); #include "opt_acpi.h" #include @@ -932,9 +932,10 @@ routed++; if (routed == sc->pl_num_links) status = acpi_pci_link_route_irqs(dev); - else - status = AcpiEvaluateObject(acpi_get_handle(dev), "_DIS", NULL, - NULL); + else { + AcpiEvaluateObject(acpi_get_handle(dev), "_DIS", NULL, NULL); + status = AE_OK; + } ACPI_SERIAL_END(pci_link); if (ACPI_FAILURE(status)) return (ENXIO); ==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#24 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.107 2007/10/26 08:00:41 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.108 2007/10/27 22:07:40 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -108,10 +108,7 @@ static int sched_quantum; /* Roundrobin scheduling quantum in ticks. */ #define SCHED_QUANTUM (hz / 10) /* Default sched quantum */ -static struct callout roundrobin_callout; - static void setup_runqs(void); -static void roundrobin(void *arg); static void schedcpu(void); static void schedcpu_thread(void); static void sched_priority(struct thread *td, u_char prio); @@ -256,27 +253,6 @@ } /* - * Force switch among equal priority processes every 100ms. - * We don't actually need to force a context switch of the current process. - * The act of firing the event triggers a context switch to softclock() and - * then switching back out again which is equivalent to a preemption, thus - * no further work is needed on the local CPU. - */ -/* ARGSUSED */ -static void -roundrobin(void *arg) -{ - -#ifdef SMP - mtx_lock_spin(&sched_lock); - forward_roundrobin(); - mtx_unlock_spin(&sched_lock); -#endif - - callout_reset(&roundrobin_callout, sched_quantum, roundrobin, NULL); -} - -/* * Constants for digital decay and forget: * 90% of (td_estcpu) usage in 5 * loadav time * 95% of (ts_pctcpu) usage in 60 seconds (load insensitive) @@ -551,11 +527,6 @@ sched_quantum = SCHED_QUANTUM; hogticks = 2 * sched_quantum; - callout_init(&roundrobin_callout, CALLOUT_MPSAFE); - - /* Kick off timeout driven events by calling first time. */ - roundrobin(NULL); - /* Account for thread0. */ sched_load_add(); } @@ -626,6 +597,14 @@ resetpriority(td); resetpriority_thread(td); } + + /* + * Force a context switch if the current thread has used up a full + * quantum (default quantum is 100ms). + */ + if (!TD_IS_IDLETHREAD(td) && + ticks - PCPU_GET(switchticks) >= sched_quantum) + td->td_flags |= TDF_NEEDRESCHED; } /* ==== //depot/projects/dtrace/src/sys/netatalk/aarp.c#7 (text+ko) ==== @@ -47,7 +47,7 @@ * +1-313-764-2278 * netatalk@umich.edu * - * $FreeBSD: src/sys/netatalk/aarp.c,v 1.43 2007/10/26 13:18:37 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/aarp.c,v 1.44 2007/10/28 15:55:21 rwatson Exp $ */ #include "opt_atalk.h" @@ -177,7 +177,7 @@ if (m == NULL) return; #ifdef MAC - mac_mbuf_create_linklayer(ifp, m); + mac_netatalk_aarp_send(ifp, m); #endif m->m_len = sizeof(*ea); m->m_pkthdr.len = sizeof(*ea); @@ -602,7 +602,7 @@ if (m == NULL) return; #ifdef MAC - mac_mbuf_create_linklayer(ifp, m); + mac_netatalk_aarp_send(ifp, m); #endif m->m_len = sizeof(*ea); m->m_pkthdr.len = sizeof(*ea); ==== //depot/projects/dtrace/src/sys/netgraph/ng_base.c#8 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.137 2007/10/19 20:09:58 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.138 2007/10/28 18:05:59 mav Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -3281,7 +3281,7 @@ item->body.fn.fn_arg2); break; case NGQF_FN2: - printf(" - fn@%p (%p, %p, %p, %d (%x))\n", + printf(" - fn2@%p (%p, %p, %p, %d (%x))\n", _NGI_FN2(item), _NGI_NODE(item), _NGI_HOOK(item), ==== //depot/projects/dtrace/src/sys/netinet/if_ether.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.163 2007/10/26 13:18:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.164 2007/10/28 15:55:21 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -323,7 +323,7 @@ ah = mtod(m, struct arphdr *); bzero((caddr_t)ah, m->m_len); #ifdef MAC - mac_mbuf_create_linklayer(ifp, m); + mac_netinet_arp_send(ifp, m); #endif ah->ar_pro = htons(ETHERTYPE_IP); ah->ar_hln = ifp->if_addrlen; /* hardware address length */ ==== //depot/projects/dtrace/src/sys/netinet/igmp.c#8 (text+ko) ==== @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.55 2007/10/26 13:18:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.56 2007/10/28 15:55:21 rwatson Exp $"); #include "opt_mac.h" @@ -471,7 +471,7 @@ m->m_pkthdr.rcvif = loif; #ifdef MAC - mac_mbuf_create_linklayer(inm->inm_ifp, m); + mac_netinet_igmp_send(inm->inm_ifp, m); #endif m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN; MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip)); ==== //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#23 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.177 2007/10/26 13:18:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.178 2007/10/28 17:12:47 rwatson Exp $"); #define DEB(x) #define DDB(x) x @@ -1619,7 +1619,7 @@ #ifdef MAC if (replyto != NULL) - mac_mbuf_create_netlayer(replyto, m); + mac_netinet_firewall_reply(replyto, m); else mac_netinet_firewall_send(m); #else ==== //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_icmp.c,v 1.119 2007/10/24 19:03:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_icmp.c,v 1.120 2007/10/28 17:12:47 rwatson Exp $"); #include "opt_ipsec.h" #include "opt_mac.h" @@ -221,7 +221,7 @@ if (m == NULL) goto freeit; #ifdef MAC - mac_mbuf_create_netlayer(n, m); + mac_netinet_icmp_reply(n, m); #endif icmplen = min(icmplen, M_TRAILINGSPACE(m) - sizeof(struct ip) - ICMP_MINLEN); m_align(m, ICMP_MINLEN + icmplen); @@ -699,7 +699,7 @@ } match: #ifdef MAC - mac_netinet_icmp_reply(m); + mac_netinet_icmp_replyinplace(m); #endif t = IA_SIN(ia)->sin_addr; ip->ip_src = t; ==== //depot/projects/dtrace/src/sys/netinet6/nd6.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/nd6.c,v 1.85 2007/10/26 13:18:37 rwatson Exp $ */ +/* $FreeBSD: src/sys/netinet6/nd6.c,v 1.86 2007/10/28 15:55:21 rwatson Exp $ */ /* $KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $ */ /*- @@ -2114,7 +2114,7 @@ } #ifdef MAC - mac_mbuf_create_linklayer(ifp, m); + mac_netinet6_nd6_send(ifp, m); #endif if ((ifp->if_flags & IFF_LOOPBACK) != 0) { return ((*ifp->if_output)(origifp, m, (struct sockaddr *)dst, ==== //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#9 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.12 2007/10/12 15:09:02 csjp Exp $ + * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.13 2007/10/27 22:28:01 csjp Exp $ */ #include @@ -934,6 +934,7 @@ audit_pipe_entry_free(ape); ap->ap_truncates++; } while (1); + ap->ap_reads++; mtx_unlock(&audit_pipe_mtx); /* ==== //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.92 2007/10/26 21:16:34 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.95 2007/10/28 17:55:55 rwatson Exp $ */ /* @@ -152,10 +152,6 @@ int mac_kld_check_stat(struct ucred *cred); void mac_mbuf_copy(struct mbuf *, struct mbuf *); -void mac_mbuf_create_linklayer(struct ifnet *ifp, struct mbuf *m); -void mac_mbuf_create_multicast_encap(struct mbuf *m, struct ifnet *ifp, - struct mbuf *mnew); -void mac_mbuf_create_netlayer(struct mbuf *m, struct mbuf *mnew); int mac_mbuf_init(struct mbuf *, int); void mac_mbuf_tag_copy(struct m_tag *, struct m_tag *); @@ -167,11 +163,19 @@ void mac_mount_destroy(struct mount *); void mac_mount_init(struct mount *); +void mac_netatalk_aarp_send(struct ifnet *ifp, struct mbuf *m); + +void mac_netinet_arp_send(struct ifnet *ifp, struct mbuf *m); +void mac_netinet_firewall_reply(struct mbuf *mrecv, struct mbuf *msend); void mac_netinet_firewall_send(struct mbuf *m); void mac_netinet_fragment(struct mbuf *m, struct mbuf *frag); -void mac_netinet_icmp_reply(struct mbuf *m); +void mac_netinet_icmp_reply(struct mbuf *mrecv, struct mbuf *msend); +void mac_netinet_icmp_replyinplace(struct mbuf *m); +void mac_netinet_igmp_send(struct ifnet *ifp, struct mbuf *m); void mac_netinet_tcp_reply(struct mbuf *m); +void mac_netinet6_nd6_send(struct ifnet *ifp, struct mbuf *m); + int mac_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp, unsigned long cmd, void *data); int mac_pipe_check_poll(struct ucred *cred, struct pipepair *pp); ==== //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2004 Networks Associates Technology, Inc. * Copyright (c) 2006 SPARTA, Inc. @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.14 2007/10/26 13:18:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.16 2007/10/28 17:12:47 rwatson Exp $"); #include "opt_mac.h" @@ -222,13 +222,49 @@ } void -mac_netinet_icmp_reply(struct mbuf *m) +mac_netinet_arp_send(struct ifnet *ifp, struct mbuf *m) +{ + struct label *mlabel; + + mlabel = mac_mbuf_to_label(m); + + MAC_IFNET_LOCK(ifp); + MAC_PERFORM(netinet_arp_send, ifp, ifp->if_label, m, mlabel); + MAC_IFNET_UNLOCK(ifp); +} + +void +mac_netinet_icmp_reply(struct mbuf *mrecv, struct mbuf *msend) +{ + struct label *mrecvlabel, *msendlabel; + + mrecvlabel = mac_mbuf_to_label(mrecv); + msendlabel = mac_mbuf_to_label(msend); + + MAC_PERFORM(netinet_icmp_reply, mrecv, mrecvlabel, msend, + msendlabel); +} + +void +mac_netinet_icmp_replyinplace(struct mbuf *m) { struct label *label; label = mac_mbuf_to_label(m); - MAC_PERFORM(netinet_icmp_reply, m, label); + MAC_PERFORM(netinet_icmp_replyinplace, m, label); +} + +void +mac_netinet_igmp_send(struct ifnet *ifp, struct mbuf *m) +{ + struct label *mlabel; + + mlabel = mac_mbuf_to_label(m); + + MAC_IFNET_LOCK(ifp); + MAC_PERFORM(netinet_igmp_send, ifp, ifp->if_label, m, mlabel); + MAC_IFNET_UNLOCK(ifp); } void @@ -276,6 +312,21 @@ } void +mac_netinet_firewall_reply(struct mbuf *mrecv, struct mbuf *msend) +{ + struct label *mrecvlabel, *msendlabel; + + M_ASSERTPKTHDR(mrecv); + M_ASSERTPKTHDR(msend); + + mrecvlabel = mac_mbuf_to_label(mrecv); + msendlabel = mac_mbuf_to_label(msend); + + MAC_PERFORM(netinet_firewall_reply, mrecv, mrecvlabel, msend, + msendlabel); +} + +void mac_netinet_firewall_send(struct mbuf *m) { struct label *label; ==== //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#9 (text+ko) ==== @@ -41,7 +41,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.122 2007/10/24 19:04:00 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.123 2007/10/28 15:55:22 rwatson Exp $ */ #ifndef _SYS_SECURITY_MAC_MAC_INTERNAL_H_ @@ -91,6 +91,7 @@ #ifndef MAC_ALWAYS_LABEL_MBUF extern int mac_labelmbufs; #endif +extern struct mtx mac_ifnet_mtx; /* * MAC Framework infrastructure functions. @@ -113,6 +114,9 @@ int mac_check_structmac_consistent(struct mac *mac); int mac_allocate_slot(void); +#define MAC_IFNET_LOCK(ifp) mtx_lock(&mac_ifnet_mtx) +#define MAC_IFNET_UNLOCK(ifp) mtx_unlock(&mac_ifnet_mtx) + /* * MAC Framework per-object type functions. It's not yet clear how the * namespaces, etc, should work for these, so for now, sort by object type. ==== //depot/projects/dtrace/src/sys/security/mac/mac_net.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.128 2007/10/26 13:18:37 rwatson Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 28 22:01:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC23C16A420; Sun, 28 Oct 2007 22:01:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49DC716A417 for ; Sun, 28 Oct 2007 22:01:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A91D13C494 for ; Sun, 28 Oct 2007 22:01:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SM1s5u056928 for ; Sun, 28 Oct 2007 22:01:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SM1sRB056925 for perforce@freebsd.org; Sun, 28 Oct 2007 22:01:54 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 22:01:54 GMT Message-Id: <200710282201.l9SM1sRB056925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 22:01:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=128251 Change 128251 by jb@jb_freebsd1 on 2007/10/28 22:01:45 Delete opensolaris compatibility headers which don't follow the style pjd chose. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/bitmap.h#3 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/kmem.h#3 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/mman.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/objfs.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/processor.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/synch.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/vmem.h#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 28 22:22:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06E8516A46D; Sun, 28 Oct 2007 22:22:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3F6116A417 for ; Sun, 28 Oct 2007 22:22:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9479413C48E for ; Sun, 28 Oct 2007 22:22:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SMMHJJ059273 for ; Sun, 28 Oct 2007 22:22:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SMMHoK059270 for perforce@freebsd.org; Sun, 28 Oct 2007 22:22:17 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 22:22:17 GMT Message-Id: <200710282222.l9SMMHoK059270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 22:22:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=128253 Change 128253 by kmacy@kmacy:storage:toestack on 2007/10/28 22:21:17 - set the length on a control mbuf so memcpy doesn't get passed -8 - call callout_stop on callouts, callout_drain still doesn't seem to do the trick - don't disable offload by default Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#12 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#12 (text+ko) ==== @@ -203,7 +203,7 @@ * The driver enables offload as a default. * To disable it, use ofld_disable = 1. */ -static int ofld_disable = 1; +static int ofld_disable = 0; TUNABLE_INT("hw.cxgb.ofld_disable", &ofld_disable); SYSCTL_UINT(_hw_cxgb, OID_AUTO, ofld_disable, CTLFLAG_RDTUN, &ofld_disable, 0, "disable ULP offload"); @@ -1301,6 +1301,8 @@ return (ENOMEM); req = mtod(m, struct cpl_smt_write_req *); + m->m_pkthdr.len = m->m_len = sizeof(struct cpl_smt_write_req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SMT_WRITE_REQ, idx)); req->mtu_idx = NMTUS - 1; /* should be 0 but there's a T3 bug */ @@ -1587,6 +1589,8 @@ cxgb_teardown_msix(sc); ADAPTER_UNLOCK(sc); + callout_stop(&sc->cxgb_tick_ch); + callout_stop(&sc->sge_timer_ch); callout_drain(&sc->cxgb_tick_ch); callout_drain(&sc->sge_timer_ch); @@ -1761,7 +1765,6 @@ ADAPTER_LOCK(p->adapter); clrbit(&p->adapter->open_device_map, p->port_id); - if (p->adapter->open_device_map == 0) { cxgb_down_locked(p->adapter); } else From owner-p4-projects@FreeBSD.ORG Sun Oct 28 22:24:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2326116A475; Sun, 28 Oct 2007 22:24:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B45E116A46C for ; Sun, 28 Oct 2007 22:24:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A43F913C4AC for ; Sun, 28 Oct 2007 22:24:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SMOJus059413 for ; Sun, 28 Oct 2007 22:24:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SMOJW1059410 for perforce@freebsd.org; Sun, 28 Oct 2007 22:24:19 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 22:24:19 GMT Message-Id: <200710282224.l9SMOJW1059410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 22:24:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=128254 Change 128254 by kmacy@kmacy:storage:toestack on 2007/10/28 22:23:22 - add missing symbols - don't malloc with M_WAITOK as locks are being held Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 (text+ko) ==== @@ -123,6 +123,14 @@ static struct toe_usrreqs cxgb_toe_usrreqs; + +void +t3_enable_ddp(struct socket *so, int on) +{ + printf("t3_enable_ddp unimplemented !!!! \n"); + +} + static inline void so_insert_tid(struct tom_data *d, struct socket *so, unsigned int tid) { ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 (text+ko) ==== @@ -115,6 +115,13 @@ }; void +toepcb_init(struct toepcb *toep) +{ + bzero(toep, sizeof(*toep)); + +} + +void toepcb_hold(struct toepcb *toep) { atomic_add_acq_int(&toep->tp_refcount, 1); @@ -150,7 +157,7 @@ struct toedev *tdev; struct adap_ports *port_info; - t = malloc(sizeof(*t), M_DEVBUF, M_WAITOK|M_ZERO); + t = malloc(sizeof(*t), M_DEVBUF, M_NOWAIT|M_ZERO); if (!t) return; @@ -158,7 +165,7 @@ if (cdev->ctl(cdev, GET_WR_LEN, &wr_len) < 0) goto out_free_tom; - port_info = malloc(sizeof(*port_info), M_DEVBUF, M_WAITOK|M_ZERO); + port_info = malloc(sizeof(*port_info), M_DEVBUF, M_NOWAIT|M_ZERO); if (!port_info) goto out_free_tom; @@ -368,6 +375,9 @@ #ifdef notyet register_listen_offload_notifier(&listen_notifier); #endif + TAILQ_INIT(&cxgb_list); + + mtx_init(&cxgb_list_lock, "cxgb tom list", NULL, MTX_DEF); /* Register to offloading devices */ t3c_tom_client.add = t3c_tom_add; cxgb_register_client(&t3c_tom_client); From owner-p4-projects@FreeBSD.ORG Sun Oct 28 23:10:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57A9716A41B; Sun, 28 Oct 2007 23:10:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D875816A417 for ; Sun, 28 Oct 2007 23:10:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9AD413C4B3 for ; Sun, 28 Oct 2007 23:10:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNA97e062699 for ; Sun, 28 Oct 2007 23:10:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNA9iF062696 for perforce@freebsd.org; Sun, 28 Oct 2007 23:10:09 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 23:10:09 GMT Message-Id: <200710282310.l9SNA9iF062696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 23:10:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=128255 Change 128255 by jb@jb_freebsd1 on 2007/10/28 23:09:15 More compatibility headers in the pjd style. Affected files ... .. //depot/projects/dtrace/src/compat/opensolaris/include/fcntl.h#1 add .. //depot/projects/dtrace/src/compat/opensolaris/include/stdio.h#1 add .. //depot/projects/dtrace/src/compat/opensolaris/include/stdlib.h#1 add .. //depot/projects/dtrace/src/compat/opensolaris/include/strings.h#1 add .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/bitmap.h#1 add .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/elf.h#1 add .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mman.h#1 add .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/objfs.h#1 add .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/param.h#1 add .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/stat.h#1 add .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/unistd.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 28 23:11:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D99D16A46D; Sun, 28 Oct 2007 23:11:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AA6816A468 for ; Sun, 28 Oct 2007 23:11:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1BC9813C4A5 for ; Sun, 28 Oct 2007 23:11:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNBB8Z062911 for ; Sun, 28 Oct 2007 23:11:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNBB5F062908 for perforce@freebsd.org; Sun, 28 Oct 2007 23:11:11 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 23:11:11 GMT Message-Id: <200710282311.l9SNBB5F062908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 23:11:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=128256 Change 128256 by jb@jb_freebsd1 on 2007/10/28 23:10:34 Remove _SOLARIS_C_SOURCE compatibility definitions since pjd won't go that route. Affected files ... .. //depot/projects/dtrace/src/sys/sys/_elf_solaris.h#5 delete .. //depot/projects/dtrace/src/sys/sys/elf.h#5 edit .. //depot/projects/dtrace/src/sys/sys/fcntl.h#6 edit .. //depot/projects/dtrace/src/sys/sys/kernel.h#12 edit .. //depot/projects/dtrace/src/sys/sys/param.h#23 edit .. //depot/projects/dtrace/src/sys/sys/stat.h#6 edit .. //depot/projects/dtrace/src/sys/sys/time.h#11 edit .. //depot/projects/dtrace/src/sys/sys/types.h#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/elf.h#5 (text+ko) ==== @@ -38,8 +38,4 @@ #include #include -#ifdef _SOLARIS_C_SOURCE -#include -#endif - #endif /* !_SYS_ELF_H_ */ ==== //depot/projects/dtrace/src/sys/sys/fcntl.h#6 (text+ko) ==== @@ -224,14 +224,6 @@ int flock(int, int); #endif -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE - -#define open64 open - -#endif __END_DECLS #endif ==== //depot/projects/dtrace/src/sys/sys/kernel.h#12 (text+ko) ==== @@ -68,9 +68,7 @@ extern int profhz; /* profiling clock's frequency */ extern int profprocs; /* number of process's profiling */ extern int ticks; -#ifndef _SOLARIS_C_SOURCE extern int lbolt; /* once a second sleep address */ -#endif #endif /* _KERNEL */ ==== //depot/projects/dtrace/src/sys/sys/param.h#23 (text+ko) ==== @@ -303,20 +303,4 @@ #define ctodb(db) /* calculates pages to devblks */ \ ((db) << (PAGE_SHIFT - DEV_BSHIFT)) -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -#define PAGESIZE PAGE_SIZE - -/* - * The OpenSolaris version is set according to the version last imported - * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header - * files it can be used to determine the level of compatibility that the - * FreeBSD headers provide to OpenSolaris code. Perhaps one day there - * will be a really, really Single Unix Specification. - */ -#define __OpenSolaris_version 20071001 -#endif - #endif /* _SYS_PARAM_H_ */ ==== //depot/projects/dtrace/src/sys/sys/stat.h#6 (text+ko) ==== @@ -304,14 +304,6 @@ #endif /* __BSD_VISIBLE */ -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -#define stat64 stat -#define fstat64 fstat -#endif - #ifndef _KERNEL __BEGIN_DECLS #if __BSD_VISIBLE ==== //depot/projects/dtrace/src/sys/sys/time.h#11 (text+ko) ==== @@ -324,27 +324,4 @@ #endif /* !_KERNEL */ -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -/* - * Definitions for commonly used resolutions. - */ -#define SEC 1 -#define MILLISEC 1000 -#define MICROSEC 1000000 -#define NANOSEC 1000000000 - -typedef longlong_t hrtime_t; - -#ifndef _KERNEL -static __inline hrtime_t gethrtime(void) { - struct timespec ts; - clock_gettime(CLOCK_UPTIME,&ts); - return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); -} -#endif -#endif /* _SOLARIS_C_SOURCE */ - #endif /* !_SYS_TIME_H_ */ ==== //depot/projects/dtrace/src/sys/sys/types.h#6 (text+ko) ==== @@ -297,36 +297,6 @@ #endif /* !_KERNEL */ /* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -typedef u_int uint_t; -typedef u_char uchar_t; -typedef u_short ushort_t; -typedef u_long ulong_t; - -typedef long long longlong_t; -typedef unsigned long long u_longlong_t; - -typedef off_t off64_t; - -typedef id_t taskid_t; -typedef id_t projid_t; -typedef id_t poolid_t; -typedef id_t zoneid_t; -typedef id_t ctid_t; - -#ifndef _KERNEL -#if defined(__XOPEN_OR_POSIX) -typedef enum { _B_FALSE, _B_TRUE } boolean_t; -#else -typedef enum { B_FALSE, B_TRUE } boolean_t; -#endif /* defined(__XOPEN_OR_POSIX) */ -#endif - -#endif /* _SOLARIS_C_SOURCE */ - -/* * The following are all things that really shouldn't exist in this header, * since its purpose is to provide typedefs, not miscellaneous doodads. */ From owner-p4-projects@FreeBSD.ORG Sun Oct 28 23:12:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 047BD16A419; Sun, 28 Oct 2007 23:12:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B89416A417 for ; Sun, 28 Oct 2007 23:12:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C42413C4AA for ; Sun, 28 Oct 2007 23:12:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNCDjw063010 for ; Sun, 28 Oct 2007 23:12:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNCDVt063007 for perforce@freebsd.org; Sun, 28 Oct 2007 23:12:13 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 23:12:13 GMT Message-Id: <200710282312.l9SNCDVt063007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 23:12:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=128257 Change 128257 by jb@jb_freebsd1 on 2007/10/28 23:11:50 The _SOLARIS_C_SOURCE definition is not useful now. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile.inc#7 edit .. //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#2 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#8 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/fasttrap/Makefile#2 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/fbt/Makefile#2 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#4 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/prototype/Makefile#2 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/sdt/Makefile#3 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/systrace/Makefile#2 edit .. //depot/projects/dtrace/src/sys/modules/zfs/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile.inc#7 (text+ko) ==== @@ -3,6 +3,4 @@ OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris -CFLAGS+= -D_SOLARIS_C_SOURCE - IGNORE_PRAGMA= YES ==== //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#2 (text+ko) ==== @@ -14,6 +14,6 @@ CFLAGS+= -I${.CURDIR}/../../cddl/dev/dtrace \ -I${.CURDIR}/../../contrib/opensolaris/compat \ -I${.CURDIR}/../../contrib/opensolaris/uts/common \ - -I${.CURDIR}/../.. -D_SOLARIS_C_SOURCE + -I${.CURDIR}/../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#8 (text+ko) ==== @@ -21,7 +21,7 @@ -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../.. -DDIS_MEM -D_SOLARIS_C_SOURCE + -I${.CURDIR}/../../.. -DDIS_MEM CFLAGS+= -DDEBUG ==== //depot/projects/dtrace/src/sys/modules/dtrace/fasttrap/Makefile#2 (text+ko) ==== @@ -9,6 +9,6 @@ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../contrib \ - -I${.CURDIR}/../.. -D_SOLARIS_C_SOURCE + -I${.CURDIR}/../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/fbt/Makefile#2 (text+ko) ==== @@ -10,6 +10,6 @@ -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../.. -D_SOLARIS_C_SOURCE + -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#4 (text+ko) ==== @@ -10,6 +10,6 @@ -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../.. -D_SOLARIS_C_SOURCE + -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/prototype/Makefile#2 (text+ko) ==== @@ -9,6 +9,6 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../.. -D_SOLARIS_C_SOURCE + -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/sdt/Makefile#3 (text+ko) ==== @@ -10,6 +10,6 @@ -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../.. -D_SOLARIS_C_SOURCE + -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/systrace/Makefile#2 (text+ko) ==== @@ -10,6 +10,6 @@ -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../.. -D_SOLARIS_C_SOURCE + -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/zfs/Makefile#2 (text+ko) ==== @@ -76,8 +76,6 @@ CWARNFLAGS+=-Wno-unused CWARNFLAGS+=-Wno-switch -CFLAGS+=-D_SOLARIS_C_SOURCE - CFLAGS+=-I${.CURDIR}/../../compat/opensolaris CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/zmod From owner-p4-projects@FreeBSD.ORG Sun Oct 28 23:13:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16A4416A41A; Sun, 28 Oct 2007 23:13:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D08E816A418 for ; Sun, 28 Oct 2007 23:13:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C19BA13C494 for ; Sun, 28 Oct 2007 23:13:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNDEHc063030 for ; Sun, 28 Oct 2007 23:13:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNDEaP063027 for perforce@freebsd.org; Sun, 28 Oct 2007 23:13:14 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 23:13:14 GMT Message-Id: <200710282313.l9SNDEaP063027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 23:13:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=128258 Change 128258 by jb@jb_freebsd1 on 2007/10/28 23:13:10 Move compatibility definitions in here rather than having them enabled by _SOLARIS_C_SOURCE in the main FreeBSD headers. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#2 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/types.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#2 (text+ko) ==== @@ -31,6 +31,13 @@ #include_next +#define SEC 1 +#define MILLISEC 1000 +#define MICROSEC 1000000 +#define NANOSEC 1000000000 + +typedef longlong_t hrtime_t; + #ifdef _KERNEL #define lbolt ((gethrtime() * hz) / NANOSEC) #define lbolt64 (int64_t)(lbolt) @@ -53,6 +60,15 @@ #define gethrestime_sec() (time_second) #define gethrestime(ts) getnanotime(ts) +#else + +static __inline hrtime_t gethrtime(void) { + struct timespec ts; + clock_gettime(CLOCK_UPTIME,&ts); + return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); +} + + #endif /* _KERNEL */ #endif /* !_OPENSOLARIS_SYS_TIME_H_ */ ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/types.h#2 (text+ko) ==== @@ -39,6 +39,18 @@ #define MAXNAMELEN 256 typedef struct timespec timestruc_t; +typedef u_int uint_t; +typedef u_char uchar_t; +typedef u_short ushort_t; +typedef u_long ulong_t; +typedef long long longlong_t; +typedef unsigned long long u_longlong_t; +typedef off_t off64_t; +typedef id_t taskid_t; +typedef id_t projid_t; +typedef id_t poolid_t; +typedef id_t zoneid_t; +typedef id_t ctid_t; #ifdef _KERNEL @@ -53,6 +65,12 @@ #else +#if defined(__XOPEN_OR_POSIX) +typedef enum { _B_FALSE, _B_TRUE } boolean_t; +#else +typedef enum { B_FALSE, B_TRUE } boolean_t; +#endif /* defined(__XOPEN_OR_POSIX) */ + typedef longlong_t offset_t; typedef u_longlong_t u_offset_t; typedef uint64_t upad64_t; From owner-p4-projects@FreeBSD.ORG Sun Oct 28 23:14:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7534E16A41A; Sun, 28 Oct 2007 23:14:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26B4616A418 for ; Sun, 28 Oct 2007 23:14:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1759113C465 for ; Sun, 28 Oct 2007 23:14:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNEF1R063065 for ; Sun, 28 Oct 2007 23:14:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNEF4G063062 for perforce@freebsd.org; Sun, 28 Oct 2007 23:14:15 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 23:14:15 GMT Message-Id: <200710282314.l9SNEF4G063062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 23:14:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=128259 Change 128259 by jb@jb_freebsd1 on 2007/10/28 23:14:13 Remove definitions which clash with those in a Solaris header of the same name. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/rpc/xdr.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/rpc/xdr.h#2 (text+ko) ==== @@ -50,19 +50,6 @@ #define xdr_control(a,b,c) xdrmem_control(a,b,c) /* - * These are XDR control operators - */ - -#define XDR_GET_BYTES_AVAIL 1 - -struct xdr_bytesrec { - bool_t xc_is_last_record; - size_t xc_num_avail; -}; - -typedef struct xdr_bytesrec xdr_bytesrec; - -/* * These are the request arguments to XDR_CONTROL. * * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream. From owner-p4-projects@FreeBSD.ORG Sun Oct 28 23:15:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAB9716A421; Sun, 28 Oct 2007 23:15:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 70AC816A41A for ; Sun, 28 Oct 2007 23:15:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 61C6313C491 for ; Sun, 28 Oct 2007 23:15:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNFH54063127 for ; Sun, 28 Oct 2007 23:15:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNFHfp063124 for perforce@freebsd.org; Sun, 28 Oct 2007 23:15:17 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 23:15:17 GMT Message-Id: <200710282315.l9SNFHfp063124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 23:15:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=128260 Change 128260 by jb@jb_freebsd1 on 2007/10/28 23:15:03 Remove more _SOLARIS_C_SOURCE compatibility definitions. Affected files ... .. //depot/projects/dtrace/src/include/elf.h#6 edit .. //depot/projects/dtrace/src/include/stdlib.h#8 edit .. //depot/projects/dtrace/src/include/strings.h#5 edit Differences ... ==== //depot/projects/dtrace/src/include/elf.h#6 (text+ko) ==== @@ -38,8 +38,4 @@ #include #include -#ifdef _SOLARIS_C_SOURCE -#include -#endif - #endif /* !_ELF_H_ */ ==== //depot/projects/dtrace/src/include/stdlib.h#8 (text+ko) ==== @@ -283,9 +283,6 @@ extern char *suboptarg; /* getsubopt(3) external variable */ #endif /* __BSD_VISIBLE */ -#ifdef _SOLARIS_C_SOURCE -#define getexecname getprogname -#endif __END_DECLS #endif /* !_STDLIB_H_ */ ==== //depot/projects/dtrace/src/include/strings.h#5 (text+ko) ==== @@ -53,8 +53,4 @@ int strncasecmp(const char *, const char *, size_t) __pure; __END_DECLS -#ifdef _SOLARIS_C_SOURCE -#include -#endif - #endif /* _STRINGS_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Oct 28 23:17:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63FBB16A468; Sun, 28 Oct 2007 23:17:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AFF216A41A for ; Sun, 28 Oct 2007 23:17:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D737C13C48D for ; Sun, 28 Oct 2007 23:17:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNHJnb063211 for ; Sun, 28 Oct 2007 23:17:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNHJ9a063208 for perforce@freebsd.org; Sun, 28 Oct 2007 23:17:19 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 23:17:19 GMT Message-Id: <200710282317.l9SNHJ9a063208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 23:17:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=128261 Change 128261 by jb@jb_freebsd1 on 2007/10/28 23:16:23 Some of the hacks in here really need to be hacks in sys/compat/opensolaris/sys/*.h. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -470,7 +470,6 @@ #define gethrestime_sec() time(NULL) -#define pread64(d, p, n, o) pread(d, p, n, o) #define pwrite64(d, p, n, o) pwrite(d, p, n, o) #define readdir64(d) readdir(d) #define SIGPENDING(td) (0) From owner-p4-projects@FreeBSD.ORG Sun Oct 28 23:17:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DBEC16A52C; Sun, 28 Oct 2007 23:17:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6588A16A469 for ; Sun, 28 Oct 2007 23:17:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 55D7513C491 for ; Sun, 28 Oct 2007 23:17:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNHKdY063224 for ; Sun, 28 Oct 2007 23:17:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNHKAJ063220 for perforce@freebsd.org; Sun, 28 Oct 2007 23:17:20 GMT (envelope-from jb@freebsd.org) Date: Sun, 28 Oct 2007 23:17:20 GMT Message-Id: <200710282317.l9SNHKAJ063220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2007 23:17:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=128263 Change 128263 by jb@jb_freebsd1 on 2007/10/28 23:17:01 Clean up the compatibility headers referenced. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#5 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#7 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#14 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#12 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#5 (text) ==== @@ -42,7 +42,7 @@ #if defined(sun) #include #else -#include +#include #endif #define ALO_DATA (sizeof (Alist) - sizeof (void *)) ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#7 (text) ==== @@ -30,16 +30,9 @@ #include #include #include -#if !defined(sun) -#include -#endif #include #include #include -#if !defined(sun) -#include -#include -#endif #include #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#14 (text) ==== @@ -29,15 +29,9 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include -#if defined(sun) #include -#else -#include -#include -#include -#include -#include -#include +#if !defined(sun) +#include #include #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#12 (text) ==== @@ -50,6 +50,9 @@ #include #include #include +#if !defined(sun) +#include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#4 (text) ==== @@ -27,11 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include -#if defined(sun) #include -#else -#include -#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Oct 29 02:04:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 487DF16A41A; Mon, 29 Oct 2007 02:04:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9603A16A417 for ; Mon, 29 Oct 2007 02:04:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C44413C481 for ; Mon, 29 Oct 2007 02:04:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T24LPx084965 for ; Mon, 29 Oct 2007 02:04:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T24KHd084962 for perforce@freebsd.org; Mon, 29 Oct 2007 02:04:20 GMT (envelope-from jb@freebsd.org) Date: Mon, 29 Oct 2007 02:04:20 GMT Message-Id: <200710290204.l9T24KHd084962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 02:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=128265 Change 128265 by jb@jb_freebsd1 on 2007/10/29 02:03:43 Include the atomic compatibility definitions. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/bitmap.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/bitmap.h#2 (text+ko) ==== @@ -31,6 +31,8 @@ #ifndef _COMPAT_OPENSOLARIS_SYS_BITMAP_H #define _COMPAT_OPENSOLARIS_SYS_BITMAP_H +#include + /* * Operations on bitmaps of arbitrary size * A bitmap is a vector of 1 or more ulong_t's. From owner-p4-projects@FreeBSD.ORG Mon Oct 29 02:32:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E03116A421; Mon, 29 Oct 2007 02:31:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5263516A41B for ; Mon, 29 Oct 2007 02:31:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F6E513C4B0 for ; Mon, 29 Oct 2007 02:31:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T2Vqp5086547 for ; Mon, 29 Oct 2007 02:31:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T2Vp6G086544 for perforce@freebsd.org; Mon, 29 Oct 2007 02:31:51 GMT (envelope-from jb@freebsd.org) Date: Mon, 29 Oct 2007 02:31:51 GMT Message-Id: <200710290231.l9T2Vp6G086544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 02:32:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=128268 Change 128268 by jb@jb_freebsd1 on 2007/10/29 02:31:33 Revise the include search paths. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#5 edit .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#15 edit .. //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#2 edit .. //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#3 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#14 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#6 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#11 edit .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#10 edit .. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#7 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#5 (text+ko) ==== @@ -23,8 +23,8 @@ CFLAGS+= -DCTF_OLD_VERSIONS -CFLAGS+= -I${.CURDIR}/../../../sys/contrib \ - -I${.CURDIR}/../../../contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/common/ctf \ ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#15 (text+ko) ==== @@ -54,9 +54,8 @@ CFLAGS+= -I${.OBJDIR} \ -I${.CURDIR}/../libproc \ - -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ ==== //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -10,8 +10,8 @@ nvpair_alloc_fixed.c \ nvpair.c +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../include # XXX CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#3 (text+ko) ==== @@ -13,10 +13,8 @@ #.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common -CFLAGS+= -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ - -I${.CURDIR}/../../../sys \ - -I${.CURDIR}/../../../sys/compat/opensolaris \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#14 (text+ko) ==== @@ -31,10 +31,8 @@ WARNS?= 6 -CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ - -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/compat/opensolaris \ - -I${.CURDIR}/../../../sys/contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#6 (text+ko) ==== @@ -15,7 +15,7 @@ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \ -I${.CURDIR}/../../../sys/compat/opensolaris \ - -I${.CURDIR}/../../../sys/contrib \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#11 (text+ko) ==== @@ -28,10 +28,8 @@ WARNS?= 6 -CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ - -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/compat/opensolaris \ - -I${.CURDIR}/../../../sys/contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#10 (text+ko) ==== @@ -7,8 +7,8 @@ SRCS= avl.c sgsmsg.c string_table.c findprime.c -CFLAGS+= -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common ==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#7 (text+ko) ==== @@ -10,8 +10,8 @@ WARNS= 1 -CFLAGS+= -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ From owner-p4-projects@FreeBSD.ORG Mon Oct 29 02:34:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3855B16A421; Mon, 29 Oct 2007 02:33:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B277C16A419 for ; Mon, 29 Oct 2007 02:33:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 630B913C480 for ; Mon, 29 Oct 2007 02:33:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T2XsbT086637 for ; Mon, 29 Oct 2007 02:33:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T2XsZP086634 for perforce@freebsd.org; Mon, 29 Oct 2007 02:33:54 GMT (envelope-from jb@freebsd.org) Date: Mon, 29 Oct 2007 02:33:54 GMT Message-Id: <200710290233.l9T2XsZP086634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 02:34:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=128269 Change 128269 by jb@jb_freebsd1 on 2007/10/29 02:33:18 Don't assume it's OK to override FreeBSD's global 'lbolt' variable with a Solaris-centric one. Change Solaris references to upper-case to avoid the clash. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#3 (text+ko) ==== @@ -39,8 +39,8 @@ typedef longlong_t hrtime_t; #ifdef _KERNEL -#define lbolt ((gethrtime() * hz) / NANOSEC) -#define lbolt64 (int64_t)(lbolt) +#define LBOLT ((gethrtime() * hz) / NANOSEC) +#define lbolt64 (int64_t)(LBOLT) static __inline hrtime_t gethrtime(void) { ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 (text+ko) ==== @@ -1148,7 +1148,7 @@ /* prefetch buffers have a minimum lifespan */ if (HDR_IO_IN_PROGRESS(ab) || (ab->b_flags & (ARC_PREFETCH|ARC_INDIRECT) && - lbolt - ab->b_arc_access < arc_min_prefetch_lifespan)) { + LBOLT - ab->b_arc_access < arc_min_prefetch_lifespan)) { skipped++; continue; } @@ -1525,7 +1525,7 @@ } /* reset the growth delay for every reclaim */ - growtime = lbolt + (arc_grow_retry * hz); + growtime = LBOLT + (arc_grow_retry * hz); ASSERT(growtime > 0); if (zfs_needfree && last_reclaim == ARC_RECLAIM_CONS) { @@ -1538,7 +1538,7 @@ last_reclaim = ARC_RECLAIM_AGGR; } arc_kmem_reap_now(last_reclaim); - } else if ((growtime > 0) && ((growtime - lbolt) <= 0)) { + } else if ((growtime > 0) && ((growtime - LBOLT) <= 0)) { arc_no_grow = FALSE; } @@ -1757,7 +1757,7 @@ */ ASSERT(buf->b_arc_access == 0); - buf->b_arc_access = lbolt; + buf->b_arc_access = LBOLT; DTRACE_PROBE1(new_state__mru, arc_buf_hdr_t *, buf); arc_change_state(arc_mru, buf, hash_lock); @@ -1781,7 +1781,7 @@ buf->b_flags &= ~ARC_PREFETCH; ARCSTAT_BUMP(arcstat_mru_hits); } - buf->b_arc_access = lbolt; + buf->b_arc_access = LBOLT; return; } @@ -1790,13 +1790,13 @@ * but it is still in the cache. Move it to the MFU * state. */ - if (lbolt > buf->b_arc_access + ARC_MINTIME) { + if (LBOLT > buf->b_arc_access + ARC_MINTIME) { /* * More than 125ms have passed since we * instantiated this buffer. Move it to the * most frequently used state. */ - buf->b_arc_access = lbolt; + buf->b_arc_access = LBOLT; DTRACE_PROBE1(new_state__mfu, arc_buf_hdr_t *, buf); arc_change_state(arc_mfu, buf, hash_lock); } @@ -1819,7 +1819,7 @@ DTRACE_PROBE1(new_state__mfu, arc_buf_hdr_t *, buf); } - buf->b_arc_access = lbolt; + buf->b_arc_access = LBOLT; arc_change_state(new_state, buf, hash_lock); ARCSTAT_BUMP(arcstat_mru_ghost_hits); @@ -1842,7 +1842,7 @@ mutex_exit(&arc_mfu->arcs_mtx); } ARCSTAT_BUMP(arcstat_mfu_hits); - buf->b_arc_access = lbolt; + buf->b_arc_access = LBOLT; } else if (buf->b_state == arc_mfu_ghost) { arc_state_t *new_state = arc_mfu; /* @@ -1860,7 +1860,7 @@ new_state = arc_mru; } - buf->b_arc_access = lbolt; + buf->b_arc_access = LBOLT; DTRACE_PROBE1(new_state__mfu, arc_buf_hdr_t *, buf); arc_change_state(new_state, buf, hash_lock); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 (text+ko) ==== @@ -128,7 +128,7 @@ ASSERT(ve->ve_data != NULL); dprintf("evicting %p, off %llx, LRU %llu, age %lu, hits %u, stale %u\n", - vc, ve->ve_offset, ve->ve_lastused, lbolt - ve->ve_lastused, + vc, ve->ve_offset, ve->ve_lastused, LBOLT - ve->ve_lastused, ve->ve_hits, ve->ve_missed_update); avl_remove(&vc->vc_lastused_tree, ve); @@ -171,7 +171,7 @@ ve = kmem_zalloc(sizeof (vdev_cache_entry_t), KM_SLEEP); ve->ve_offset = offset; - ve->ve_lastused = lbolt; + ve->ve_lastused = LBOLT; ve->ve_data = zio_buf_alloc(VCBS); avl_add(&vc->vc_offset_tree, ve); @@ -188,9 +188,9 @@ ASSERT(MUTEX_HELD(&vc->vc_lock)); ASSERT(ve->ve_fill_io == NULL); - if (ve->ve_lastused != lbolt) { + if (ve->ve_lastused != LBOLT) { avl_remove(&vc->vc_lastused_tree, ve); - ve->ve_lastused = lbolt; + ve->ve_lastused = LBOLT; avl_add(&vc->vc_lastused_tree, ve); } ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ int zfs_vdev_max_pending = 35; int zfs_vdev_min_pending = 4; -/* deadline = pri + (lbolt >> time_shift) */ +/* deadline = pri + (LBOLT >> time_shift) */ int zfs_vdev_time_shift = 6; /* exponential I/O issue ramp-up rate */ ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 (text+ko) ==== @@ -1553,7 +1553,7 @@ txg_wait_synced(zilog->zl_dmu_pool, 0); zilog->zl_stop_replay = 0; - zilog->zl_replay_time = lbolt; + zilog->zl_replay_time = LBOLT; ASSERT(zilog->zl_replay_blks == 0); (void) zil_parse(zilog, zil_incr_blks, zil_replay_log_record, &zr, zh->zh_claim_txg); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 (text+ko) ==== @@ -1299,7 +1299,7 @@ bzero(gbh, gsize); /* We need to test multi-level gang blocks */ - if (maxalloc >= zio_gang_bang && (lbolt & 0x1) == 0) + if (maxalloc >= zio_gang_bang && (LBOLT & 0x1) == 0) maxalloc = MAX(maxalloc >> 2, SPA_MINBLOCKSIZE); for (loff = 0, i = 0; loff != zio->io_size; @@ -1375,7 +1375,7 @@ ASSERT3U(zio->io_ndvas, <=, spa_max_replication(zio->io_spa)); /* For testing, make some blocks above a certain size be gang blocks */ - if (zio->io_size >= zio_gang_bang && (lbolt & 0x3) == 0) { + if (zio->io_size >= zio_gang_bang && (LBOLT & 0x3) == 0) { zio_write_allocate_gang_members(zio); return; } From owner-p4-projects@FreeBSD.ORG Mon Oct 29 03:03:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C7DB16A41A; Mon, 29 Oct 2007 03:03:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 467D616A419 for ; Mon, 29 Oct 2007 03:03:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 350FD13C49D for ; Mon, 29 Oct 2007 03:03:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T33U8h089403 for ; Mon, 29 Oct 2007 03:03:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T33Rw8089400 for perforce@freebsd.org; Mon, 29 Oct 2007 03:03:27 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 Oct 2007 03:03:27 GMT Message-Id: <200710290303.l9T33Rw8089400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 03:03:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=128270 Change 128270 by kmacy@kmacy:storage:toestack on 2007/10/29 03:03:23 - fix route lookup - make ofld_connect return 0 on success and error code on failure Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.c#3 edit .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#4 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#3 (text+ko) ==== @@ -31,28 +31,38 @@ struct inpcb *inp = sotoinpcb(so); struct ifnet *ifp; struct toedev *tdev; - + int err; + + if (inp->inp_route.ro_rt == NULL) { + inp->inp_route.ro_rt = rtalloc2(nam, 1, 0); + if (inp->inp_route.ro_rt) + memcpy(&inp->inp_route.ro_dst, nam, sizeof(struct sockaddr)); + } + if (inp->inp_route.ro_rt == NULL) { - struct sockaddr_in *dst = (struct sockaddr_in *)&inp->inp_route.ro_dst; + printf("no route found for offload\n"); - bzero(dst, sizeof(*dst)); - dst->sin_family = AF_INET; - dst->sin_len = sizeof(*dst); - dst->sin_addr.s_addr = *(in_addr_t *)&nam->sa_data; - - rtalloc_ign(&inp->inp_route, 0); + return (EHOSTUNREACH); } - - if (inp->inp_route.ro_rt == NULL) - return (0); + ifp = inp->inp_route.ro_rt->rt_ifp; tdev = TOEDEV(ifp); - - if ((tdev == NULL) || (tdev->can_offload(tdev, so) == 0)) - return (0); - if (tdev->connect(tdev, so, ifp)) - return (1); - + if (tdev == NULL) { + printf("tdev not set for ifp=%p name=%s\n", ifp, if_name(ifp)); + return (EINVAL); + } + + if ((tdev == NULL) || (tdev->can_offload(tdev, so) == 0)) { + printf("can't offload\n"); + + return (EINVAL); + } + + if ((err = tdev->connect(tdev, so, ifp))) + return (err); + + printf("connected!!!\n"); + return (0); } ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ int error; struct tcpcb *tp = sototcpcb(so); - if (!SO_OFFLOADABLE(so) || (error = ofld_connect(so, nam)) == 0) + if (!SO_OFFLOADABLE(so) || (error = ofld_connect(so, nam)) != 0) error = tcp_output(tp); else printf("connection offloaded\n"); From owner-p4-projects@FreeBSD.ORG Mon Oct 29 03:05:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AD7F16A469; Mon, 29 Oct 2007 03:05:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D12C216A418 for ; Mon, 29 Oct 2007 03:05:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C48613C48A for ; Mon, 29 Oct 2007 03:05:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T35Wcu089488 for ; Mon, 29 Oct 2007 03:05:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T35WdS089485 for perforce@freebsd.org; Mon, 29 Oct 2007 03:05:32 GMT (envelope-from jb@freebsd.org) Date: Mon, 29 Oct 2007 03:05:32 GMT Message-Id: <200710290305.l9T35WdS089485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 03:05:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=128271 Change 128271 by jb@jb_freebsd1 on 2007/10/29 03:05:21 Suck the original DTrace providers without FreeBSD modifications. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/fasttrap.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/lockstat.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/profile.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/systrace.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Oct 29 03:07:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7616A16A419; Mon, 29 Oct 2007 03:07:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 251FB16A417 for ; Mon, 29 Oct 2007 03:07:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F167013C465 for ; Mon, 29 Oct 2007 03:07:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T37Y3D089579 for ; Mon, 29 Oct 2007 03:07:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T37Y2v089576 for perforce@freebsd.org; Mon, 29 Oct 2007 03:07:34 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 Oct 2007 03:07:34 GMT Message-Id: <200710290307.l9T37Y2v089576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 03:07:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=128272 Change 128272 by kmacy@kmacy:storage:toestack on 2007/10/29 03:07:15 add missed headers for tom support Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 add .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Oct 29 04:32:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56AB216A419; Mon, 29 Oct 2007 04:32:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D57F716A417 for ; Mon, 29 Oct 2007 04:32:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C1F3113C465 for ; Mon, 29 Oct 2007 04:32:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T4WC6w096009 for ; Mon, 29 Oct 2007 04:32:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T4W9JV096002 for perforce@freebsd.org; Mon, 29 Oct 2007 04:32:09 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 Oct 2007 04:32:09 GMT Message-Id: <200710290432.l9T4W9JV096002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128274 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 04:32:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=128274 Change 128274 by kmacy@entropy_kmacy_xen31 on 2007/10/29 04:31:54 IFC #128267 Affected files ... .. //depot/projects/xen31/ObsoleteFiles.inc#3 integrate .. //depot/projects/xen31/bin/ps/extern.h#2 integrate .. //depot/projects/xen31/bin/ps/keyword.c#2 integrate .. //depot/projects/xen31/bin/ps/print.c#2 integrate .. //depot/projects/xen31/bin/ps/ps.c#2 integrate .. //depot/projects/xen31/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/xen31/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/xen31/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/xen31/etc/rc.d/Makefile#2 integrate .. //depot/projects/xen31/etc/rc.d/amd#2 integrate .. //depot/projects/xen31/etc/rc.d/nfslocking#2 delete .. //depot/projects/xen31/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/xen31/include/_ctype.h#2 integrate .. //depot/projects/xen31/include/pthread_np.h#2 integrate .. //depot/projects/xen31/lib/Makefile#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/xen31/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/xen31/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/xen31/rescue/rescue/Makefile#2 integrate .. //depot/projects/xen31/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/xen31/sbin/route/route.c#2 integrate .. //depot/projects/xen31/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/xen31/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/xen31/share/man/man9/Makefile#2 integrate .. //depot/projects/xen31/share/man/man9/kproc.9#2 integrate .. //depot/projects/xen31/share/man/man9/kthread.9#2 integrate .. //depot/projects/xen31/share/misc/committers-doc.dot#2 integrate .. //depot/projects/xen31/share/misc/committers-src.dot#2 integrate .. //depot/projects/xen31/share/misc/pci_vendors#2 integrate .. //depot/projects/xen31/share/mk/sys.mk#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/xen31/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/xen31/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/xen31/sys/amd64/include/clock.h#2 integrate .. //depot/projects/xen31/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/xen31/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/xen31/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/xen31/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/xen31/sys/arm/at91/std.at91#2 integrate .. //depot/projects/xen31/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/xen31/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/xen31/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/xen31/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/xen31/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/xen31/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/xen31/sys/boot/common/ufsread.c#3 integrate .. //depot/projects/xen31/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/xen31/sys/boot/i386/gptboot/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/xen31/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/xen31/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/xen31/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/xen31/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/xen31/sys/conf/files#2 integrate .. //depot/projects/xen31/sys/conf/files.amd64#2 integrate .. //depot/projects/xen31/sys/conf/files.arm#2 integrate .. //depot/projects/xen31/sys/conf/files.ia64#2 integrate .. //depot/projects/xen31/sys/conf/files.pc98#2 integrate .. //depot/projects/xen31/sys/conf/files.powerpc#2 integrate .. //depot/projects/xen31/sys/conf/files.sun4v#2 integrate .. //depot/projects/xen31/sys/conf/options.arm#2 integrate .. //depot/projects/xen31/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/xen31/sys/ddb/db_examine.c#2 integrate .. //depot/projects/xen31/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/xen31/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/xen31/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/xen31/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/xen31/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/xen31/sys/dev/mii/miidevs#2 integrate .. //depot/projects/xen31/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/xen31/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/xen31/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/xen31/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/xen31/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/xen31/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/xen31/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/xen31/sys/geom/geom_io.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/xen31/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/xen31/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/xen31/sys/i386/include/clock.h#2 integrate .. //depot/projects/xen31/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/xen31/sys/i386/isa/clock.c#2 integrate .. //depot/projects/xen31/sys/kern/init_main.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_exit.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_idle.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_intr.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_sig.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_thread.c#2 integrate .. //depot/projects/xen31/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/xen31/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/xen31/sys/modules/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/geom/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/nvram/Makefile#1 branch .. //depot/projects/xen31/sys/net/if_disc.c#2 integrate .. //depot/projects/xen31/sys/net/if_loop.c#2 integrate .. //depot/projects/xen31/sys/netatalk/aarp.c#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/xen31/sys/netinet/if_ether.c#2 integrate .. //depot/projects/xen31/sys/netinet/igmp.c#2 integrate .. //depot/projects/xen31/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/xen31/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/xen31/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/xen31/sys/netinet6/nd6.c#3 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/xen31/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/xen31/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/xen31/sys/security/audit/audit.c#2 integrate .. //depot/projects/xen31/sys/security/audit/audit.h#2 integrate .. //depot/projects/xen31/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/xen31/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/xen31/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/xen31/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/xen31/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/xen31/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/xen31/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/xen31/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/xen31/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/xen31/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/xen31/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/xen31/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/xen31/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/xen31/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/xen31/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/xen31/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/xen31/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/xen31/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/xen31/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/xen31/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/xen31/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/xen31/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/xen31/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/xen31/sys/sys/kthread.h#2 integrate .. //depot/projects/xen31/sys/sys/param.h#3 integrate .. //depot/projects/xen31/sys/sys/proc.h#2 integrate .. //depot/projects/xen31/sys/vm/vm_page.c#2 integrate .. //depot/projects/xen31/tools/regression/geom_eli/init-a.t#2 integrate .. //depot/projects/xen31/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/xen31/tools/regression/geom_eli/integrity-copy.t#2 integrate .. //depot/projects/xen31/tools/regression/geom_eli/integrity-data.t#2 integrate .. //depot/projects/xen31/tools/regression/geom_eli/integrity-hmac.t#2 integrate .. //depot/projects/xen31/tools/regression/geom_eli/onetime-a.t#2 integrate .. //depot/projects/xen31/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/xen31/usr.bin/awk/Makefile#2 integrate .. //depot/projects/xen31/usr.bin/awk/lib.c.diff#2 delete .. //depot/projects/xen31/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/xen31/usr.bin/top/machine.c#2 integrate .. //depot/projects/xen31/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/xen31/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/xen31/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/xen31/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/xen31/usr.sbin/wpa/hostapd/hostapd.8#2 integrate Differences ... ==== //depot/projects/xen31/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd +OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached ==== //depot/projects/xen31/bin/ps/extern.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $ */ struct kinfo; @@ -39,7 +39,7 @@ extern int cflag, eval, fscale, nlistread, rawcpu; extern unsigned long mempages; extern time_t now; -extern int sumrusage, termwidth, totwidth; +extern int showthreads, sumrusage, termwidth, totwidth; extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS @@ -78,6 +78,7 @@ void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); ==== //depot/projects/xen31/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $"); #include #include @@ -186,6 +186,7 @@ {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, + {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, ==== //depot/projects/xen31/bin/ps/print.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -129,9 +129,11 @@ v = ve->var; if (cflag) { /* If it is the last field, then don't pad */ - if (STAILQ_NEXT(ve, next_ve) == NULL) + if (STAILQ_NEXT(ve, next_ve) == NULL) { (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); return; } @@ -178,13 +180,28 @@ VAR *v; v = ve->var; - if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); } void +tdnam(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + if (showthreads && k->ki_p->ki_numthreads > 1) + (void)printf("%-*s", v->width, k->ki_p->ki_ocomm); + else + (void)printf("%-*s", v->width, " " ); + +} + +void logname(KINFO *k, VARENT *ve) { VAR *v; ==== //depot/projects/xen31/bin/ps/ps.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -98,6 +98,7 @@ int sumrusage; /* -S */ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ +int showthreads; /* will threads be shown? */ struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); @@ -175,7 +176,7 @@ char *cols; int all, ch, elem, flag, _fmt, i, lineno; int nentries, nkept, nselectors; - int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; + int prtheader, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; (void) setlocale(LC_ALL, ""); ==== //depot/projects/xen31/contrib/one-true-awk/FIXES#2 (text+ko) ==== @@ -25,6 +25,14 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Oct 23, 2007: + minor fix in lib.c: increase inputFS to 100, change malloc + for fields to n+1. + + fixed memory fault caused by out of order test in setsval. + + thanks to david o'brien, freebsd, for both fixes. + May 1, 2007: fiddle in makefile to fix for BSD make; thanks to igor sobrado. ==== //depot/projects/xen31/contrib/one-true-awk/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $ Import of the 2005/04/24 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). -Original sources were taken from the Brian Kernighan's home page -(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -May 01, 2007. +Original sources were taken from the Brian Kernighan's AWK page +http://www.cs.princeton.edu/~bwk/btl.mirror +and include bug fixes up thru Oct 23, 2007. The following files were removed for this import: @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023 ==== //depot/projects/xen31/contrib/one-true-awk/lib.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ int fieldssize = RECSIZE; Cell **fldtab; /* pointers to Cells */ -char inputFS[10] = " "; +char inputFS[100] = " "; #define MAXFLD 2 int nfields = MAXFLD; /* last allocated slot for $i */ @@ -58,7 +58,7 @@ void recinit(unsigned int n) { if ( (record = (char *) malloc(n)) == NULL - || (fields = (char *) malloc(n)) == NULL + || (fields = (char *) malloc(n+1)) == NULL || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL ) FATAL("out of space for $0 and fields"); ==== //depot/projects/xen31/contrib/one-true-awk/tran.c#2 (text+ko) ==== @@ -332,10 +332,10 @@ donerec = 1; } t = tostring(s); /* in case it's self-assign */ + if (freeable(vp)) + xfree(vp->sval); vp->tval &= ~NUM; vp->tval |= STR; - if (freeable(vp)) - xfree(vp->sval); vp->tval &= ~DONTFREE; dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); ==== //depot/projects/xen31/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ .include @@ -25,7 +25,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/xen31/etc/rc.d/amd#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ # # PROVIDE: amd @@ -47,7 +47,7 @@ ;; *) rc_flags="-p ${rc_flags}" - command_args=" > /var/run/amd.pid 2> /dev/null" + command_args="> /var/run/amd.pid 2> /dev/null" ;; esac return 0 ==== //depot/projects/xen31/games/fortune/datfiles/fortunes#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.243 2007/10/21 05:16:52 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.244 2007/10/28 07:02:10 dougb Exp $ % ======================================================================= @@ -16494,10 +16494,10 @@ you through times of no dope. -- Gilbert Shelton % -Dorothy: But how can you talk without a brain? -Scarecrow: Well, I don't know... but some people - without brains do an awful lot of talking. - -- The Wizard of Oz +Dorothy: How can you talk if you haven't got a brain? +Scarecrow: I don't know. But some people without brains do an + awful lot of talking, don't they? + -- Judy Garland and Ray Bolger, "The Wizard of Oz" % Double! % @@ -20094,8 +20094,6 @@ think not, my friend, I think not. -- Arthur Naiman, "Every Goy's Guide to Yiddish" % -"Gee, Toto, I don't think we are in Kansas anymore." -% GEMINI (May 21 - June 20) A day to take the initiative. Put the garbage out, for instance, and pick up the stuff at the dry cleaners. Watch @@ -22013,7 +22011,7 @@ Guernsey cows? It's gonna be the herd shot 'round the world. % Hearts will never be practical until they can be made unbreakable. - -- The Wizard of Oz + -- Frank Morgan as The Wizard, "The Wizard of Oz" % Heaven and earth were created all together in the same instant, on October 23rd, 4004 B.C. at nine o'clock in the morning. @@ -23447,6 +23445,9 @@ I can't believe that out of 100,000 sperm, you were the quickest. -- Steven Pearl % +I CAN'T come back, I don't know how it works. + -- Frank Morgan as The Wizard, "The Wizard of Oz" +% I can't complain, but sometimes I still do. -- Joe Walsh % @@ -28015,6 +28016,9 @@ thank everyone for making this night necessary. -- Yogi Berra at a dinner in his honor % +Oh no my dear, I'm a very good man. I'm just a very bad wizard. + -- Frank Morgan as The Wizard, "The Wizard of Oz" +% I'm all for computer dating, but I wouldn't want one to marry my sister. % @@ -38585,6 +38589,9 @@ % Pause for storage relocation. % +Pay no attention to that man behind the curtain. + -- Frank Morgan as The Wizard, "The Wizard of Oz" +% paycheck: The weekly $5.27 that remains after deductions for federal withholding, state withholding, city withholding, FICA, @@ -53297,8 +53304,8 @@ TOTD (T-shirt Of The Day): I'm the person your mother warned you about. % -Toto, I don't think we're in Kansas anymore. - -- Judy Garland, "Wizard of Oz" +Toto, I have a feeling we're not in Kansas anymore. + -- Judy Garland as Dorothy Gale, "The Wizard of Oz" % Tourists -- have some fun with New York's hard-boiled cabbies. When you get to your destination, say to your driver, "Pay? I was hitch-hiking." @@ -56222,6 +56229,9 @@ % What will you do if all your problems aren't solved by the time you die? % +What would you do with a brain if you had one? + -- Judy Garland as Dorothy Gale, "The Wizard of Oz" +% What you don't know can hurt you, only you won't know it. % What you don't know won't help you much either. ==== //depot/projects/xen31/include/_ctype.h#2 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.31 2007/10/13 16:28:21 ache Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $ */ #ifndef __CTYPE_H_ @@ -126,7 +126,7 @@ static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c < 0 || _c >= __mb_sb_limit) ? 0 : + return (_c & ~0x7F) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } ==== //depot/projects/xen31/include/pthread_np.h#2 (text+ko) ==== @@ -10,10 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread_np.h,v 1.16 2005/10/04 07:23:56 davidxu Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.17 2007/10/29 00:31:54 imp Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ ==== //depot/projects/xen31/lib/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.224 2007/10/09 23:31:10 obrien Exp $ +# $FreeBSD: src/lib/Makefile,v 1.225 2007/10/26 11:07:25 ru Exp $ .include @@ -7,7 +7,7 @@ # built are visible: # # csu must be built before all shared libaries for ELF. -# libc must be built before all other shared libraries +# libc must be built before all other shared libraries. # libcom_err must be built before libkrb5 and libpam. # libcrypt must be built before libkrb5 and libpam. # libkvm must be built before libdevstat. ==== //depot/projects/xen31/lib/libarchive/archive_read_support_compression_none.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.17 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.18 2007/10/27 22:45:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -334,7 +334,7 @@ const void* dummy_buffer; ssize_t bytes_read; bytes_read = archive_decompressor_none_read_ahead(a, - &dummy_buffer, request); + &dummy_buffer, 1); if (bytes_read < 0) return (bytes_read); if (bytes_read == 0) { ==== //depot/projects/xen31/lib/libkvm/kvm_proc.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.94 2007/09/21 04:11:34 jeff Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.96 2007/10/26 15:25:28 julian Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -120,6 +120,10 @@ kp = &kinfo_proc; kp->ki_structsize = sizeof(kinfo_proc); + /* + * Loop on the processes. this is completely broken because we need to be + * able to loop on the threads and merge the ones that are the same process some how. + */ for (; cnt < maxcnt && p != NULL; p = LIST_NEXT(&proc, p_list)) { memset(kp, 0, sizeof *kp); if (KREAD(kd, (u_long)p, &proc)) { @@ -402,8 +406,11 @@ kp->ki_pri.pri_native = mtd.td_base_pri; kp->ki_lastcpu = mtd.td_lastcpu; kp->ki_wchan = mtd.td_wchan; + if (mtd.td_name[0] != 0) + strlcpy(kp->ki_ocomm, mtd.td_name, MAXCOMLEN); kp->ki_oncpu = mtd.td_oncpu; - + if (mtd.td_name[0] != '\0') + strlcpy(kp->ki_ocomm, mtd.td_name, sizeof(kp->ki_ocomm)); if (!(proc.p_flag & P_SA)) { kp->ki_pctcpu = 0; kp->ki_rqindex = 0; ==== //depot/projects/xen31/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8,v 1.9 2004/07/02 23:52:17 ru Exp $ +.\" $FreeBSD: src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8,v 1.10 2007/10/26 07:50:11 des Exp $ .\" -.Dd January 21, 2002 +.Dd October 26, 2007 .Dt PAM_OPIEACCESS 8 .Os .Sh NAME @@ -88,7 +88,7 @@ host in .Pa /etc/opieaccess , and the user does not have a file named -.Pa opiealways +.Pa \&.opiealways in his home directory. .El .Pp @@ -115,12 +115,14 @@ was declined. .El .Sh FILES -.Bl -tag -width ".Pa /etc/opieaccess" +.Bl -tag -width ".Pa $HOME/.opiealways" .It Pa /etc/opieaccess List of trusted hosts or networks. See .Xr opieaccess 5 for a description of its syntax. +.It Pa $HOME/.opiealways +The presence of this file makes OPIE mandatory for the user. .El .Sh SEE ALSO .Xr opie 4 , ==== //depot/projects/xen31/rescue/rescue/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.56 2007/07/14 21:49:22 rwatson Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.57 2007/10/27 18:18:58 yar Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= @@ -85,6 +85,10 @@ CRUNCH_ALIAS_rm= unlink CRUNCH_ALIAS_ed= red +CRUNCH_PROGS_bin+= pkill +CRUNCH_SRCDIR_pkill= ${.CURDIR}/../../usr.bin/pkill +CRUNCH_ALIAS_pkill= pgrep + .if ${MK_RCMDS} != "no" CRUNCH_PROGS_bin+= rcp .endif @@ -190,6 +194,8 @@ # CRUNCH_SRCDIRS+= usr.bin +CRUNCH_PROGS_usr.bin= head mt sed tail tee + CRUNCH_PROGS_usr.bin+= gzip CRUNCH_ALIAS_gzip= gunzip gzcat zcat @@ -211,7 +217,10 @@ # CRUNCH_SRCDIRS+= usr.sbin -CRUNCH_PROGS_usr.sbin+= chroot +CRUNCH_PROGS_usr.sbin= chroot + +CRUNCH_PROGS_usr.sbin+= chown +CRUNCH_ALIAS_chown= chgrp ################################################################## # The following is pretty nearly a generic crunchgen-handling makefile ==== //depot/projects/xen31/sbin/ipfw/ipfw2.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.109 2007/10/19 12:48:02 rpaulo Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.110 2007/10/27 22:04:19 maxim Exp $ */ #include @@ -6226,16 +6226,16 @@ config_pipe(ac, av); else if (do_nat && _substrcmp(*av, "config") == 0) config_nat(ac, av); - else if (_substrcmp(*av, "set") == 0) - sets_handler(ac, av); - else if (_substrcmp(*av, "table") == 0) - table_handler(ac, av); - else if (_substrcmp(*av, "enable") == 0) - sysctl_handler(ac, av, 1); - else if (_substrcmp(*av, "disable") == 0) - sysctl_handler(ac, av, 0); - else - try_next = 1; + else if (_substrcmp(*av, "set") == 0) + sets_handler(ac, av); + else if (_substrcmp(*av, "table") == 0) + table_handler(ac, av); + else if (_substrcmp(*av, "enable") == 0) + sysctl_handler(ac, av, 1); + else if (_substrcmp(*av, "disable") == 0) + sysctl_handler(ac, av, 0); + else + try_next = 1; } if (use_set || try_next) { ==== //depot/projects/xen31/sbin/route/route.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/route/route.c,v 1.81 2005/09/28 12:12:15 tobez Exp $"; + "$FreeBSD: src/sbin/route/route.c,v 1.82 2007/10/29 00:08:24 mtm Exp $"; #endif /* not lint */ #include @@ -799,28 +799,32 @@ rtm_addrs |= RTA_NETMASK; if (net == 0) mask = addr = 0; - else if (net < 128) { - addr = net << IN_CLASSA_NSHIFT; - mask = IN_CLASSA_NET; - } else if (net < 65536) { - addr = net << IN_CLASSB_NSHIFT; - mask = IN_CLASSB_NET; - } else if (net < 16777216L) { - addr = net << IN_CLASSC_NSHIFT; - mask = IN_CLASSC_NET; - } else { - addr = net; - if ((addr & IN_CLASSA_HOST) == 0) - mask = IN_CLASSA_NET; - else if ((addr & IN_CLASSB_HOST) == 0) - mask = IN_CLASSB_NET; - else if ((addr & IN_CLASSC_HOST) == 0) - mask = IN_CLASSC_NET; + else { + if (net <= 0xff) + addr = net << IN_CLASSA_NSHIFT; + else if (net <= 0xffff) + addr = net << IN_CLASSB_NSHIFT; + else if (net <= 0xffffff) + addr = net << IN_CLASSC_NSHIFT; else - mask = -1; + addr = net; + + if (bits != 0) + mask = 0xffffffff << (32 - bits); + else { + if (IN_CLASSA(addr)) + mask = IN_CLASSA_NET; + else if (IN_CLASSB(addr)) + mask = IN_CLASSB_NET; + else if (IN_CLASSC(addr)) + mask = IN_CLASSC_NET; + else if (IN_MULTICAST(addr)) + mask = IN_CLASSD_NET; + else + mask = 0xffffffff; + } + addr &= mask; } - if (bits) - mask = 0xffffffff << (32 - bits); sin->sin_addr.s_addr = htonl(addr); sin = &so_mask.sin; sin->sin_addr.s_addr = htonl(mask); ==== //depot/projects/xen31/share/man/man5/rc.conf.5#2 (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/man5/rc.conf.5,v 1.330 2007/10/15 20:00:20 netchild Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.331 2007/10/28 13:33:25 miwi Exp $ .\" -.Dd September 3, 2007 +.Dd October 27, 2007 .Dt RC.CONF 5 .Os .Sh NAME @@ -1127,7 +1127,9 @@ ifconfig_ed0="DHCP" .Ed .Pp -Also, if your interface needs WPA authentication, it is possible to add +Also, if you want to configure your wireless interface with +.Xr wpa_supplicant 8 +for use with WPA, EAP/LEAP or WEP, you need to add .Dq Li WPA to the .Va ifconfig_ Ns Aq Ar interface ==== //depot/projects/xen31/share/man/man8/rc.subr.8#2 (text+ko) ==== @@ -34,7 +34,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/man8/rc.subr.8,v 1.18 2007/05/18 12:04:41 mtm Exp $ +.\" $FreeBSD: src/share/man/man8/rc.subr.8,v 1.19 2007/10/26 09:38:54 yar Exp $ .\" .Dd May 18, 2007 .Dt RC.SUBR 8 @@ -218,6 +218,11 @@ .Ar var is not set correctly. The values are case insensitive. +.Sy Note : +.Ar var +should be a variable name, not its value; +.Ic checkyesno +will expand the variable by itself. .It Ic check_pidfile Ar pidfile procname Op Ar interpreter Parses the first word of the first line of .Ar pidfile @@ -836,20 +841,17 @@ .It Ic stop_boot Op Ar always Prevent booting to multiuser mode. If the -.Sy autoboot -variable is -.Sq yes , +.Va autoboot +variable is set to +.Ql yes , or -.Ar always -is -.Sq true , -then a -.Sy SIGTERM +.Ic checkyesno Ar always +indicates a truth value, then a +.Dv SIGTERM signal is sent to the parent -process (which is assumed to be -.Xr rc 8 ). -Otherwise, the shell exits with status -.Li 1 . +process, which is assumed to be +.Xr rc 8 . +Otherwise, the shell exits with a non-zero status. .It Ic set_rcvar Op Ar base Set the variable name required to start a service. In ==== //depot/projects/xen31/share/man/man9/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.312 2007/10/15 20:00:20 netchild Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.314 2007/10/26 16:50:21 julian Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -129,6 +129,7 @@ kernacc.9 \ kernel_mount.9 \ kobj.9 \ + kproc.9 \ kqueue.9 \ kthread.9 \ ktr.9 \ @@ -603,8 +604,8 @@ hash.9 hash32_strn.9 \ hash.9 hash32_strne.9 MLINKS+=hashinit.9 hashdestroy.9 \ - hashinit.9 phashinit.9 \ - hashinit.9 hashinit_flags.9 + hashinit.9 hashinit_flags.9 \ + hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_attach.9 \ ieee80211.9 ieee80211_chan2ieee.9 \ ieee80211.9 ieee80211_chan2mode.9 \ @@ -674,6 +675,13 @@ kobj.9 kobj_create.9 \ kobj.9 kobj_delete.9 \ kobj.9 kobj_init.9 +MLINKS+=kproc.9 kproc_create.9 \ + kproc.9 kproc_exit.9 \ + kproc.9 kproc_resume,.9 \ + kproc.9 kproc_shutdown.9 \ + kproc.9 kproc_start.9 \ + kproc.9 kproc_suspend.9 \ + kproc.9 kproc_suspend_check.9 MLINKS+=kqueue.9 knlist_add.9 \ kqueue.9 knlist_clear.9 \ kqueue.9 knlist_delete.9 \ @@ -688,11 +696,11 @@ kqueue.9 kqfd_register.9 \ kqueue.9 kqueue_add_filteropts.9 \ kqueue.9 kqueue_del_filteropts.9 -MLINKS+=kthread.9 kproc_shutdown.9 \ - kthread.9 kproc_start.9 \ - kthread.9 kthread_create.9 \ +MLINKS+=kthread.9 kthread_add.9 \ kthread.9 kthread_exit.9 \ kthread.9 kthread_resume.9 \ + kthread.9 kthread_shutdown.9 \ + kthread.9 kthread_start.9 \ kthread.9 kthread_suspend.9 \ kthread.9 kthread_suspend_check.9 MLINKS+=ktr.9 CTR0.9 \ @@ -1034,8 +1042,8 @@ socket.9 socreate.9 \ socket.9 sogetopt.9 \ socket.9 soreceive.9 \ + socket.9 sosend.9 \ socket.9 sosetopt.9 \ - socket.9 sosend.9 \ socket.9 soshutdown.9 MLINKS+=spl.9 spl0.9 \ spl.9 splbio.9 \ @@ -1061,13 +1069,13 @@ sx.9 sx_downgrade.9 \ sx.9 sx_init.9 \ sx.9 sx_init_flags.9 \ + sx.9 sx_sleep.9 \ sx.9 sx_slock.9 \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 29 07:42:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0625C16A419; Mon, 29 Oct 2007 07:42:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A24EE16A417 for ; Mon, 29 Oct 2007 07:42:54 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8CCE613C480 for ; Mon, 29 Oct 2007 07:42:54 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T7gsm1020428 for ; Mon, 29 Oct 2007 07:42:54 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T7gsKI020425 for perforce@freebsd.org; Mon, 29 Oct 2007 07:42:54 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Mon, 29 Oct 2007 07:42:54 GMT Message-Id: <200710290742.l9T7gsKI020425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 128276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 07:42:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=128276 Change 128276 by zhouzhouyi@zhouzhouyi_mactest on 2007/10/29 07:42:42 Adapt the testsuite according to integration Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files#6 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/conf/GENERIC#5 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_policy.h#6 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_vfs.c#6 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_biba/mac_biba.c#5 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_mls/mac_mls.c#5 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#8 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#4 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#4 (text+ko) ==== @@ -7,7 +7,7 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..9" +echo "1..10" n0=`namegen` n1=`namegen` @@ -18,7 +18,7 @@ #turn off all the switches for i in `sysctl security.mac | grep "\.enabled"| sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 + t=`sysctl ${i}=0` done mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` @@ -36,7 +36,7 @@ ############################################################# t=`sysctl security.mac.mls.enabled=1` - echo "enforcing mac/mls!" +# echo "enforcing mac/mls!" #case 1: mkdir mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} 0755 #case 2: setfmac @@ -52,24 +52,28 @@ mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} ############################################################# -#case 6: unlink - echo -n "pid = -1 mac_test_check_vnode_delete:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} + t=`sysctl security.mac.mls.enabled=0` +#case 6: link success + truncate -s 0 ${mactest_conf} + mactestexpect "" 0 -m "mls/5(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} + t=`sysctl security.mac.mls.enabled=1` + +#case 7: unlink + truncate -s 0 ${mactest_conf} mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} - -#case 7: setfmac fail, old vnode not in range +#case 8: setfmac fail, old vnode not in range echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} echo "biba/high(low-high),mls/6(6-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} mactestexpect "setfmac:.mac_set_link.${n3}.${n1},.biba.,mls.6.:.Operation.not.permitted" "" -m "mls/6(6-6)" -f ${mactest_conf} system setfmac "biba/,mls/6" ${n3}/${n1} -#case 8: setfmac success +#case 9: setfmac success echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} echo "biba/high(low-high),mls/6(4-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} mactestexpect "" "" -m "mls/6(4-6)" -f ${mactest_conf} system setfmac "biba/,mls/6" ${n3}/${n1} -#case 9: unlink +#case 10: unlink rm ${mactest_conf} touch ${mactest_conf} mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} @@ -77,7 +81,6 @@ #cleanup: t=`sysctl security.mac.mls.enabled=0` - echo "disabling mac/mls!" rm -fr ${n3} rm ${mactest_conf} fi ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files#6 (text+ko) ==== @@ -2057,6 +2057,8 @@ security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids security/mac_stub/mac_stub.c optional mac_stub security/mac_test/mac_test.c optional mac_test +security/mac_test/mac_test_if.c optional mac_test +security/mac_test/mac_test_log.c optional mac_test ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/conf/GENERIC#5 (text+ko) ==== @@ -28,6 +28,10 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +options MAC +options MAC_MLS +options MAC_BIBA +options MAC_TEST options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_policy.h#6 (text+ko) ==== @@ -634,6 +634,7 @@ mpo_init_bpfdesc_label_t mpo_init_bpfdesc_label; mpo_init_cred_label_t mpo_init_cred_label; mpo_init_devfs_label_t mpo_init_devfs_label; + mpo_init_devfs_label_t mpo_init_mactest_label; mpo_placeholder_t _mpo_placeholder0; mpo_init_ifnet_label_t mpo_init_ifnet_label; mpo_init_inpcb_label_t mpo_init_inpcb_label; ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_vfs.c#6 (text+ko) ==== @@ -66,6 +66,7 @@ #include #include +#include #include #include @@ -90,11 +91,28 @@ return (label); } + + +static struct label * +mac_mactest_label_alloc(void) +{ + struct label *label; + + label = mac_labelzone_alloc(M_WAITOK); + MAC_PERFORM(init_devfs_label, label); + MAC_PERFORM(init_mactest_label, label); + return (label); +} + + void mac_init_devfs(struct devfs_dirent *de) { - de->de_label = mac_devfs_label_alloc(); + if (de&&de->de_dirent&&!strncmp(de->de_dirent->d_name,"mactest", 7)) + de->de_label = mac_mactest_label_alloc(); + else + de->de_label = mac_devfs_label_alloc(); } static struct label * ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_biba/mac_biba.c#5 (text+ko) ==== @@ -793,6 +793,7 @@ if (strcmp(dev->si_name, "null") == 0 || strcmp(dev->si_name, "zero") == 0 || strcmp(dev->si_name, "random") == 0 || + strcmp(dev->si_name, "mactest") == 0 || strncmp(dev->si_name, "fd/", strlen("fd/")) == 0) biba_type = MAC_BIBA_TYPE_EQUAL; else if (ptys_equal && ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_mls/mac_mls.c#5 (text+ko) ==== @@ -754,6 +754,7 @@ mac_mls = SLOT(delabel); if (strcmp(dev->si_name, "null") == 0 || strcmp(dev->si_name, "zero") == 0 || + strcmp(dev->si_name, "mactest") == 0 || strcmp(dev->si_name, "random") == 0 || strncmp(dev->si_name, "fd/", strlen("fd/")) == 0) mls_type = MAC_MLS_TYPE_EQUAL; ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.79 2007/10/21 11:11:07 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.76 2007/04/23 13:36:54 rwatson Exp $ */ /* @@ -54,13 +54,15 @@ #include #include #include +#include #include #include #include #include #include #include - +#include +#include #include #include @@ -69,14 +71,19 @@ #include #include +#include -SYSCTL_DECL(_security_mac); +//SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, test, CTLFLAG_RW, 0, "TrustedBSD mac_test policy controls"); +SYSCTL_PROC(_security_mac_test, OID_AUTO, pseudoinit, CTLTYPE_INT | CTLFLAG_RW, 0, 0, + mac_test_init_if, "I", "set to setup the pseudo interfaces for MAC test"); + #define MAGIC_BPF 0xfe1ad1b6 #define MAGIC_DEVFS 0x9ee79c32 +#define MAGIC_MACTESTLOG 0x9ee79c33 #define MAGIC_IFNET 0xc218b120 #define MAGIC_INPCB 0x4440f7bb #define MAGIC_IPQ 0x206188ef @@ -119,14 +126,16 @@ #define LABEL_CHECK(label, magic) do { \ if (label != NULL) { \ - KASSERT(SLOT(label) == magic || SLOT(label) == 0, \ + KASSERT(SLOT(label) == magic || SLOT(label) == 0 || \ + SLOT(label) == MAGIC_MACTESTLOG, \ ("%s: bad %s label", __func__, #magic)); \ } \ } while (0) #define LABEL_DESTROY(label, magic) do { \ - if (SLOT(label) == magic || SLOT(label) == 0) { \ - SLOT_SET(label, MAGIC_FREE); \ + if (SLOT(label) == magic || SLOT(label) == 0 || \ + SLOT(label) == MAGIC_MACTESTLOG ) { \ + SLOT_SET(label, MAGIC_FREE); \ } else if (SLOT(label) == MAGIC_FREE) { \ DEBUGGER("%s: dup destroy", __func__); \ } else { \ @@ -150,7 +159,9 @@ static void mac_test_init_bpfdesc_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_bpfdesc_label\n", + strlen("mac_test_init_bpfdesc_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_BPF); COUNTER_INC(init_bpfdesc_label); } @@ -159,7 +170,9 @@ static void mac_test_init_cred_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_cred_label\n", + strlen("mac_test_init_cred_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_CRED); COUNTER_INC(init_cred_label); } @@ -168,16 +181,26 @@ static void mac_test_init_devfs_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_devfs_label\n", + strlen("mac_test_init_devfs_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_DEVFS); COUNTER_INC(init_devfs_label); } +static void +mac_test_init_mactest_label(struct label *label) +{ + LABEL_INIT(label, MAGIC_MACTESTLOG); +} + COUNTER_DECL(init_ifnet_label); static void mac_test_init_ifnet_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_ifnet_label\n", + strlen("mac_test_init_ifnet_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_IFNET); COUNTER_INC(init_ifnet_label); } @@ -186,7 +209,9 @@ static int mac_test_init_inpcb_label(struct label *label, int flag) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_inpcb_label\n", + strlen("mac_test_init_inpcb_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_inpcb_label() at %s:%d", __FILE__, @@ -201,6 +226,9 @@ static void mac_test_init_sysv_msgmsg_label(struct label *label) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_msgmsg_label\n", + strlen("mac_test_init_sysv_msgmsg_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_MSG); COUNTER_INC(init_sysv_msg_label); } @@ -209,6 +237,9 @@ static void mac_test_init_sysv_msgqueue_label(struct label *label) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_msgqueue_label\n", + strlen("mac_test_init_sysv_msgqueue_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_MSQ); COUNTER_INC(init_sysv_msq_label); } @@ -217,6 +248,9 @@ static void mac_test_init_sysv_sem_label(struct label *label) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_sem_label\n", + strlen("mac_test_init_sysv_sem_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_SEM); COUNTER_INC(init_sysv_sem_label); } @@ -225,6 +259,9 @@ static void mac_test_init_sysv_shm_label(struct label *label) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_shm_label\n", + strlen("mac_test_init_sysv_shm_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_SHM); COUNTER_INC(init_sysv_shm_label); } @@ -233,7 +270,9 @@ static int mac_test_init_ipq_label(struct label *label, int flag) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_ipq_label\n", + strlen("mac_test_init_ipq_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_ipq_label() at %s:%d", __FILE__, @@ -248,7 +287,9 @@ static int mac_test_init_mbuf_label(struct label *label, int flag) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_mbuf_label\n", + strlen("mac_test_init_mbuf_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_mbuf_label() at %s:%d", __FILE__, @@ -263,7 +304,9 @@ static void mac_test_init_mount_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_mount_label\n", + strlen("mac_test_init_mount_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_MOUNT); COUNTER_INC(init_mount_label); } @@ -273,6 +316,9 @@ mac_test_init_socket_label(struct label *label, int flag) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_socket_label\n", + strlen("mac_test_init_socket_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_socket_label() at %s:%d", __FILE__, @@ -287,7 +333,9 @@ static int mac_test_init_socket_peer_label(struct label *label, int flag) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_socket_peer_label\n", + strlen("mac_test_init_socket_peer_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_socket_peer_label() at %s:%d", __FILE__, @@ -302,7 +350,9 @@ static void mac_test_init_pipe_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_pipe_label\n", + strlen("mac_test_init_pipe_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_PIPE); COUNTER_INC(init_pipe_label); } @@ -311,7 +361,9 @@ static void mac_test_init_posix_sem_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_posix_sem_label\n", + strlen("mac_test_init_posix_sem_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_POSIX_SEM); COUNTER_INC(init_posix_sem_label); } @@ -320,7 +372,9 @@ static void mac_test_init_proc_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_proc_label\n", + strlen("mac_test_init_proc_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_PROC); COUNTER_INC(init_proc_label); } @@ -329,7 +383,9 @@ static void mac_test_init_vnode_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_vnode_label\n", + strlen("mac_test_init_vnode_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_VNODE); COUNTER_INC(init_vnode_label); } @@ -338,7 +394,9 @@ static void mac_test_destroy_bpfdesc_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_bpfdesc_label\n", + strlen("mac_test_destroy_bpfdesc_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_BPF); COUNTER_INC(destroy_bpfdesc_label); } @@ -347,7 +405,9 @@ static void mac_test_destroy_cred_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_cred_label\n", + strlen("mac_test_destroy_cred_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_CRED); COUNTER_INC(destroy_cred_label); } @@ -356,7 +416,9 @@ static void mac_test_destroy_devfs_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_devfs_label\n", + strlen("mac_test_destroy_devfs_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_DEVFS); COUNTER_INC(destroy_devfs_label); } @@ -365,7 +427,9 @@ static void mac_test_destroy_ifnet_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_ifnet_label\n", + strlen("mac_test_destroy_ifnet_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_IFNET); COUNTER_INC(destroy_ifnet_label); } @@ -374,7 +438,9 @@ static void mac_test_destroy_inpcb_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_inpcb_label\n", + strlen("mac_test_destroy_inpcb_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_INPCB); COUNTER_INC(destroy_inpcb_label); } @@ -383,7 +449,9 @@ static void mac_test_destroy_sysv_msgmsg_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_msgmsg_label\n", + strlen("mac_test_destroy_sysv_msgmsg__label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_MSG); COUNTER_INC(destroy_sysv_msg_label); } @@ -392,7 +460,9 @@ static void mac_test_destroy_sysv_msgqueue_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_msgqueue_label\n", + strlen("mac_test_destroy_sysv_msgqueue_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_MSQ); COUNTER_INC(destroy_sysv_msq_label); } @@ -401,7 +471,9 @@ static void mac_test_destroy_sysv_sem_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_sem_label\n", + strlen("mac_test_destroy_sysv_sem_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_SEM); COUNTER_INC(destroy_sysv_sem_label); } @@ -410,7 +482,9 @@ static void mac_test_destroy_sysv_shm_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_shm_label\n", + strlen("mac_test_destroy_sysv_shm_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_SHM); COUNTER_INC(destroy_sysv_shm_label); } @@ -419,7 +493,9 @@ static void mac_test_destroy_ipq_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_ipq_label\n", + strlen("mac_test_destroy_ipq_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_IPQ); COUNTER_INC(destroy_ipq_label); } @@ -428,7 +504,9 @@ static void mac_test_destroy_mbuf_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_mbuf_label\n", + strlen("mac_test_destroy_mbuf_label\n")); + MAC_TEST_LOG_DO_SUBMIT; /* * If we're loaded dynamically, there may be mbufs in flight that * didn't have label storage allocated for them. Handle this @@ -445,7 +523,9 @@ static void mac_test_destroy_mount_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_mount_label\n", + strlen("mac_test_destroy_mount_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_MOUNT); COUNTER_INC(destroy_mount_label); } @@ -454,7 +534,9 @@ static void mac_test_destroy_socket_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_socket_label\n", + strlen("mac_test_destroy_socket_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SOCKET); COUNTER_INC(destroy_socket_label); } @@ -463,7 +545,9 @@ static void mac_test_destroy_socket_peer_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_socket_peer_label\n", + strlen("mac_test_destroy_socket_peer_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SOCKET); COUNTER_INC(destroy_socket_peer_label); } @@ -472,7 +556,9 @@ static void mac_test_destroy_pipe_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_pipe_label\n", + strlen("mac_test_destroy_pipe_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_PIPE); COUNTER_INC(destroy_pipe_label); } @@ -481,7 +567,9 @@ static void mac_test_destroy_posix_sem_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_posix_sem_label\n", + strlen("mac_test_destroy_posix_sem_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_POSIX_SEM); COUNTER_INC(destroy_posix_sem_label); } @@ -490,7 +578,9 @@ static void mac_test_destroy_proc_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_proc_label\n", + strlen("mac_test_destroy_proc_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_PROC); COUNTER_INC(destroy_proc_label); } @@ -499,7 +589,9 @@ static void mac_test_destroy_vnode_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_vnode_label\n", + strlen("mac_test_destroy_vnode_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_VNODE); COUNTER_INC(destroy_vnode_label); } @@ -508,7 +600,9 @@ static void mac_test_copy_cred_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_cred_label with src label:", + strlen("mac_test_copy_cred_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(cred,src); LABEL_CHECK(src, MAGIC_CRED); LABEL_CHECK(dest, MAGIC_CRED); COUNTER_INC(copy_cred_label); @@ -518,7 +612,9 @@ static void mac_test_copy_ifnet_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_ifnet_label with src label:", + strlen("mac_test_copy_ifnet_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(ifnet,src); LABEL_CHECK(src, MAGIC_IFNET); LABEL_CHECK(dest, MAGIC_IFNET); COUNTER_INC(copy_ifnet_label); @@ -528,7 +624,9 @@ static void mac_test_copy_mbuf_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_mbuf_label with src label:", + strlen("mac_test_copy_mbuf_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(vnode,src); LABEL_CHECK(src, MAGIC_MBUF); LABEL_CHECK(dest, MAGIC_MBUF); COUNTER_INC(copy_mbuf_label); @@ -538,7 +636,9 @@ static void mac_test_copy_pipe_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_pipe_label with src label:", + strlen("mac_test_copy_pipe_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(pipe,src); LABEL_CHECK(src, MAGIC_PIPE); LABEL_CHECK(dest, MAGIC_PIPE); COUNTER_INC(copy_pipe_label); @@ -548,7 +648,9 @@ static void mac_test_copy_socket_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_socket_label with src label:", + strlen("mac_test_copy_socket_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(socket,src); LABEL_CHECK(src, MAGIC_SOCKET); LABEL_CHECK(dest, MAGIC_SOCKET); COUNTER_INC(copy_socket_label); @@ -558,7 +660,9 @@ static void mac_test_copy_vnode_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_vnode_label with src label:", + strlen("mac_test_copy_vnode_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(vnode,src); LABEL_CHECK(src, MAGIC_VNODE); LABEL_CHECK(dest, MAGIC_VNODE); COUNTER_INC(copy_vnode_label); @@ -598,19 +702,39 @@ struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_devfs " + "with mplabel delabel and vplabel:", + strlen("mac_test_associate_vnode_devfs with mplabel delabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(vnode,mplabel,vnode,delabel,vnode,vplabel); + if (delabel != NULL && SLOT(delabel) == MAGIC_MACTESTLOG) + LABEL_INIT(vplabel, MAGIC_MACTESTLOG); LABEL_CHECK(mplabel, MAGIC_MOUNT); LABEL_CHECK(delabel, MAGIC_DEVFS); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(associate_vnode_devfs); } - +/* + * To avoid recursion on reading /dev/mactest to a tempory file + * we associate the file with "mac_test" mac_test extattr with + * MAGIC_MACTESTLOG label + */ + COUNTER_DECL(associate_vnode_extattr); static int mac_test_associate_vnode_extattr(struct mount *mp, struct label *mplabel, struct vnode *vp, struct label *vplabel) { - + char mac_test[64]; + int error, buflen = 64; + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_extattr with " + "mplabel and vplabel:", + strlen("mac_test_associate_vnode_extattr with mplabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mplabel,vnode,vplabel); + bzero(mac_test,buflen); + error = vn_extattr_get(vp, IO_NODELOCKED, EXTATTR_NAMESPACE_SYSTEM, + "mac_test", &buflen, mac_test, curthread); + if (!error && !strncmp(mac_test,"mac_test", 8)) + LABEL_INIT(vplabel, MAGIC_MACTESTLOG); LABEL_CHECK(mplabel, MAGIC_MOUNT); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(associate_vnode_extattr); @@ -623,7 +747,10 @@ mac_test_associate_vnode_singlelabel(struct mount *mp, struct label *mplabel, struct vnode *vp, struct label *vplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_singlelabel " + "with mplabel and vplabel:", + strlen("mac_test_associate_vnode_singlelabel with mplabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mplabel,vnode,vplabel); LABEL_CHECK(mplabel, MAGIC_MOUNT); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(associate_vnode_singlelabel); @@ -634,9 +761,15 @@ mac_test_create_devfs_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *de, struct label *delabel) { - - if (cred != NULL) + struct label * tmplabel; + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_device with cr_label and delabel:", + strlen("mac_test_create_devfs_device with cr_label and delabel:")); + if (cred != NULL){ LABEL_CHECK(cred->cr_label, MAGIC_CRED); + tmplabel = cred->cr_label; + }else + tmplabel = 0; + MAC_TEST_LOG_SUBMIT_LABEL2(cred, 0, vnode,delabel); LABEL_CHECK(delabel, MAGIC_DEVFS); COUNTER_INC(create_devfs_device); } @@ -646,7 +779,9 @@ mac_test_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de, struct label *delabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_directory with delabel:", + strlen("mac_test_create_devfs_directory with delabel:")); + MAC_TEST_LOG_SUBMIT_LABEL(vnode,delabel); LABEL_CHECK(delabel, MAGIC_DEVFS); COUNTER_INC(create_devfs_directory); } @@ -657,7 +792,10 @@ struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_symlink " + "with cr_label ddlabel and delabel:", + strlen("mac_test_create_devfs_symlink with cr_label ddlabel and delabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred, cred->cr_label, vnode,ddlabel,vnode,delabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(ddlabel, MAGIC_DEVFS); LABEL_CHECK(delabel, MAGIC_DEVFS); @@ -670,7 +808,12 @@ struct label *mplabel, struct vnode *dvp, struct label *dvplabel, struct vnode *vp, struct label *vplabel, struct componentname *cnp) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_vnode_extattr with " + "cr_label mplabel dvplabel and vplabel:", + strlen("mac_test_create_vnode_extattr with cr_label " + "mplabel dvplabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL4(cred,cred->cr_label,vnode,mplabel,vnode, + dvplabel,vnode,vplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(mplabel, MAGIC_MOUNT); LABEL_CHECK(dvplabel, MAGIC_VNODE); @@ -684,7 +827,9 @@ mac_test_create_mount(struct ucred *cred, struct mount *mp, struct label *mplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_mount with cr_label and mplabel:", + strlen("mac_test_create_mount with cr_label and mplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,vnode,mplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(mplabel, MAGIC_MOUNT); COUNTER_INC(create_mount); @@ -695,7 +840,9 @@ mac_test_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *vplabel, struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_vnode with cr_label vplabel and label:", + strlen("mac_test_relabel_vnode with cr_label vplabel and label:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,vnode,vplabel,vnode,label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); LABEL_CHECK(label, MAGIC_VNODE); @@ -707,7 +854,10 @@ mac_test_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *vplabel, struct label *intlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_setlabel_vnode_extattr with " + "cr_label vplabel and intlabel:", + strlen("mac_test_setlabel_vnode_extattr with cr_label vplabel and intlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,vnode,vplabel,vnode,intlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); LABEL_CHECK(intlabel, MAGIC_VNODE); @@ -721,7 +871,9 @@ mac_test_update_devfs(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_update_devfs with direntlabel and vplabel:", + strlen("mac_test_update_devfs with direntlabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,direntlabel,vnode,vplabel); LABEL_CHECK(direntlabel, MAGIC_DEVFS); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(update_devfs); @@ -735,7 +887,10 @@ mac_test_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_mbuf_from_socket" + " with socketlabel and mbuflabel:", + strlen("mac_test_update_devfs with socketlabel and mbuflabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(socket,socketlabel,vnode,mbuflabel); LABEL_CHECK(socketlabel, MAGIC_SOCKET); LABEL_CHECK(mbuflabel, MAGIC_MBUF); COUNTER_INC(create_mbuf_from_socket); @@ -746,7 +901,9 @@ mac_test_create_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_socket with cr_label and socketlabel:", + strlen("mac_test_create_socket with cr_label and socketlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,socket,socketlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(socketlabel, MAGIC_SOCKET); COUNTER_INC(create_socket); @@ -757,7 +914,9 @@ mac_test_create_pipe(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_pipe with cr_label and pipelabel:", + strlen("mac_test_create_socket with cr_label and pipelabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,pipe,pipelabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); COUNTER_INC(create_pipe); @@ -765,12 +924,14 @@ COUNTER_DECL(create_posix_sem); static void -mac_test_create_posix_sem(struct ucred *cred, struct ksem *ks, - struct label *kslabel) +mac_test_create_posix_sem(struct ucred *cred, struct ksem *ksem, + struct label *posixlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_posix_sem with cr_label and posixlabel:", + strlen("mac_test_create_socket with cr_label and posixlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,vnode,posixlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); - LABEL_CHECK(kslabel, MAGIC_POSIX_SEM); + LABEL_CHECK(posixlabel, MAGIC_POSIX_SEM); COUNTER_INC(create_posix_sem); } @@ -780,7 +941,11 @@ struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_socket_from_socket with " + "oldsocketlabel and newsocketlabel:", + strlen("mac_test_create_socket_from_socket with oldsocketlabel " + "and newsocketlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(socket,oldsocketlabel,socket,newsocketlabel); LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET); LABEL_CHECK(newsocketlabel, MAGIC_SOCKET); COUNTER_INC(create_socket_from_socket); @@ -791,7 +956,10 @@ mac_test_relabel_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_socket with cr_label " + "socketlabel and newlabel:", + strlen("mac_test_relabel_socket with cr_label socketlabel and newlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,socket,socketlabel,socket,newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(newlabel, MAGIC_SOCKET); COUNTER_INC(relabel_socket); @@ -802,7 +970,10 @@ mac_test_relabel_pipe(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_pipe with cr_label " + "pipelabel and newlabel:", + strlen("mac_test_relabel_pipe with cr_label pipelabel and newlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,pipe,pipelabel,pipe,newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); LABEL_CHECK(newlabel, MAGIC_PIPE); @@ -814,7 +985,10 @@ mac_test_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_set_socket_peer_from_mbuf with " + "mbuflabel and socketpeerlabel:", + strlen("mac_test_set_socket_peer_from_mbuf with mbuflabel and socketpeerlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mbuflabel,socket,socketpeerlabel); LABEL_CHECK(mbuflabel, MAGIC_MBUF); LABEL_CHECK(socketpeerlabel, MAGIC_SOCKET); COUNTER_INC(set_socket_peer_from_mbuf); @@ -829,7 +1003,11 @@ struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_set_socket_peer_from_socket with" + " oldsocketlabel and newsocketpeerlabel:", + strlen("mac_test_set_socket_peer_from_socket with " + "oldsocketlabel and newsocketpeerlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(socket,oldsocketlabel,socket,newsocketpeerlabel); LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET); LABEL_CHECK(newsocketpeerlabel, MAGIC_SOCKET); COUNTER_INC(set_socket_peer_from_socket); @@ -840,7 +1018,9 @@ mac_test_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d, struct label *bpflabel) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 29 09:16:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C4C616A41A; Mon, 29 Oct 2007 09:15:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5562816A418 for ; Mon, 29 Oct 2007 09:15:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D0A613C481 for ; Mon, 29 Oct 2007 09:15:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T9FmgF036496 for ; Mon, 29 Oct 2007 09:15:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T9FfkV036493 for perforce@freebsd.org; Mon, 29 Oct 2007 09:15:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Oct 2007 09:15:41 GMT Message-Id: <200710290915.l9T9FfkV036493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 09:16:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=128279 Change 128279 by rwatson@rwatson_zoo on 2007/10/29 09:14:56 Integrate TrustedBSD base branch from FreeBSD CVS: - kthread(9) and API renamed to kproc(9) and API; kthreads being reintroduced as true kernel threads vs kernel processes. - Import 23 October 2007 bwk. - bsdtar fixes for very big files in tarballs - tftp fixes for arm - gpt boot support - nvram separate device, but in DEFAULTS - USB serial devices in GENERIC - MAC Framework entry point renaming, cleanup, sorting, and sync to Mac OS X Leopard. - Audit core dump support. - Use process64 tokens always. - Fix audit pipe read statistics. - Geom virstor. - Normal array of driver bug fixes, updates, etc. Affected files ... .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#30 integrate .. //depot/projects/trustedbsd/base/UPDATING#86 integrate .. //depot/projects/trustedbsd/base/bin/ps/extern.h#15 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#24 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#21 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#23 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FIXES#10 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#10 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/lib.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/tran.c#5 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#55 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#49 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/amd#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#15 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfslocking#10 delete .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#64 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes-o.real#11 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/limerick#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#32 integrate .. //depot/projects/trustedbsd/base/include/_ctype.h#3 integrate .. //depot/projects/trustedbsd/base/include/pthread_np.h#8 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#51 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_none.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#27 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldstat.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libelf/elf.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libelf/elf_update.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#34 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#9 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#21 integrate .. //depot/projects/trustedbsd/base/lib/libstand/tftp.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/libthr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/ncurses/ncurses/Makefile#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#24 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/boot.c#1 branch .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.h#10 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/show.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#56 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#52 integrate .. //depot/projects/trustedbsd/base/sbin/kldstat/kldstat.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/route/route.c#16 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread.3#12 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_attr.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_attr_get_np.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_attr_setcreatesuspend_np.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_barrier_destroy.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_barrierattr.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cancel.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cleanup_pop.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cleanup_push.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_broadcast.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_destroy.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_init.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_signal.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_timedwait.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_wait.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_condattr.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_create.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_detach.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_equal.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_exit.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_getconcurrency.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_getspecific.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_join.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_key_create.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_key_delete.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_kill.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_main_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_multi_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_destroy.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_init.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_lock.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_timedlock.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_trylock.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_unlock.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutexattr.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutexattr_getkind_np.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_once.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_resume_all_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_resume_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_destroy.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_init.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_rdlock.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_timedrdlock.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_timedwrlock.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_unlock.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_wrlock.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlockattr_destroy.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlockattr_getpshared.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlockattr_init.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlockattr_setpshared.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_schedparam.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_self.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_set_name_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_setspecific.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_sigmask.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_spin_init.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_spin_lock.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_switch_add_np.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_testcancel.3#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_yield.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#73 integrate .. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#14 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#14 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#59 integrate .. //depot/projects/trustedbsd/base/share/man/man9/kproc.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/kthread.9#7 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-doc.dot#3 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-src.dot#8 integrate .. //depot/projects/trustedbsd/base/share/misc/pci_vendors#24 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.compat.mk#4 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#35 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#24 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#23 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#37 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#38 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/clock.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pc/bios.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#24 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91rm92reg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#17 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/std.at91#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/std.kb920x#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/boot2.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/eeprom.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/lib.h#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/ufsread.c#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/boot2.c#28 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/bioscd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biosdisk.c#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biosmem.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biossmap.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#15 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/boot.c#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/biosdisk.c#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/main.c#10 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#37 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#33 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#21 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#59 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#38 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#123 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#44 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.arm#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#77 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#41 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#64 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#30 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sun4v#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#16 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#23 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ioctl.c#18 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_table.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_examine.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci_link.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_thermal.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic_osm_lib.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic_osm_lib.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath_pci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/msp34xx.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/entry.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_logging.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi_ssif.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#53 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/e1000phy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/e1000phyreg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/miidevs#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephyreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_disk.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#55 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci_user.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/random/harvest.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/random/randomdev_soft.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97_patch.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#70 integrate .. //depot/projects/trustedbsd/base/sys/dev/utopia/utopia.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#53 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/denode.h#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_fat.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#45 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#27 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_work.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#36 integrate .. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part.h#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_init.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_plex.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_volume.c#7 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_vfsops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/apm.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/DEFAULTS#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#70 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/PAE#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/in_cksum.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#74 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/msi.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/bootinfo.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/clock.h#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/in_cksum.h#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pc/bios.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_alq.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#70 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#62 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#69 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_idle.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kthread.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#76 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#64 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf_obj.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_taskqueue.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_socket.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#65 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf2.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_sem.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#70 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#68 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#62 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#71 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#65 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#93 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#83 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#67 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#94 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/modules/nvram/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/bpf.c#52 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.h#21 integrate .. //depot/projects/trustedbsd/base/sys/net/bsd_comp.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#57 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#25 integrate .. //depot/projects/trustedbsd/base/sys/net/if_disc.c#22 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#60 integrate .. //depot/projects/trustedbsd/base/sys/net/if_fddisubr.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net/if_fwsubr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#36 integrate .. //depot/projects/trustedbsd/base/sys/net/if_iso88025subr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/net/if_lagg.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_loop.c#35 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#38 integrate .. //depot/projects/trustedbsd/base/sys/net/if_stf.c#33 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#38 integrate .. //depot/projects/trustedbsd/base/sys/net/route.c#28 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_scan.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/aarp.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_input.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_output.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netgraph.h#21 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#32 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet/igmp.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#52 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#39 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#65 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#38 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#58 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_options.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#58 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#49 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#81 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#44 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#64 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#56 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#51 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_iod.c#15 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vfsops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_nfsiod.c#16 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#55 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#26 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#19 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#57 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#41 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/genassym.c#20 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/swtch.S#6 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/vm_machdep.c#37 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#22 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#11 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#15 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#17 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac/mac_audit.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_inet.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac/mac_internal.h#12 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_net.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_pipe.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_posix_sem.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_process.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_socket.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_system.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_msg.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_sem.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_vfs.c#18 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#58 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#30 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_ifoff/mac_ifoff.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#35 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#51 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#26 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_partition/mac_partition.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_portacl/mac_portacl.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_seeotheruids/mac_seeotheruids.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_stub/mac_stub.c#22 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#46 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/isa/isa.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/simdisk.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/apm.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/gpt.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/kthread.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/linker.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#71 integrate .. //depot/projects/trustedbsd/base/sys/sys/pciio.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/priv.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#90 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#70 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#49 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#60 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#56 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#58 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#57 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#42 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#80 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#27 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#53 integrate .. //depot/projects/trustedbsd/base/tools/build/options/WITHOUT_NS_CACHING#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init-a.t#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init.t#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-copy.t#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-data.t#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-hmac.t#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/onetime-a.t#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/onetime.t#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/awk/Makefile#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/awk/lib.c.diff#3 delete .. //depot/projects/trustedbsd/base/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#60 integrate .. //depot/projects/trustedbsd/base/usr.bin/lex/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/top/machine.c#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.8#22 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.sh#15 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchgen/crunched_main.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/devinfo/devinfo.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.8#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#22 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/perform.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpcbind/rpcbind.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/traceroute6/traceroute6.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/hostapd/hostapd.8#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#30 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd +OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached @@ -579,11 +581,17 @@ # 20070201: remove libmytinfo link OLD_FILES+=usr/lib/libmytinfo.a OLD_FILES+=usr/lib/libmytinfo.so -OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfow.a +OLD_FILES+=usr/lib/libmytinfow.so +OLD_FILES+=usr/lib/libmytinfow_p.a .if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libmytinfo.a OLD_FILES+=usr/lib32/libmytinfo.so OLD_FILES+=usr/lib32/libmytinfo_p.a +OLD_FILES+=usr/lib32/libmytinfow.a +OLD_FILES+=usr/lib32/libmytinfow.so +OLD_FILES+=usr/lib32/libmytinfow_p.a .endif # 20070128: remove vnconfig OLD_FILES+=usr/sbin/vnconfig ==== //depot/projects/trustedbsd/base/UPDATING#86 (text+ko) ==== @@ -21,6 +21,27 @@ developers choose to disable these features on build machines to maximize performance. +20071024: + It has been decided that it is desirable to provide ABI + backwards compatibility to the FreeBSD 4/5/6 versions of the + PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was + broken with the introduction of PCI domain support (see the + 20070930 entry). Unfortunately, this required the ABI of + PCIOCGETCONF to be broken again in order to be able to + provide backwards compatibility to the old version of that + IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled + again. As for prominent ports this affects neither pciutils + nor xorg-server this time, the hal port needs to be rebuilt + however. + +20071020: + The misnamed kthread_create() and friends have been renamed + to kproc_create() etc. Many of the callers already + used kproc_start().. + I will return kthread_create() and friends in a while + with implementations that actually create threads, not procs. + Renaming corresponds with version 800002. + 20071010: RELENG_7 branched. @@ -913,4 +934,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $ +$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $ ==== //depot/projects/trustedbsd/base/bin/ps/extern.h#15 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $ */ struct kinfo; @@ -39,7 +39,7 @@ extern int cflag, eval, fscale, nlistread, rawcpu; extern unsigned long mempages; extern time_t now; -extern int sumrusage, termwidth, totwidth; +extern int showthreads, sumrusage, termwidth, totwidth; extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS @@ -78,6 +78,7 @@ void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); ==== //depot/projects/trustedbsd/base/bin/ps/keyword.c#24 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $"); #include #include @@ -186,6 +186,7 @@ {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, + {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, ==== //depot/projects/trustedbsd/base/bin/ps/print.c#21 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -129,9 +129,11 @@ v = ve->var; if (cflag) { /* If it is the last field, then don't pad */ - if (STAILQ_NEXT(ve, next_ve) == NULL) + if (STAILQ_NEXT(ve, next_ve) == NULL) { (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); return; } @@ -178,13 +180,28 @@ VAR *v; v = ve->var; - if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); } void +tdnam(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + if (showthreads && k->ki_p->ki_numthreads > 1) + (void)printf("%-*s", v->width, k->ki_p->ki_ocomm); + else + (void)printf("%-*s", v->width, " " ); + +} + +void logname(KINFO *k, VARENT *ve) { VAR *v; ==== //depot/projects/trustedbsd/base/bin/ps/ps.c#23 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -98,6 +98,7 @@ int sumrusage; /* -S */ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ +int showthreads; /* will threads be shown? */ struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); @@ -175,7 +176,7 @@ char *cols; int all, ch, elem, flag, _fmt, i, lineno; int nentries, nkept, nselectors; - int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; + int prtheader, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; (void) setlocale(LC_ALL, ""); ==== //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.13 2007/10/16 02:07:55 mlaier Exp $ + * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.14 2007/10/20 20:23:39 mlaier Exp $ * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52.2.7 2007/06/11 09:52:05 guy Exp $ (LBL) */ @@ -41,9 +41,7 @@ #include #include -#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H -#include -#endif +#include #include ==== //depot/projects/trustedbsd/base/contrib/one-true-awk/FIXES#10 (text+ko) ==== @@ -25,6 +25,14 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Oct 23, 2007: + minor fix in lib.c: increase inputFS to 100, change malloc + for fields to n+1. + + fixed memory fault caused by out of order test in setsval. + + thanks to david o'brien, freebsd, for both fixes. + May 1, 2007: fiddle in makefile to fix for BSD make; thanks to igor sobrado. ==== //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#10 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $ Import of the 2005/04/24 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). -Original sources were taken from the Brian Kernighan's home page -(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -May 01, 2007. +Original sources were taken from the Brian Kernighan's AWK page +http://www.cs.princeton.edu/~bwk/btl.mirror +and include bug fixes up thru Oct 23, 2007. The following files were removed for this import: @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023 ==== //depot/projects/trustedbsd/base/contrib/one-true-awk/lib.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ int fieldssize = RECSIZE; Cell **fldtab; /* pointers to Cells */ -char inputFS[10] = " "; +char inputFS[100] = " "; #define MAXFLD 2 int nfields = MAXFLD; /* last allocated slot for $i */ @@ -58,7 +58,7 @@ void recinit(unsigned int n) { if ( (record = (char *) malloc(n)) == NULL - || (fields = (char *) malloc(n)) == NULL + || (fields = (char *) malloc(n+1)) == NULL || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL ) FATAL("out of space for $0 and fields"); ==== //depot/projects/trustedbsd/base/contrib/one-true-awk/tran.c#5 (text+ko) ==== @@ -332,10 +332,10 @@ donerec = 1; } t = tostring(s); /* in case it's self-assign */ + if (freeable(vp)) + xfree(vp->sval); vp->tval &= ~NUM; vp->tval |= STR; - if (freeable(vp)) - xfree(vp->sval); vp->tval &= ~DONTFREE; dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); ==== //depot/projects/trustedbsd/base/etc/Makefile#55 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.363 2007/10/18 08:26:20 bushman Exp $ +# $FreeBSD: src/etc/Makefile,v 1.364 2007/10/29 07:37:08 yar Exp $ .include @@ -78,12 +78,12 @@ afterinstall: .if ${MK_MAN} != "no" - cd ${.CURDIR}/../share/man; ${MAKE} makedb + ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb .endif distribute: - cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} - cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include .if ${TARGET_ENDIANNESS} == "1234" @@ -112,15 +112,15 @@ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd - cd ${.CURDIR}/bluetooth; ${MAKE} install - cd ${.CURDIR}/defaults; ${MAKE} install - cd ${.CURDIR}/gss; ${MAKE} install - cd ${.CURDIR}/periodic; ${MAKE} install - cd ${.CURDIR}/rc.d; ${MAKE} install - cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall - cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap - cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt - cd ${.CURDIR}/pam.d; ${MAKE} install + ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install + ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install + ${_+_}cd ${.CURDIR}/gss; ${MAKE} install + ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install + ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install + ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall + ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap + ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt + ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \ @@ -128,7 +128,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} .if ${MK_I4B} != "no" - cd ${.CURDIR}/isdn; ${MAKE} install + ${_+_}cd ${.CURDIR}/isdn; ${MAKE} install .endif .if ${MK_BIND_MTREE} != "no" @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ @@ -137,10 +137,10 @@ fi .endif .if ${MK_BIND_ETC} != "no" - cd ${.CURDIR}/namedb; ${MAKE} install + ${_+_}cd ${.CURDIR}/namedb; ${MAKE} install .endif .if ${MK_SENDMAIL} != "no" - cd ${.CURDIR}/sendmail; ${MAKE} distribution + ${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif .if ${MK_OPENSSH} != "no" cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ @@ -239,7 +239,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}/usr/share/examples/etc - cd ${.CURDIR}/defaults; ${MAKE} install \ + ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \ DESTDIR=${DESTDIR}/usr/share/examples .include ==== //depot/projects/trustedbsd/base/etc/rc.d/Makefile#49 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ .include @@ -25,7 +25,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/trustedbsd/base/etc/rc.d/amd#14 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.18 2006/10/18 15:56:11 flz Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ # # PROVIDE: amd @@ -34,7 +34,7 @@ [Nn][Oo] | '') ;; *) - rc_flags="${rc_flags} `eval ${amd_map_program}`" + rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`" ;; esac @@ -46,7 +46,8 @@ fi ;; *) - rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null" + rc_flags="-p ${rc_flags}" + command_args="> /var/run/amd.pid 2> /dev/null" ;; esac return 0 ==== //depot/projects/trustedbsd/base/etc/rc.d/named#15 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $ # # PROVIDE: named @@ -82,20 +82,28 @@ named_reload() { - rndc reload + ${command%/named}/rndc reload } named_stop() { - echo -n "Stopping named" - if rndc stop 2>/dev/null; then - echo . + # This duplicates an undesirably large amount of code from the stop + # routine in rc.subr in order to use rndc to shut down the process, + # and to give it a second chance in case rndc fails. + rc_pid=$(check_pidfile $pidfile $command) + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping named.' + if ${command%/named}/rndc stop 2>/dev/null; then + wait_for_pids $rc_pid else - echo -n ": rndc failed, trying killall: " - if killall named; then - echo . - fi - fi + echo -n 'rndc failed, trying kill: ' + kill -TERM $rc_pid + wait_for_pids $rc_pid + fi } named_poststop() @@ -121,13 +129,13 @@ if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then return 0 fi - confgen_command="rndc-confgen -a -b256 -u $named_uid \ + confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \ -c ${named_chrootdir}/etc/namedb/rndc.key" if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then - if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \ - "$named_uid" ]; then - $confgen_command - fi + case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in + root|$named_uid) ;; + *) $confgen_command ;; + esac else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 29 09:27:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4E5316A41A; Mon, 29 Oct 2007 09:27:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4968916A417 for ; Mon, 29 Oct 2007 09:27:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2BA9913C465 for ; Mon, 29 Oct 2007 09:27:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T9R8Cw037050 for ; Mon, 29 Oct 2007 09:27:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T9R1Pk037042 for perforce@freebsd.org; Mon, 29 Oct 2007 09:27:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Oct 2007 09:27:01 GMT Message-Id: <200710290927.l9T9R1Pk037042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 09:27:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=128280 Change 128280 by rwatson@rwatson_zoo on 2007/10/29 09:26:00 Integrate TrustedBSD audit3 branch from TrustedBSD base branch through @128279. Affected files ... .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#21 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#26 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/extern.h#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/keyword.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/print.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/ps.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/one-true-awk/FIXES#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/one-true-awk/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/one-true-awk/lib.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/one-true-awk/tran.c#3 integrate .. //depot/projects/trustedbsd/audit3/etc/Makefile#17 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#20 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/amd#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/named#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/nfslocking#6 delete .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#22 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/limerick#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/trustedbsd/audit3/include/_ctype.h#3 integrate .. //depot/projects/trustedbsd/audit3/include/pthread_np.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/Makefile#20 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_none.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#19 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/locale/iswctype.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/kldstat.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libelf/elf.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_update.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_proc.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_unix/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libstand/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libstand/tftp.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/libthr.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/ncurses/ncurses/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/trustedbsd/audit3/rescue/rescue/Makefile#13 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/add.c#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/boot.c#1 branch .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.8#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.c#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.h#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/show.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#19 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#20 integrate .. //depot/projects/trustedbsd/audit3/sbin/kldstat/kldstat.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/route/route.c#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_attr.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_attr_get_np.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_attr_setcreatesuspend_np.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_barrier_destroy.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_barrierattr.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cancel.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cleanup_pop.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cleanup_push.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_broadcast.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_destroy.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_init.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_signal.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_timedwait.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_wait.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_condattr.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_create.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_detach.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_equal.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_exit.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_getconcurrency.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_getspecific.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_join.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_key_create.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_key_delete.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_kill.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_main_np.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_multi_np.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_destroy.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_init.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_lock.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_trylock.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_unlock.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutexattr.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutexattr_getkind_np.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_once.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_resume_all_np.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_resume_np.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_destroy.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_init.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_rdlock.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_timedrdlock.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_timedwrlock.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_unlock.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_wrlock.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlockattr_destroy.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlockattr_getpshared.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlockattr_init.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlockattr_setpshared.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_schedparam.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_self.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_set_name_np.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_setspecific.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_sigmask.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_spin_init.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_spin_lock.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_switch_add_np.3#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_testcancel.3#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_yield.3#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#21 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/src.conf.5#11 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/rc.subr.8#11 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/kproc.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/kthread.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-doc.dot#3 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-src.dot#8 integrate .. //depot/projects/trustedbsd/audit3/share/misc/pci_vendors#6 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.compat.mk#4 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.lib.mk#13 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.own.mk#11 integrate .. //depot/projects/trustedbsd/audit3/share/mk/sys.mk#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/local_apic.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/nexus.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/clock.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/pc/bios.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/clock.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91rm92reg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.at91#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.kb920x#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot2/boot2.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/eeprom.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/lib.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/boot2/boot2.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/bioscd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biosmem.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biossmap.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/main.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/libpc98/biosdisk.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/loader/main.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_file.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_getcwd.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_fcntl.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#37 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#18 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.arm#9 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#19 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.ia64#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.pc98#16 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.powerpc#14 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.sun4v#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#13 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_table.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_examine.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_ibm.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_ec.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci_link.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_thermal.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic_osm_lib.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cd.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath_pci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/msp34xx.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/entry.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_ssif.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwi.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/md/md.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/miidevs#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephyreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_raid.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/ofw_disk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_pci.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pci_user.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/harvest.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/randomdev_soft.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/midi/sequencer.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97_patch.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_port.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#24 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/utopia/utopia.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/denode.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_fat.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/bde/g_bde.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_io.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/part/g_part.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/part/g_part.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_init.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_plex.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_volume.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/bios/apm.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/PAE#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#22 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/msi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_misc.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/clock.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/in_cksum.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/pc/bios.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/isa/clock.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_alq.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_environment.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#26 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#28 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_idle.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_intr.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_jail.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kthread.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktrace.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_linker.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_prot.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_shutdown.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sysctl.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/link_elf.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/link_elf_obj.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_4bsd.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_ule.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_socket.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#45 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_msg.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_sem.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_shm.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mbuf2.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_sem.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_bio.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#29 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#43 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#24 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/geom/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/nvram/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bsd_comp.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_atmsubr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_disc.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_fwsubr.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_gif.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_iso88025subr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_lagg.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_loop.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ppp.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_stf.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_tun.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/net/route.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netatalk/aarp.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netatalk/ddp_input.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netatalk/ddp_output.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_socket.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/if_ether.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/igmp.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_divert.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_input.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_options.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_output.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/nd6.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netsmb/smb_iod.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/nfs4client/nfs4_vfsops.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_nfsiod.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsock.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/genassym.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/swtch.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/vm_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#51 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#30 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#33 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#35 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#47 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_inet.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_internal.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_net.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_pipe.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_posix_sem.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_process.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_socket.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_system.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_msg.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_sem.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_vfs.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_ifoff/mac_ifoff.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_none/mac_none.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_partition/mac_partition.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_portacl/mac_portacl.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_seeotheruids/mac_seeotheruids.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_stub/mac_stub.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/isa/isa.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/simdisk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/apm.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/gpt.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/kthread.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/linker.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#20 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/pciio.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/priv.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#28 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/vnode.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_vnops.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_zeroidle.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#14 integrate .. //depot/projects/trustedbsd/audit3/tools/build/options/WITHOUT_NS_CACHING#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init-a.t#3 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init.t#4 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-copy.t#3 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-data.t#3 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-hmac.t#3 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/onetime-a.t#3 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/onetime.t#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/awk/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/awk/lib.c.diff#3 delete .. //depot/projects/trustedbsd/audit3/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#21 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/lex/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/top/machine.c#10 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.8#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.sh#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/devinfo/devinfo.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/mountd.8#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/mountd.c#13 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/perform.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/rpcbind.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/traceroute6/traceroute6.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/hostapd/hostapd.8#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd +OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached @@ -579,11 +581,17 @@ # 20070201: remove libmytinfo link OLD_FILES+=usr/lib/libmytinfo.a OLD_FILES+=usr/lib/libmytinfo.so -OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfow.a +OLD_FILES+=usr/lib/libmytinfow.so +OLD_FILES+=usr/lib/libmytinfow_p.a .if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libmytinfo.a OLD_FILES+=usr/lib32/libmytinfo.so OLD_FILES+=usr/lib32/libmytinfo_p.a +OLD_FILES+=usr/lib32/libmytinfow.a +OLD_FILES+=usr/lib32/libmytinfow.so +OLD_FILES+=usr/lib32/libmytinfow_p.a .endif # 20070128: remove vnconfig OLD_FILES+=usr/sbin/vnconfig ==== //depot/projects/trustedbsd/audit3/UPDATING#26 (text+ko) ==== @@ -21,6 +21,27 @@ developers choose to disable these features on build machines to maximize performance. +20071024: + It has been decided that it is desirable to provide ABI + backwards compatibility to the FreeBSD 4/5/6 versions of the + PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was + broken with the introduction of PCI domain support (see the + 20070930 entry). Unfortunately, this required the ABI of + PCIOCGETCONF to be broken again in order to be able to + provide backwards compatibility to the old version of that + IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled + again. As for prominent ports this affects neither pciutils + nor xorg-server this time, the hal port needs to be rebuilt + however. + +20071020: + The misnamed kthread_create() and friends have been renamed + to kproc_create() etc. Many of the callers already + used kproc_start().. + I will return kthread_create() and friends in a while + with implementations that actually create threads, not procs. + Renaming corresponds with version 800002. + 20071010: RELENG_7 branched. @@ -913,4 +934,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $ +$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $ ==== //depot/projects/trustedbsd/audit3/bin/ps/extern.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $ */ struct kinfo; @@ -39,7 +39,7 @@ extern int cflag, eval, fscale, nlistread, rawcpu; extern unsigned long mempages; extern time_t now; -extern int sumrusage, termwidth, totwidth; +extern int showthreads, sumrusage, termwidth, totwidth; extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS @@ -78,6 +78,7 @@ void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); ==== //depot/projects/trustedbsd/audit3/bin/ps/keyword.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $"); #include #include @@ -186,6 +186,7 @@ {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, + {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, ==== //depot/projects/trustedbsd/audit3/bin/ps/print.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -129,9 +129,11 @@ v = ve->var; if (cflag) { /* If it is the last field, then don't pad */ - if (STAILQ_NEXT(ve, next_ve) == NULL) + if (STAILQ_NEXT(ve, next_ve) == NULL) { (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); return; } @@ -178,13 +180,28 @@ VAR *v; v = ve->var; - if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); } void +tdnam(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + if (showthreads && k->ki_p->ki_numthreads > 1) + (void)printf("%-*s", v->width, k->ki_p->ki_ocomm); + else + (void)printf("%-*s", v->width, " " ); + +} + +void logname(KINFO *k, VARENT *ve) { VAR *v; ==== //depot/projects/trustedbsd/audit3/bin/ps/ps.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -98,6 +98,7 @@ int sumrusage; /* -S */ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ +int showthreads; /* will threads be shown? */ struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); @@ -175,7 +176,7 @@ char *cols; int all, ch, elem, flag, _fmt, i, lineno; int nentries, nkept, nselectors; - int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; + int prtheader, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; (void) setlocale(LC_ALL, ""); ==== //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.13 2007/10/16 02:07:55 mlaier Exp $ + * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.14 2007/10/20 20:23:39 mlaier Exp $ * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52.2.7 2007/06/11 09:52:05 guy Exp $ (LBL) */ @@ -41,9 +41,7 @@ #include #include -#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H -#include -#endif +#include #include ==== //depot/projects/trustedbsd/audit3/contrib/one-true-awk/FIXES#4 (text+ko) ==== @@ -25,6 +25,14 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Oct 23, 2007: + minor fix in lib.c: increase inputFS to 100, change malloc + for fields to n+1. + + fixed memory fault caused by out of order test in setsval. + + thanks to david o'brien, freebsd, for both fixes. + May 1, 2007: fiddle in makefile to fix for BSD make; thanks to igor sobrado. ==== //depot/projects/trustedbsd/audit3/contrib/one-true-awk/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $ Import of the 2005/04/24 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). -Original sources were taken from the Brian Kernighan's home page -(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -May 01, 2007. +Original sources were taken from the Brian Kernighan's AWK page +http://www.cs.princeton.edu/~bwk/btl.mirror +and include bug fixes up thru Oct 23, 2007. The following files were removed for this import: @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023 ==== //depot/projects/trustedbsd/audit3/contrib/one-true-awk/lib.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ int fieldssize = RECSIZE; Cell **fldtab; /* pointers to Cells */ -char inputFS[10] = " "; +char inputFS[100] = " "; #define MAXFLD 2 int nfields = MAXFLD; /* last allocated slot for $i */ @@ -58,7 +58,7 @@ void recinit(unsigned int n) { if ( (record = (char *) malloc(n)) == NULL - || (fields = (char *) malloc(n)) == NULL + || (fields = (char *) malloc(n+1)) == NULL || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL ) FATAL("out of space for $0 and fields"); ==== //depot/projects/trustedbsd/audit3/contrib/one-true-awk/tran.c#3 (text+ko) ==== @@ -332,10 +332,10 @@ donerec = 1; } t = tostring(s); /* in case it's self-assign */ + if (freeable(vp)) + xfree(vp->sval); vp->tval &= ~NUM; vp->tval |= STR; - if (freeable(vp)) - xfree(vp->sval); vp->tval &= ~DONTFREE; dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); ==== //depot/projects/trustedbsd/audit3/etc/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.363 2007/10/18 08:26:20 bushman Exp $ +# $FreeBSD: src/etc/Makefile,v 1.364 2007/10/29 07:37:08 yar Exp $ .include @@ -78,12 +78,12 @@ afterinstall: .if ${MK_MAN} != "no" - cd ${.CURDIR}/../share/man; ${MAKE} makedb + ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb .endif distribute: - cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} - cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include .if ${TARGET_ENDIANNESS} == "1234" @@ -112,15 +112,15 @@ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd - cd ${.CURDIR}/bluetooth; ${MAKE} install - cd ${.CURDIR}/defaults; ${MAKE} install - cd ${.CURDIR}/gss; ${MAKE} install - cd ${.CURDIR}/periodic; ${MAKE} install - cd ${.CURDIR}/rc.d; ${MAKE} install - cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall - cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap - cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt - cd ${.CURDIR}/pam.d; ${MAKE} install + ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install + ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install + ${_+_}cd ${.CURDIR}/gss; ${MAKE} install + ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install + ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install + ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall + ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap + ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt + ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \ @@ -128,7 +128,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} .if ${MK_I4B} != "no" - cd ${.CURDIR}/isdn; ${MAKE} install + ${_+_}cd ${.CURDIR}/isdn; ${MAKE} install .endif .if ${MK_BIND_MTREE} != "no" @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ @@ -137,10 +137,10 @@ fi .endif .if ${MK_BIND_ETC} != "no" - cd ${.CURDIR}/namedb; ${MAKE} install + ${_+_}cd ${.CURDIR}/namedb; ${MAKE} install .endif .if ${MK_SENDMAIL} != "no" - cd ${.CURDIR}/sendmail; ${MAKE} distribution + ${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif .if ${MK_OPENSSH} != "no" cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ @@ -239,7 +239,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}/usr/share/examples/etc - cd ${.CURDIR}/defaults; ${MAKE} install \ + ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \ DESTDIR=${DESTDIR}/usr/share/examples .include ==== //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ .include @@ -25,7 +25,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/trustedbsd/audit3/etc/rc.d/amd#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.18 2006/10/18 15:56:11 flz Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ # # PROVIDE: amd @@ -34,7 +34,7 @@ [Nn][Oo] | '') ;; *) - rc_flags="${rc_flags} `eval ${amd_map_program}`" + rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`" ;; esac @@ -46,7 +46,8 @@ fi ;; *) - rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null" + rc_flags="-p ${rc_flags}" + command_args="> /var/run/amd.pid 2> /dev/null" ;; esac return 0 ==== //depot/projects/trustedbsd/audit3/etc/rc.d/named#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $ # # PROVIDE: named @@ -82,20 +82,28 @@ named_reload() { - rndc reload + ${command%/named}/rndc reload } named_stop() { - echo -n "Stopping named" - if rndc stop 2>/dev/null; then - echo . + # This duplicates an undesirably large amount of code from the stop + # routine in rc.subr in order to use rndc to shut down the process, + # and to give it a second chance in case rndc fails. + rc_pid=$(check_pidfile $pidfile $command) + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping named.' + if ${command%/named}/rndc stop 2>/dev/null; then + wait_for_pids $rc_pid else - echo -n ": rndc failed, trying killall: " - if killall named; then - echo . - fi - fi + echo -n 'rndc failed, trying kill: ' + kill -TERM $rc_pid + wait_for_pids $rc_pid + fi } named_poststop() @@ -121,13 +129,13 @@ if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then return 0 fi - confgen_command="rndc-confgen -a -b256 -u $named_uid \ + confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \ -c ${named_chrootdir}/etc/namedb/rndc.key" if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then - if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \ - "$named_uid" ]; then - $confgen_command - fi + case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in + root|$named_uid) ;; + *) $confgen_command ;; + esac else $confgen_command fi ==== //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#22 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.241 2007/06/12 09:20:31 philip Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.244 2007/10/28 07:02:10 dougb Exp $ % ======================================================================= @@ -16494,10 +16494,10 @@ you through times of no dope. -- Gilbert Shelton >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 29 09:34:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B65C816A41A; Mon, 29 Oct 2007 09:34:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5561D16A417 for ; Mon, 29 Oct 2007 09:34:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3EBE213C465 for ; Mon, 29 Oct 2007 09:34:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T9YJcr037443 for ; Mon, 29 Oct 2007 09:34:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T9YIvd037440 for perforce@freebsd.org; Mon, 29 Oct 2007 09:34:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Oct 2007 09:34:18 GMT Message-Id: <200710290934.l9T9YIvd037440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 09:34:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=128281 Change 128281 by rwatson@rwatson_zoo on 2007/10/29 09:34:07 Integrate remainder of OpenBSM 1.0 from OpenBSM branch to TrustedBSD audit3 branch: primarily the autoconf/automake update. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#20 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#20 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#21 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#5 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#5 (text+ko) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,17 +15,13 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#4 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#5 $ # -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -39,18 +35,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \ $(top_srcdir)/configure TODO config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/ltmain.sh config/missing -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config/config.h CONFIG_CLEAN_FILES = @@ -58,10 +54,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -77,8 +76,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -105,8 +102,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ -HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ +GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -118,9 +115,8 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -130,20 +126,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -155,28 +149,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = \ bsm \ libbsm \ @@ -231,7 +236,7 @@ config/config.h: config/stamp-h1 @if test ! -f $@; then \ rm -f config/stamp-h1; \ - $(MAKE) config/stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \ else :; fi config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status @@ -253,7 +258,6 @@ distclean-libtool: -rm -f libtool -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -286,8 +290,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -389,24 +392,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/config - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -420,7 +421,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -428,6 +429,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -435,7 +438,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -510,7 +513,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -580,12 +583,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -606,24 +617,26 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#20 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_15 +OPENBSM_1_0 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,9 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 AC_PROG_LIBTOOL +# serial 51 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -163,6 +168,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -175,17 +181,17 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" @@ -233,6 +239,9 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER @@ -259,9 +268,10 @@ # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -272,9 +282,10 @@ # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_LINKER_BOILERPLATE @@ -289,12 +300,20 @@ # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -525,13 +544,17 @@ rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -548,6 +571,9 @@ ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -580,6 +606,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -603,7 +645,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -622,9 +664,9 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -644,19 +686,20 @@ # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi @@ -731,6 +774,12 @@ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -744,25 +793,39 @@ esac fi ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -775,7 +838,7 @@ # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -783,7 +846,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ +# --------------------------------------------------------------------- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -849,6 +912,8 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); }] @@ -859,7 +924,7 @@ case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; + x$lt_dlunknown|x*) $3 ;; esac else : # compilation failed @@ -871,7 +936,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ------------------- +# ---------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -942,7 +1007,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -955,7 +1020,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -987,7 +1052,8 @@ # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -995,7 +1061,7 @@ mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -1015,9 +1081,9 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi @@ -1135,6 +1201,7 @@ darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -1152,7 +1219,8 @@ # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= @@ -1166,20 +1234,58 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" +m4_if($1,[],[ if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi +fi]) need_lib_prefix=unknown hardcode_into_libs=no @@ -1336,12 +1442,8 @@ shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1358,18 +1460,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -1402,10 +1492,15 @@ shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -1465,6 +1560,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix[[3-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1508,7 +1615,7 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -1524,7 +1631,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -1537,18 +1644,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -1586,6 +1681,7 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in @@ -1629,11 +1725,8 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH +rdos*) + dynamic_linker=no ;; solaris*) @@ -1661,7 +1754,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -1694,6 +1787,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 29 15:54:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF3E616A4A5; Mon, 29 Oct 2007 15:54:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F196416A481 for ; Mon, 29 Oct 2007 15:54:29 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE8D913C448 for ; Mon, 29 Oct 2007 15:54:29 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TFsTbY001313 for ; Mon, 29 Oct 2007 15:54:29 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TFsTE4001310 for perforce@freebsd.org; Mon, 29 Oct 2007 15:54:29 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 29 Oct 2007 15:54:29 GMT Message-Id: <200710291554.l9TFsTE4001310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 128288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 15:54:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=128288 Change 128288 by zec@zec_tpx32 on 2007/10/29 15:54:27 Set / reset vnet context when entering networking code from cdevsw-hooked open/close etc. handles in tun(4). Reported by: Nikos Vassiliadis Affected files ... .. //depot/projects/vimage/src/sys/net/if_tun.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_tun.c#3 (text+ko) ==== @@ -21,6 +21,7 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include @@ -43,6 +44,7 @@ #include #include #include +#include #include #include @@ -224,6 +226,7 @@ else append_unit = 0; + CURVNET_SET(TD_TO_VNET(curthread)); /* find any existing device, or allocate new unit number */ i = clone_create(&tunclones, &tun_cdevsw, &u, dev, 0); if (i) { @@ -242,6 +245,7 @@ } if_clone_create(name, namelen, NULL); + CURVNET_RESTORE(); } static void @@ -253,6 +257,7 @@ KASSERT((tp->tun_flags & TUN_OPEN) == 0, ("tununits is out of sync - unit %d", TUN2IFP(tp)->if_dunit)); + CURVNET_SET(TUN2IFP(tp)->if_vnet); dev = tp->tun_dev; bpfdetach(TUN2IFP(tp)); if_detach(TUN2IFP(tp)); @@ -261,6 +266,7 @@ knlist_destroy(&tp->tun_rsel.si_note); mtx_destroy(&tp->tun_mtx); free(tp, M_TUN); + CURVNET_RESTORE(); } static void @@ -447,6 +453,7 @@ /* * junk all pending output */ + CURVNET_SET(ifp->if_vnet); s = splimp(); IFQ_PURGE(&ifp->if_snd); splx(s); @@ -476,6 +483,7 @@ ifp->if_drv_flags &= ~IFF_DRV_RUNNING; splx(s); } + CURVNET_RESTORE(); funsetown(&tp->tun_sigio); selwakeuppri(&tp->tun_rsel, PZERO + 1); @@ -924,7 +932,9 @@ random_harvest(m, 16, 3, 0, RANDOM_NET); ifp->if_ibytes += m->m_pkthdr.len; ifp->if_ipackets++; + CURVNET_SET(ifp->if_vnet); netisr_dispatch(isr, m); + CURVNET_RESTORE(); return (0); } From owner-p4-projects@FreeBSD.ORG Mon Oct 29 16:17:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 208A116A41B; Mon, 29 Oct 2007 16:17:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C477816A47C for ; Mon, 29 Oct 2007 16:17:56 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB6C313C46E for ; Mon, 29 Oct 2007 16:17:56 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TGHupu004077 for ; Mon, 29 Oct 2007 16:17:56 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TGHuTM004074 for perforce@freebsd.org; Mon, 29 Oct 2007 16:17:56 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 29 Oct 2007 16:17:56 GMT Message-Id: <200710291617.l9TGHuTM004074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 128289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 16:17:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=128289 Change 128289 by zec@zec_tca51 on 2007/10/29 16:17:16 When reassigning ifnets from one vnet to another, use the new vimage_by_name() function to search for the target vimage / vnet. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#54 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#54 (text+ko) ==== @@ -302,18 +302,12 @@ if (IS_DEFAULT_VIMAGE(vip)) return (ENXIO); new_vnet = vip->vi_parent->v_net; - } else - LIST_FOREACH(new_vip, &vimage_head, vi_le) { - if (!vi_child_of(vip, new_vip)) - continue; - if (strcmp(vi_req->vi_name, new_vip->vi_name) == 0) { - new_vnet = new_vip->v_net; - break; - } - } - - if (new_vnet == NULL) - return (ENXIO); + } else { + new_vip = vimage_by_name(vip, vi_req->vi_name); + if (new_vip == NULL) + return (ENXIO); + new_vnet = new_vip->v_net; + } if (ifp == NULL) ifp = ifunit(vi_req->vi_chroot); From owner-p4-projects@FreeBSD.ORG Mon Oct 29 16:56:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 832B116A475; Mon, 29 Oct 2007 16:56:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 196FF16A419 for ; Mon, 29 Oct 2007 16:56:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05BF013C4C5 for ; Mon, 29 Oct 2007 16:56:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TGubXd015112 for ; Mon, 29 Oct 2007 16:56:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TGubkA015109 for perforce@freebsd.org; Mon, 29 Oct 2007 16:56:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Oct 2007 16:56:37 GMT Message-Id: <200710291656.l9TGubkA015109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 16:56:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=128290 Change 128290 by rwatson@rwatson_fledge on 2007/10/29 16:55:54 Update TrustedBSD web site for OpenBSM 1.0 release, and add binary to downloads section. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0.tgz#1 add .. //depot/projects/trustedbsd/www/news.page#11 edit .. //depot/projects/trustedbsd/www/openbsm.page#21 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#11 (text+ko) ==== @@ -36,7 +36,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#10 $ + $P4: //depot/projects/trustedbsd/www/news.page#11 $ @@ -49,6 +49,14 @@
+
October 28, 2007 OpenBSM 1.0 released
+ +

OpenBSM 1.0 has been released; this is the first production + release of the OpenBSM software package, and corresponds with the + forthcoming release of FreeBSD 7.0. See the OpenBSM web page for more + information.

+
July 16, 2007 OpenBSM 1.0 alpha 15 released

OpenBSM 1.0 alpha 15 has been released. See the ==== //depot/projects/trustedbsd/www/openbsm.page#21 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#20 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#21 $ @@ -120,12 +120,19 @@ Please see the file README present in the OpenBSM distribution for build and installation instructions.

+

2007-10-20 - OpenBSM 1.0 is a production release of the OpenBSM + code base. In this revision, a bug resulting in a crash in + auditreduce(8) is resolved, and now-unneeded AU_ constants are + removed. The versions of autoconf and automake used to build + OpenBSM have been upgraded. FreeBSD 7.0 will ship with this + version of OpenBSM. + Download (496K).

+

2007-07-16 - OpenBSM 1.0 alpha 15 release is a test release of the OpenBSM code base. In this revision, bugs are fixed in the handling of IPv6 addresses, auditreduce, and additional audit event identifiers are added for new system calls. - FreeBSD 7.0 will ship with this version of OpenBSM. Download (480K).

2007-04-16 - OpenBSM 1.0 alpha 14 release is a test release of the From owner-p4-projects@FreeBSD.ORG Mon Oct 29 17:10:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 747A816A46E; Mon, 29 Oct 2007 17:10:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC86016A420 for ; Mon, 29 Oct 2007 17:10:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C16B013C494 for ; Mon, 29 Oct 2007 17:10:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9THArhW016994 for ; Mon, 29 Oct 2007 17:10:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9THArL4016988 for perforce@freebsd.org; Mon, 29 Oct 2007 17:10:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Oct 2007 17:10:53 GMT Message-Id: <200710291710.l9THArL4016988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 17:10:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=128291 Change 128291 by rwatson@rwatson_fledge on 2007/10/29 17:09:53 Update text, break out releases from development snapshots; boldface version numbers so they are easier to spot. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#22 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#22 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#21 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#22 $ @@ -105,54 +105,65 @@

- Downloads + Releases

OpenBSM source code is available for download via occasional snapshot and release tarballs, vendor integrated source code (such as the FreeBSD source tree), cvsup, and the TrustedBSD Perforce repository. - The first full release of OpenBSM, 1.0, is expected to take place in - October, 2006; current development snapshots are appropriate for use - in production systems, but consumers of these snapshots should be - aware that APIs, file formats, and tools are under active - development, and may change at any time. + The current release is OpenBSM 1.0, released on 28 October 2007. Please see the file README present in the OpenBSM distribution for build and installation instructions.

-

2007-10-20 - OpenBSM 1.0 is a production release of the OpenBSM - code base. In this revision, a bug resulting in a crash in - auditreduce(8) is resolved, and now-unneeded AU_ constants are - removed. The versions of autoconf and automake used to build - OpenBSM have been upgraded. FreeBSD 7.0 will ship with this - version of OpenBSM. +

2007-10-28 - OpenBSM 1.0 is a production release of the + OpenBSM code base. + Since the last test release, OpenBSM 1.0 alpha 15, a bug resulting in + a crash in auditreduce(8) is resolved, and now-unneeded AU_ constants + are removed. + The versions of autoconf and automake used to build OpenBSM have been + upgraded. + FreeBSD 7.0 will ship with this version of OpenBSM. Download (496K).

+ +
+ +
+ Development Snapshots + +

Development snapshots reflect work-in-progress snapshots of the + OpenBSM development branch in Perforce. + They are appropriate for use in production systems, but consumers of + these snapshots should be aware that APIs, file formats, and tools + are under active development, and may change at any time. + Please see the file README present in the OpenBSM distribution for + build and installation instructions.

-

2007-07-16 - OpenBSM 1.0 alpha 15 release is a test release of the - OpenBSM code base. +

2007-07-16 - The OpenBSM 1.0 alpha 15 snapshot is a test + release of the OpenBSM code base. In this revision, bugs are fixed in the handling of IPv6 addresses, auditreduce, and additional audit event identifiers are added for new system calls. Download (480K).

-

2007-04-16 - OpenBSM 1.0 alpha 14 release is a test release of the - OpenBSM code base. +

2007-04-16 - The OpenBSM 1.0 alpha 14 snapshot is a test + release of the OpenBSM code base. In this revision, support for the zonename token type is added, a variety of endian-related bugs in IPv6 addresses are fixed, OpenBSM becomes warning clean for gcc1, and various man page updates are made. Download (480K).

-

2006-11-25 - OpenBSM 1.0 alpha 13 release is a test release of the - OpenBSM code base. +

2006-11-25 - The OpenBSM 1.0 alpha 13 snapshot is a test + release of the OpenBSM code base. In this revision, man page documentation is substantially improved, XML printing support has been added to praudit(8), and there is support for additional 64-bit token types. Download (480K).

-

2006-09-24 - OpenBSM 1.0 alpha 12 release is a test release of the - OpenBSM code base, and matches what is present in FreeBSD CVS at - this date. +

2006-09-24 - The OpenBSM 1.0 alpha 12 snapshot is a test + release of the OpenBSM code base, and matches what is present in + FreeBSD CVS at this date. In this revision, an audit_control(5) filesz configuration parameter is added in order to support automated rotation of audit trails based on file size, regular expression matching for paths is @@ -161,66 +172,68 @@ present. Download (480K).

-

2006-09-20 - OpenBSM 1.0 alpha 11 release is a test release of the - OpenBSM code base, and matches what is present in FreeBSD CVS at - this date. +

2006-09-20 - The OpenBSM 1.0 alpha 11 snapshot is a test + release of the OpenBSM code base, and matches what is present in + FreeBSD CVS at this date. In this revision, audit_control(5) control of audit policy is introduced, as well as a significant number of bug fixes relating to execve(2) argument auditing and log rotation. Download (480K).

-

2006-09-02 - OpenBSM 1.0 alpha 10 release is a test release of the - OpenBSM code base, and matches what is present in FreeBSD CVS at - this date. +

2006-09-02 - OpenBSM 1.0 alpha 10 snapshot is a test release + of the OpenBSM code base, and matches what is present in FreeBSD CVS + at this date. In this revision, auditd has been modified to submit complete audit records, including full return information, as part of its operation, as required by upcoming changes to the FreeBSD audit3 implementation. Download (464K).

-

2006-08-26 - OpenBSM 1.0 alpha 9 release is a test release of the - OpenBSM code base, and matches what is present in FreeBSD CVS at - this date. +

2006-08-26 - OpenBSM 1.0 alpha 9 snapshot is a test release + of the OpenBSM code base, and matches what is present in FreeBSD CVS + at this date. In this revision, the primary changes are a renaming of many OpenBSM BSM_/bsm_ constants to AUDIT_/audit_ constants, and refinment of the audit filter module API. There are also a number of bug fixes, cleanups, etc. Download (464K).

-

2006-08-16 - OpenBSM 1.0 alpha 8 release is a test release of the - OpenBSM code base, and matches what is present in FreeBSD CVS at - this date. In this revision, the primary change is to renumber - non-Solaris audit events in order to avoid possible future - collisions, and to adopt a unique OpenBSM header token version - number. There are also a number of bug fixes, cleanups, etc. +

2006-08-16 - OpenBSM 1.0 alpha 8 snapshot is a test release + of the OpenBSM code base, and matches what is present in FreeBSD CVS + at this date. + In this revision, the primary change is to renumber non-Solaris audit + events in order to avoid possible future collisions, and to adopt a + unique OpenBSM header token version number. + There are also a number of bug fixes, cleanups, etc. Download (464K).

-

2006-06-27 - OpenBSM 1.0 alpha 7 release is a test release of the - OpenBSM code base, and matches what is present in FreeBSD CVS at - this date. In this revision, the primary changes involve - improvements in the creation of subject tokens, and portability - improvements. Download - (464K).

+

2006-06-27 - OpenBSM 1.0 alpha 7 snapshot is a test release + of the OpenBSM code base, and matches what is present in FreeBSD CVS + at this date. + In this revision, the primary changes involve improvements in the + creation of subject tokens, and portability improvements. + Download (464K).

-

2006-06-02 - OpenBSM 1.0 alpha 6 release is a test release of the - OpenBSM code base, and matches what is present in FreeBSD CVS at - this date. In this revision, the primary changes are the - introduction an experimental audit filter environment, improved - APIs for submitting audit records from applications, and general - bug fixing. Download - (464K).

+

2006-06-02 - OpenBSM 1.0 alpha 6 snapshot is a test release + of the OpenBSM code base, and matches what is present in FreeBSD CVS + at this date. + In this revision, the primary changes are the introduction an + experimental audit filter environment, improved APIs for submitting + audit records from applications, and general bug fixing. + Download (464K).

-

2006-03-04 - OpenBSM 1.0 alpha 5 release is a test release of the - OpenBSM code base, and matches what is present in FreeBSD CVS at - this date. The primary change from alpha 4 is the introduction of +

2006-03-04 - OpenBSM 1.0 alpha 5 snapshot is a test release + of the OpenBSM code base, and matches what is present in FreeBSD CVS + at this date. + The primary change from alpha 4 is the introduction of autoconf/automake support, which allows it to build on Darwin and - Linux. Download - (432K).

+ Linux. + Download (432K).

-

2006-02-23 - OpenBSM 1.0 alpha 4 release is an initial test release - of the OpenBSM code base, and matches what is present in FreeBSD CVS - at this date. Download - (86K).

+

2006-02-23 - OpenBSM 1.0 alpha 4 snapshot is an initial test + release of the OpenBSM code base, and matches what is present in + FreeBSD CVS at this date. + Download (86K).

From owner-p4-projects@FreeBSD.ORG Mon Oct 29 17:25:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 559B416A468; Mon, 29 Oct 2007 17:25:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0575216A417 for ; Mon, 29 Oct 2007 17:25:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E796013C4A6 for ; Mon, 29 Oct 2007 17:25:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9THP8o6017844 for ; Mon, 29 Oct 2007 17:25:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9THP8lU017841 for perforce@freebsd.org; Mon, 29 Oct 2007 17:25:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Oct 2007 17:25:08 GMT Message-Id: <200710291725.l9THP8lU017841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 17:25:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=128292 Change 128292 by rwatson@rwatson_fledge on 2007/10/29 17:24:39 Update copyright. Affected files ... .. //depot/projects/trustedbsd/www/page.xsl#3 edit Differences ... ==== //depot/projects/trustedbsd/www/page.xsl#3 (text+ko) ==== @@ -91,7 +91,7 @@

    - Copyright 2000-2006 Robert Watson. All rights reserved.
    + Copyright 2000-2007 Robert Watson. All rights reserved.
    Copyright 2005 SPARTA, Inc. All rights reserved.
    Copyright 2002, Leigh Denault. All rights reserved.
    Copyright 2002, 2003 Networks Associates, Inc. All rights From owner-p4-projects@FreeBSD.ORG Mon Oct 29 18:49:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1473016A41B; Mon, 29 Oct 2007 18:49:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9FCA16A419 for ; Mon, 29 Oct 2007 18:49:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 994B613C4CB for ; Mon, 29 Oct 2007 18:49:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TIng0a029762 for ; Mon, 29 Oct 2007 18:49:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TIngAj029751 for perforce@freebsd.org; Mon, 29 Oct 2007 18:49:42 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 Oct 2007 18:49:42 GMT Message-Id: <200710291849.l9TIngAj029751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 18:49:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=128295 Change 128295 by kmacy@entropy_kmacy_xen31 on 2007/10/29 18:48:42 initial integration - does not yet build (pmap.c needs to be re-done) but it is worthwhile for getting feedback Affected files ... .. //depot/projects/xen31/sys/conf/files.i386#2 edit .. //depot/projects/xen31/sys/conf/options.i386#2 edit .. //depot/projects/xen31/sys/i386/conf/DEFAULTS#2 edit .. //depot/projects/xen31/sys/i386/include/segments.h#2 edit .. //depot/projects/xen31/sys/i386/include/xen/hypercall.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/hypervisor-ifs.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/hypervisor.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-os.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/acm.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/acm_ops.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-ia64.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86_32.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86_64.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/dom0_ops.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/event_channel.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/features.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/grant_table.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/memory.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/nmi.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/physdev.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/sched.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/sched_ctl.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/trace.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/vcpu.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/version.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/xen-compat.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen-public/xen.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xen_intr.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xenbus.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xenfunc.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xenstored.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xenvar.h#1 add .. //depot/projects/xen31/sys/i386/xen/exception.s#1 add .. //depot/projects/xen31/sys/i386/xen/locore.s#1 add .. //depot/projects/xen31/sys/i386/xen/machdep.c#1 add .. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#1 add Differences ... ==== //depot/projects/xen31/sys/conf/files.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.582 2007/10/15 20:00:21 netchild Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.584 2007/10/26 03:23:52 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -32,7 +32,7 @@ clean "svr4_assym.h" # font.h optional sc_dflt_font \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ + compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" # @@ -66,15 +66,15 @@ compile-with "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \ no-implicit-rule # -os+%DIKED-nve.h optional nve pci \ +os+%DIKED-nve.h optional nve pci \ dependency "$S/contrib/dev/nve/os.h" \ compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \ no-implicit-rule no-obj before-depend \ clean "os+%DIKED-nve.h" # hptmvraid.o optional hptmv \ - dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \ - compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \ + dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \ + compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \ no-implicit-rule # rr232x_lib.o optional rr232x \ @@ -211,6 +211,7 @@ dev/mse/mse_isa.c optional mse isa dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci +dev/nvram/nvram.c optional nvram isa dev/pcf/pcf_isa.c optional pcf dev/random/nehemiah.c optional random dev/rr232x/os_bsd.c optional rr232x @@ -254,11 +255,11 @@ i386/cpufreq/powernow.c optional cpufreq i386/cpufreq/smist.c optional cpufreq #i386/i386/apic_vector.s optional apic -i386/i386/atomic.c standard \ +i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bios.c optional native +i386/i386/bioscall.s optional native i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/busdma_machdep.c standard i386/i386/db_disasm.c optional ddb @@ -267,7 +268,8 @@ i386/i386/dump_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.s optional native +i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem @@ -280,9 +282,12 @@ i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic -i386/i386/locore.s standard no-obj +i386/i386/locore.s optional native no-obj +i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun -i386/i386/machdep.c standard +i386/i386/machdep.c optional native +i386/xen/machdep.c optional xen +i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp @@ -294,7 +299,8 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard nowerror +i386/i386/pmap.c optional native nowerror +i386/xen/pmap.c optional xen nowerror i386/i386/ptrace_machdep.c standard i386/i386/support.s standard i386/i386/swtch.s standard @@ -338,18 +344,18 @@ i386/isa/vesa.c optional vga vesa i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux -i386/linux/linux_locore.s optional compat_linux \ +i386/linux/linux_locore.s optional compat_linux \ dependency "linux_assym.h" i386/linux/linux_machdep.c optional compat_linux i386/linux/linux_ptrace.c optional compat_linux -i386/linux/linux_support.s optional compat_linux \ +i386/linux/linux_support.s optional compat_linux \ dependency "linux_assym.h" i386/linux/linux_sysent.c optional compat_linux i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci i386/pci/pci_pir.c optional pci -i386/svr4/svr4_locore.s optional compat_svr4 \ +i386/svr4/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 @@ -406,17 +412,17 @@ # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # -i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_isac.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_l1.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c optional ifpnp +i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional ifpnp +i4b/layer1/ifpnp/i4b_ifpnp_isac.c optional ifpnp +i4b/layer1/ifpnp/i4b_ifpnp_l1.c optional ifpnp +i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c optional ifpnp # # isdn4bsd, ihfc # @@ -426,10 +432,10 @@ # # isdn4bsd, itjc # -i4b/layer1/itjc/i4b_itjc_pci.c optional itjc -i4b/layer1/itjc/i4b_itjc_isac.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc +i4b/layer1/itjc/i4b_itjc_pci.c optional itjc +i4b/layer1/itjc/i4b_itjc_isac.c optional itjc +i4b/layer1/itjc/i4b_itjc_l1.c optional itjc +i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # isa/syscons_isa.c optional sc isa/vga_isa.c optional vga @@ -453,7 +459,7 @@ pci/agp_nvidia.c optional agp pci/agp_sis.c optional agp pci/agp_via.c optional agp -i386/xbox/xbox.c optional xbox -i386/xbox/xboxfb.c optional xboxfb -dev/fb/boot_font.c optional xboxfb -i386/xbox/pic16l.s optional xbox +i386/xbox/xbox.c optional xbox +i386/xbox/xboxfb.c optional xboxfb +dev/fb/boot_font.c optional xboxfb +i386/xbox/pic16l.s optional xbox ==== //depot/projects/xen31/sys/conf/options.i386#2 (text+ko) ==== @@ -36,6 +36,9 @@ # Physical address extensions and support for >4G ram. As above. PAE opt_global.h +XEN opt_global.h +NATIVE opt_global.h + CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h ==== //depot/projects/xen31/sys/i386/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 # -# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.10 2007/06/11 00:38:06 marcel Exp $ +# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.11 2007/10/26 03:23:53 peter Exp $ machine i386 @@ -15,6 +15,7 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device +device nvram # Access to rtc cmos via /dev/nvram # UART chips on this platform device uart_ns8250 @@ -23,5 +24,4 @@ options GEOM_BSD options GEOM_MBR -# KSE support went from being default to a kernel option -options KSE +options NATIVE ==== //depot/projects/xen31/sys/i386/include/segments.h#2 (text+ko) ==== @@ -240,12 +240,16 @@ #ifdef _KERNEL extern int _default_ldt; -extern union descriptor gdt[]; extern struct soft_segment_descriptor gdt_segs[]; extern struct gate_descriptor *idt; +extern struct region_descriptor r_gdt, r_idt; +#ifdef XEN +extern union descriptor *gdt; +extern union descriptor *ldt; +#else +extern union descriptor gdt[]; extern union descriptor ldt[NLDT]; -extern struct region_descriptor r_gdt, r_idt; - +#endif void lgdt(struct region_descriptor *rdp); void sdtossd(struct segment_descriptor *sdp, struct soft_segment_descriptor *ssdp); From owner-p4-projects@FreeBSD.ORG Mon Oct 29 20:47:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54D3016A46E; Mon, 29 Oct 2007 20:47:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C55A716A421; Mon, 29 Oct 2007 20:47:55 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id 3FB7C13C4B5; Mon, 29 Oct 2007 20:47:55 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 8C8C145EEB; Mon, 29 Oct 2007 10:06:46 +0100 (CET) Received: from localhost (pjd.wheel.pl [10.0.1.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id B09F545B26; Mon, 29 Oct 2007 10:06:41 +0100 (CET) Date: Mon, 29 Oct 2007 11:06:40 +0100 From: Pawel Jakub Dawidek To: John Birrell Message-ID: <20071029100640.GC4407@garage.freebsd.pl> References: <200710282311.l9SNBB5F062908@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="sHrvAb52M6C8blB9" Content-Disposition: inline In-Reply-To: <200710282311.l9SNBB5F062908@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.0.4 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 128256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 20:47:56 -0000 --sHrvAb52M6C8blB9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 28, 2007 at 11:11:11PM +0000, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D128256 >=20 > Change 128256 by jb@jb_freebsd1 on 2007/10/28 23:10:34 >=20 > Remove _SOLARIS_C_SOURCE compatibility definitions > since pjd won't go that route. Thanks for doing that. > =3D=3D=3D=3D //depot/projects/dtrace/src/sys/sys/kernel.h#12 (text+ko) = =3D=3D=3D=3D >=20 > @@ -68,9 +68,7 @@ > extern int profhz; /* profiling clock's frequency */ > extern int profprocs; /* number of process's profiling */ > extern int ticks; > -#ifndef _SOLARIS_C_SOURCE > extern int lbolt; /* once a second sleep address */ > -#endif This was added by me, to _not_ export lbolt from this header when compiling solaris-compatible code. I think it may still be needed. --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --sHrvAb52M6C8blB9 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFHJbCvForvXbEpPzQRAoWVAKC8aZyD9SxIIvubl9gLOCZgiAe7NQCfY+wC 6cYBOzkjIkFQq2asDSZxc8E= =kpR4 -----END PGP SIGNATURE----- --sHrvAb52M6C8blB9-- From owner-p4-projects@FreeBSD.ORG Mon Oct 29 21:39:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDF2516A418; Mon, 29 Oct 2007 21:39:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77F9F16A468 for ; Mon, 29 Oct 2007 21:39:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 531C213C48A for ; Mon, 29 Oct 2007 21:39:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TLdpDf053105 for ; Mon, 29 Oct 2007 21:39:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TLdpV4053102 for perforce@freebsd.org; Mon, 29 Oct 2007 21:39:51 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 Oct 2007 21:39:51 GMT Message-Id: <200710292139.l9TLdpV4053102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128304 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 21:39:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=128304 Change 128304 by kmacy@kmacy:storage:toestack on 2007/10/29 21:39:40 add eventhandler for arp updates Affected files ... .. //depot/projects/toestack/sys/net/if_arp.h#2 edit Differences ... ==== //depot/projects/toestack/sys/net/if_arp.h#2 (text+ko) ==== @@ -108,6 +108,9 @@ #define IFP2AC(ifp) ((struct arpcom *)(ifp->if_l2com)) #define AC2IFP(ac) ((ac)->ac_ifp) +typedef void (*arpupdate_fn)(struct rtentry *); +EVENTHANDLER_DECLARE(arp_update, arpupdate_fn); + #endif #endif /* !_NET_IF_ARP_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Oct 29 21:47:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58B5516A46C; Mon, 29 Oct 2007 21:47:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0694816A417 for ; Mon, 29 Oct 2007 21:47:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED34E13C4B5 for ; Mon, 29 Oct 2007 21:47:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TLl0Pv053599 for ; Mon, 29 Oct 2007 21:47:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TLl0dG053594 for perforce@freebsd.org; Mon, 29 Oct 2007 21:47:00 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 Oct 2007 21:47:00 GMT Message-Id: <200710292147.l9TLl0dG053594@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 21:47:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=128306 Change 128306 by kmacy@kmacy:storage:toestack on 2007/10/29 21:46:43 let arpresolve take a null mbuf remove code duplication in arp_ifinit and arp_ifinit2 hook arp update with arp_update eventhandler Affected files ... .. //depot/projects/toestack/sys/netinet/if_ether.c#6 edit Differences ... ==== //depot/projects/toestack/sys/netinet/if_ether.c#6 (text+ko) ==== @@ -362,15 +362,17 @@ struct sockaddr_dl *sdl; int error; - if (m->m_flags & M_BCAST) { /* broadcast */ - (void)memcpy(desten, ifp->if_broadcastaddr, ifp->if_addrlen); - return (0); + if (m) { + if (m->m_flags & M_BCAST) { /* broadcast */ + (void)memcpy(desten, ifp->if_broadcastaddr, ifp->if_addrlen); + return (0); + } + if (m->m_flags & M_MCAST && ifp->if_type != IFT_ARCNET) {/* multicast */ + ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten); + return (0); + } } - if (m->m_flags & M_MCAST && ifp->if_type != IFT_ARCNET) {/* multicast */ - ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten); - return (0); - } - + if (rt0 != NULL) { error = rt_check(&rt, &rt0, dst); if (error) { @@ -413,7 +415,8 @@ sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) { bcopy(LLADDR(sdl), desten, sdl->sdl_alen); - + EVENTHANDLER_INVOKE(arp_update, rt); + /* * If entry has an expiry time and it is approaching, * send an ARP request. @@ -449,10 +452,12 @@ * response yet. Replace the held mbuf with this * latest one. */ - if (la->la_hold) - m_freem(la->la_hold); - la->la_hold = m; - + if (m) { + if (la->la_hold) + m_freem(la->la_hold); + la->la_hold = m; + } + KASSERT(rt->rt_expire > 0, ("sending ARP request for static entry")); /* @@ -936,12 +941,12 @@ } } -void -arp_ifinit(struct ifnet *ifp, struct ifaddr *ifa) +static __inline +arp_ifinit_internal(struct ifnet *ifp, struct ifaddr *ifa, u_char *enaddr) { if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY) arprequest(ifp, &IA_SIN(ifa)->sin_addr, - &IA_SIN(ifa)->sin_addr, IF_LLADDR(ifp)); + &IA_SIN(ifa)->sin_addr, enaddr); ifa->ifa_rtrequest = arp_rtrequest; ifa->ifa_flags |= RTF_CLONING; } @@ -949,11 +954,13 @@ void arp_ifinit2(struct ifnet *ifp, struct ifaddr *ifa, u_char *enaddr) { - if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY) - arprequest(ifp, &IA_SIN(ifa)->sin_addr, - &IA_SIN(ifa)->sin_addr, enaddr); - ifa->ifa_rtrequest = arp_rtrequest; - ifa->ifa_flags |= RTF_CLONING; + arp_ifinit_internal(ifp, ifa, enaddr); +} + +void +arp_ifinit(struct ifnet *ifp, struct ifaddr *ifa) +{ + arp_ifinit_internal(ifp, ifa, IF_LLADDR(ifp)); } static void From owner-p4-projects@FreeBSD.ORG Mon Oct 29 23:32:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1FFA16A46B; Mon, 29 Oct 2007 23:32:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C1D516A41B for ; Mon, 29 Oct 2007 23:32:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FC7C13C4A8 for ; Mon, 29 Oct 2007 23:32:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TNWwPp064217 for ; Mon, 29 Oct 2007 23:32:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TNWw5B064214 for perforce@freebsd.org; Mon, 29 Oct 2007 23:32:58 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 Oct 2007 23:32:58 GMT Message-Id: <200710292332.l9TNWw5B064214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 23:32:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=128310 Change 128310 by kmacy@kmacy:storage:toestack on 2007/10/29 23:32:33 make arp_update into a more generic route_event fix signature for arp_ifinit_internal Affected files ... .. //depot/projects/toestack/sys/net/if_arp.h#3 edit .. //depot/projects/toestack/sys/net/route.h#4 edit .. //depot/projects/toestack/sys/netinet/if_ether.c#7 edit Differences ... ==== //depot/projects/toestack/sys/net/if_arp.h#3 (text+ko) ==== @@ -108,9 +108,6 @@ #define IFP2AC(ifp) ((struct arpcom *)(ifp->if_l2com)) #define AC2IFP(ac) ((ac)->ac_ifp) -typedef void (*arpupdate_fn)(struct rtentry *); -EVENTHANDLER_DECLARE(arp_update, arpupdate_fn); - #endif #endif /* !_NET_IF_ARP_H_ */ ==== //depot/projects/toestack/sys/net/route.h#4 (text+ko) ==== @@ -364,6 +364,15 @@ struct sockaddr *, struct sockaddr *, int, struct rtentry **); int rtrequest1(int, struct rt_addrinfo *, struct rtentry **); int rt_check(struct rtentry **, struct rtentry **, struct sockaddr *); + + +#include +#define RTEVENT_ARP_UPDATE 1 +typedef void (*rtevent_fn)(void *, int, struct rtentry *); +EVENTHANDLER_DECLARE(route_event, rtevent_fn); + + + #endif #endif ==== //depot/projects/toestack/sys/netinet/if_ether.c#7 (text+ko) ==== @@ -415,7 +415,7 @@ sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) { bcopy(LLADDR(sdl), desten, sdl->sdl_alen); - EVENTHANDLER_INVOKE(arp_update, rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt); /* * If entry has an expiry time and it is approaching, @@ -941,7 +941,7 @@ } } -static __inline +static __inline void arp_ifinit_internal(struct ifnet *ifp, struct ifaddr *ifa, u_char *enaddr) { if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY) From owner-p4-projects@FreeBSD.ORG Tue Oct 30 01:51:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D4EB16A421; Tue, 30 Oct 2007 01:51:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DB2F16A417 for ; Tue, 30 Oct 2007 01:51:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B32B13C48D for ; Tue, 30 Oct 2007 01:51:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9U1pSuV087624 for ; Tue, 30 Oct 2007 01:51:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9U1pSrh087621 for perforce@freebsd.org; Tue, 30 Oct 2007 01:51:28 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 01:51:28 GMT Message-Id: <200710300151.l9U1pSrh087621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 01:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=128316 Change 128316 by kmacy@kmacy:storage:toestack on 2007/10/30 01:50:45 add eventhandlers for pmtu changes and redirects Affected files ... .. //depot/projects/toestack/sys/net/route.c#5 edit .. //depot/projects/toestack/sys/net/route.h#5 edit .. //depot/projects/toestack/sys/netinet/ip_icmp.c#4 edit Differences ... ==== //depot/projects/toestack/sys/net/route.c#5 (text+ko) ==== @@ -496,9 +496,11 @@ info.rti_ifa = ifa; info.rti_flags = flags; rt = NULL; + error = rtrequest1(RTM_ADD, &info, &rt); if (rt != NULL) { RT_LOCK(rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt); flags = rt->rt_flags; } stat = &rtstat.rts_dynamic; @@ -514,6 +516,7 @@ * add the key and gateway (in one malloc'd chunk). */ rt_setgate(rt, rt_key(rt), gateway); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt); } } else error = EHOSTUNREACH; ==== //depot/projects/toestack/sys/net/route.h#5 (text+ko) ==== @@ -367,7 +367,9 @@ #include -#define RTEVENT_ARP_UPDATE 1 +#define RTEVENT_ARP_UPDATE 1 +#define RTEVENT_PMTU_UPDATE 2 +#define RTEVENT_REDIRECT_UPDATE 3 typedef void (*rtevent_fn)(void *, int, struct rtentry *); EVENTHANDLER_DECLARE(route_event, rtevent_fn); ==== //depot/projects/toestack/sys/netinet/ip_icmp.c#4 (text+ko) ==== @@ -136,6 +136,33 @@ extern struct protosw inetsw[]; +static void +rt_mtu_update(struct sockaddr *icmpsrc, struct icmp *icp) +{ + struct rtentry *rt; + int mtu; + + rt = rtalloc1(icmpsrc, 0, RTF_CLONING); + if (rt && (rt->rt_flags & RTF_HOST)) { + mtu = ntohs(icp->icmp_nextmtu); + if (!mtu) + mtu = ip_next_mtu(rt->rt_rmx.rmx_mtu, + 1); +#ifdef DEBUG_MTUDISC + printf("MTU for %s reduced to %d\n", + inet_ntoa(icmpsrc.sin_addr), mtu); +#endif + if (mtu >= 296 && rt->rt_rmx.rmx_mtu > mtu) { + rt->rt_rmx.rmx_mtu = mtu; + EVENTHANDLER_INVOKE(route_event, RTEVENT_PMTU_UPDATE, rt); + } + } + if (rt) + RTFREE(rt); +} + + + /* * Generate an error packet of type error * in response to bad packet ip. @@ -442,6 +469,11 @@ #endif icmpsrc.sin_addr = icp->icmp_ip.ip_dst; /* + * Update the route directly for use by protocol offload + */ + if (code == PRC_MSGSIZE) + rt_mtu_update((struct sockaddr *)&icmpsrc, icp); + /* * XXX if the packet contains [IPv4 AH TCP], we can't make a * notification to TCP layer. */ From owner-p4-projects@FreeBSD.ORG Tue Oct 30 04:31:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2858216A418; Tue, 30 Oct 2007 04:31:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C46A16A46B for ; Tue, 30 Oct 2007 04:31:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C10513C4B8 for ; Tue, 30 Oct 2007 04:31:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9U4VIVj005687 for ; Tue, 30 Oct 2007 04:31:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9U4VIw8005684 for perforce@freebsd.org; Tue, 30 Oct 2007 04:31:18 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 04:31:18 GMT Message-Id: <200710300431.l9U4VIw8005684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 04:31:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=128319 Change 128319 by kmacy@kmacy:storage:toestack on 2007/10/30 04:30:42 change route_eventhandler to take 2 rtentry arguments for redirect updates Affected files ... .. //depot/projects/toestack/sys/net/route.c#6 edit .. //depot/projects/toestack/sys/net/route.h#6 edit .. //depot/projects/toestack/sys/netinet/if_ether.c#8 edit .. //depot/projects/toestack/sys/netinet/ip_icmp.c#5 edit Differences ... ==== //depot/projects/toestack/sys/net/route.c#6 (text+ko) ==== @@ -442,7 +442,7 @@ int flags, struct sockaddr *src) { - struct rtentry *rt; + struct rtentry *rt, *rt0 = NULL; int error = 0; short *stat = NULL; struct rt_addrinfo info; @@ -486,8 +486,8 @@ * Create new route, rather than smashing route to net. */ create: - if (rt) - rtfree(rt); + rt0 = rt; + flags |= RTF_GATEWAY | RTF_DYNAMIC; bzero((caddr_t)&info, sizeof(info)); info.rti_info[RTAX_DST] = dst; @@ -500,9 +500,12 @@ error = rtrequest1(RTM_ADD, &info, &rt); if (rt != NULL) { RT_LOCK(rt); - EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt0, rt); flags = rt->rt_flags; } + if (rt0) + RTFREE_LOCKED(rt0); + stat = &rtstat.rts_dynamic; } else { /* @@ -516,7 +519,7 @@ * add the key and gateway (in one malloc'd chunk). */ rt_setgate(rt, rt_key(rt), gateway); - EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt, gateway); } } else error = EHOSTUNREACH; ==== //depot/projects/toestack/sys/net/route.h#6 (text+ko) ==== @@ -370,7 +370,7 @@ #define RTEVENT_ARP_UPDATE 1 #define RTEVENT_PMTU_UPDATE 2 #define RTEVENT_REDIRECT_UPDATE 3 -typedef void (*rtevent_fn)(void *, int, struct rtentry *); +typedef void (*rtevent_fn)(void *, int, struct rtentry *, struct rtentry *); EVENTHANDLER_DECLARE(route_event, rtevent_fn); ==== //depot/projects/toestack/sys/netinet/if_ether.c#8 (text+ko) ==== @@ -415,7 +415,7 @@ sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) { bcopy(LLADDR(sdl), desten, sdl->sdl_alen); - EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL); /* * If entry has an expiry time and it is approaching, ==== //depot/projects/toestack/sys/netinet/ip_icmp.c#5 (text+ko) ==== @@ -154,7 +154,7 @@ #endif if (mtu >= 296 && rt->rt_rmx.rmx_mtu > mtu) { rt->rt_rmx.rmx_mtu = mtu; - EVENTHANDLER_INVOKE(route_event, RTEVENT_PMTU_UPDATE, rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_PMTU_UPDATE, rt, NULL); } } if (rt) From owner-p4-projects@FreeBSD.ORG Tue Oct 30 04:48:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A12A216A46B; Tue, 30 Oct 2007 04:48:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E91FE16A420 for ; Tue, 30 Oct 2007 04:48:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8F6913C4B3 for ; Tue, 30 Oct 2007 04:48:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9U4mcs3015201 for ; Tue, 30 Oct 2007 04:48:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9U4mcWJ015198 for perforce@freebsd.org; Tue, 30 Oct 2007 04:48:38 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 04:48:38 GMT Message-Id: <200710300448.l9U4mcWJ015198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 04:48:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=128320 Change 128320 by kmacy@kmacy:storage:toestack on 2007/10/30 04:48:29 pass rtentry for gateway to eventhandler when redirect is pointed at a gateway Affected files ... .. //depot/projects/toestack/sys/net/route.c#7 edit Differences ... ==== //depot/projects/toestack/sys/net/route.c#7 (text+ko) ==== @@ -487,7 +487,7 @@ */ create: rt0 = rt; - + flags |= RTF_GATEWAY | RTF_DYNAMIC; bzero((caddr_t)&info, sizeof(info)); info.rti_info[RTAX_DST] = dst; @@ -508,6 +508,8 @@ stat = &rtstat.rts_dynamic; } else { + struct rtentry *gwrt; + /* * Smash the current notion of the gateway to * this destination. Should check about netmask!!! @@ -519,13 +521,15 @@ * add the key and gateway (in one malloc'd chunk). */ rt_setgate(rt, rt_key(rt), gateway); - EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt, gateway); + gwrt = rtalloc1(gateway, 1, 0); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt, gwrt); + RTFREE_LOCKED(gwrt); } } else error = EHOSTUNREACH; done: if (rt) - rtfree(rt); + RTFREE_LOCKED(rt); out: if (error) rtstat.rts_badredirect++; From owner-p4-projects@FreeBSD.ORG Tue Oct 30 05:10:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44C3216A418; Tue, 30 Oct 2007 05:10:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5D0F16A41A; Tue, 30 Oct 2007 05:10:30 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 529CB13C4B2; Tue, 30 Oct 2007 05:10:30 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.1/8.14.1) with ESMTP id l9U52UUb049791; Mon, 29 Oct 2007 23:02:30 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 29 Oct 2007 23:03:54 -0600 (MDT) Message-Id: <20071029.230354.1649770236.imp@bsdimp.com> To: peter@freebsd.org From: "M. Warner Losh" In-Reply-To: <200710242238.l9OMckpY090837@repoman.freebsd.org> References: <200710242238.l9OMckpY090837@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 128037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 05:10:31 -0000 In message: <200710242238.l9OMckpY090837@repoman.freebsd.org> Peter Wemm writes: : Change 128037 by peter@peter_daintree on 2007/10/24 22:38:31 : : Install include32/machine files specific to i386. These override : the common ones in /usr/include because of the include search path. : : *HACK HACK HACK!* Indeed. Would it be better to install them in /usr/cross/i386/{include,lib,...} and have the tools grok that path instead, so one could also cross build for the arm, say? Warner From owner-p4-projects@FreeBSD.ORG Tue Oct 30 08:27:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 123ED16A473; Tue, 30 Oct 2007 08:27:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9FFDD16A41A for ; Tue, 30 Oct 2007 08:27:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8855713C4A5 for ; Tue, 30 Oct 2007 08:27:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9U8Ro4b034540 for ; Tue, 30 Oct 2007 08:27:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9U8Ri96034537 for perforce@freebsd.org; Tue, 30 Oct 2007 08:27:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 30 Oct 2007 08:27:44 GMT Message-Id: <200710300827.l9U8Ri96034537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 08:27:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=128325 Change 128325 by rwatson@rwatson_zoo on 2007/10/30 08:27:41 Integrate TrustedBSD base branch from FreeBSD CVS: - OpenBSM 1.0 - PTHREAD_ADAPTIVE_MUTEX_NP - if_nxge driver upgrade - Object type sorting in MAC Framework policy modules - mac_test fleshed out some more Affected files ... .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#9 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/config/ltmain.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#9 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#9 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_class#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_event#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/include/pthread.h#12 integrate .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#26 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#29 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nxge.4#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#24 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/ohci_atmelarm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/gentbi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/DEFAULTS#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#78 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#52 integrate .. //depot/projects/trustedbsd/base/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#18 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#23 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#59 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#31 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_ifoff/mac_ifoff.c#15 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#36 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#52 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_partition/mac_partition.c#17 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_seeotheruids/mac_seeotheruids.c#17 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_stub/mac_stub.c#23 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#47 integrate .. //depot/projects/trustedbsd/base/tools/tools/nxge/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nxge/xge_cmn.h#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nxge/xge_info.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nxge/xge_info.h#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nxge/xge_log.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nxge/xge_log.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/io.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/msgs/msgs.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#30 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dmenu.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#9 (text) ==== @@ -1,3 +1,10 @@ +OpenBSM 1.0 + +- Fix bug in auditreduce(8) which resulted in a memory fault/crash when + the user specified an event name with -m. +- Remove AU_.* hard-coded audit class constants, as udit classes are now + entirely dynamically configured using /etc/security/audit_class. + OpenBSM 1.0 alpha 15 - Fix bug when processing in_addr_ex tokens. @@ -295,4 +302,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#55 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#57 $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/Makefile.in#3 (text) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,17 +15,13 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#5 $ # -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -39,18 +35,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \ $(top_srcdir)/configure TODO config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/ltmain.sh config/missing -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config/config.h CONFIG_CLEAN_FILES = @@ -58,10 +54,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -77,8 +76,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -105,8 +102,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ -HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ +GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -118,9 +115,8 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -130,20 +126,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -155,28 +149,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = \ bsm \ libbsm \ @@ -231,7 +236,7 @@ config/config.h: config/stamp-h1 @if test ! -f $@; then \ rm -f config/stamp-h1; \ - $(MAKE) config/stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \ else :; fi config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status @@ -253,7 +258,6 @@ distclean-libtool: -rm -f libtool -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -286,8 +290,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -389,24 +392,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/config - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -420,7 +421,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -428,6 +429,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -435,7 +438,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -510,7 +513,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -580,12 +583,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -606,24 +617,26 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. ==== //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#8 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_15 +OPENBSM_1_0 ==== //depot/projects/trustedbsd/base/contrib/openbsm/aclocal.m4#2 (text) ==== @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,9 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 AC_PROG_LIBTOOL +# serial 51 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -163,6 +168,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -175,17 +181,17 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" @@ -233,6 +239,9 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER @@ -259,9 +268,10 @@ # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -272,9 +282,10 @@ # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_LINKER_BOILERPLATE @@ -289,12 +300,20 @@ # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -525,13 +544,17 @@ rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -548,6 +571,9 @@ ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -580,6 +606,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -603,7 +645,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -622,9 +664,9 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -644,19 +686,20 @@ # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi @@ -731,6 +774,12 @@ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -744,25 +793,39 @@ esac fi ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -775,7 +838,7 @@ # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -783,7 +846,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ +# --------------------------------------------------------------------- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -849,6 +912,8 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); }] @@ -859,7 +924,7 @@ case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; + x$lt_dlunknown|x*) $3 ;; esac else : # compilation failed @@ -871,7 +936,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ------------------- +# ---------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -942,7 +1007,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -955,7 +1020,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -987,7 +1052,8 @@ # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -995,7 +1061,7 @@ mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -1015,9 +1081,9 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi @@ -1135,6 +1201,7 @@ darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -1152,7 +1219,8 @@ # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= @@ -1166,20 +1234,58 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" +m4_if($1,[],[ if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi +fi]) need_lib_prefix=unknown hardcode_into_libs=no @@ -1336,12 +1442,8 @@ shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1358,18 +1460,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -1402,10 +1492,15 @@ shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 30 09:12:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22BDC16A41B; Tue, 30 Oct 2007 09:12:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A761616A417 for ; Tue, 30 Oct 2007 09:12:43 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94C8013C4BE for ; Tue, 30 Oct 2007 09:12:43 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9U9Ch1l046975 for ; Tue, 30 Oct 2007 09:12:43 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9U9Ch4w046972 for perforce@freebsd.org; Tue, 30 Oct 2007 09:12:43 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 30 Oct 2007 09:12:43 GMT Message-Id: <200710300912.l9U9Ch4w046972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 128326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 09:12:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=128326 Change 128326 by zhouzhouyi@zhouzhouyi_mactest on 2007/10/30 09:12:03 edit the link/00.t for good style Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#5 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#5 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/link/00.t,v 1.2 2007/01/25 20:50:02 zhouzhouyi Exp $ +# $FreeBSD$ desc="link creates hardlinks" @@ -7,81 +7,67 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..10" - n0=`namegen` n1=`namegen` n2=`namegen` n3=`namegen` - -#turn off all the switches -for i in `sysctl security.mac | grep "\.enabled"| - sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do - t=`sysctl ${i}=0` -done - mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] ; then - dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; + + echo "1..10" +#turn off all the switches first + for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do + sysctl ${i}=0 >/dev/null + done + + dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; -############################################################# #first make working dir, the hook checks are already done in open: - if [ -f ${mactest_conf} ]; then - rm ${mactest_conf} - fi - touch ${mactest_conf} + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} + sysctl security.mac.mls.enabled=1 >/dev/null -############################################################# - t=`sysctl security.mac.mls.enabled=1` -# echo "enforcing mac/mls!" #case 1: mkdir - mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} 0755 + mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} 0755 #case 2: setfmac - mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n3} + mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n3} #case 3: create - mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} create ${n3}/${n2} 0644 + mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} create ${n3}/${n2} 0644 #case 4: setfmac - mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac "mls/5" ${n3}/${n2} - + mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac "mls/5" ${n3}/${n2} #case 5: link - echo -n "pid = -1 mac_test_check_vnode_link:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} - mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} - -############################################################# - t=`sysctl security.mac.mls.enabled=0` + echo -n "pid = -1 mac_test_check_vnode_link:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} + sysctl security.mac.mls.enabled=0 >/dev/null #case 6: link success - truncate -s 0 ${mactest_conf} - mactestexpect "" 0 -m "mls/5(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} - t=`sysctl security.mac.mls.enabled=1` - + truncate -s 0 ${mactest_conf} + mactestexpect "" 0 -m "mls/5(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} + sysctl security.mac.mls.enabled=1 >/dev/null #case 7: unlink - truncate -s 0 ${mactest_conf} - mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} - + truncate -s 0 ${mactest_conf} + mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} #case 8: setfmac fail, old vnode not in range - echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(6-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} - mactestexpect "setfmac:.mac_set_link.${n3}.${n1},.biba.,mls.6.:.Operation.not.permitted" "" -m "mls/6(6-6)" -f ${mactest_conf} system setfmac "biba/,mls/6" ${n3}/${n1} - + echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(6-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} + mactestexpect "setfmac:.mac_set_link.${n3}.${n1},.biba.,mls.6.:.Operation.not.permitted" "" -m "mls/6(6-6)" -f ${mactest_conf} system setfmac "biba/,mls/6" ${n3}/${n1} #case 9: setfmac success - echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(4-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} - mactestexpect "" "" -m "mls/6(4-6)" -f ${mactest_conf} system setfmac "biba/,mls/6" ${n3}/${n1} - - + echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(4-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} + mactestexpect "" "" -m "mls/6(4-6)" -f ${mactest_conf} system setfmac "biba/,mls/6" ${n3}/${n1} #case 10: unlink - rm ${mactest_conf} - touch ${mactest_conf} - mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} - - + rm ${mactest_conf} + touch ${mactest_conf} + mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} #cleanup: - t=`sysctl security.mac.mls.enabled=0` - rm -fr ${n3} - rm ${mactest_conf} + sysctl security.mac.mls.enabled=0 >/dev/null + rm -fr ${n3} + rm ${mactest_conf} fi From owner-p4-projects@FreeBSD.ORG Tue Oct 30 12:07:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F09FB16A41A; Tue, 30 Oct 2007 12:07:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 963FB16A417 for ; Tue, 30 Oct 2007 12:07:58 +0000 (UTC) (envelope-from avatar@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8188C13C4BF for ; Tue, 30 Oct 2007 12:07:58 +0000 (UTC) (envelope-from avatar@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UC7w5A069283 for ; Tue, 30 Oct 2007 12:07:58 GMT (envelope-from avatar@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UC7wn5069280 for perforce@freebsd.org; Tue, 30 Oct 2007 12:07:58 GMT (envelope-from avatar@freebsd.org) Date: Tue, 30 Oct 2007 12:07:58 GMT Message-Id: <200710301207.l9UC7wn5069280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to avatar@freebsd.org using -f From: Tai-hwa Liang To: Perforce Change Reviews Cc: Subject: PERFORCE change 128330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 12:07:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=128330 Change 128330 by avatar@avatar_t40 on 2007/10/30 12:07:46 an_stats_update() should not go any further after the device is detached. This fixes the card removal panic reported by user. Reported by: dhw (http://lists.freebsd.org/pipermail/freebsd-current/2007-October/078937.html) Tested by: dhw MFP4 after: 3 days Affected files ... .. //depot/projects/wifi/sys/dev/an/if_an.c#19 edit Differences ... ==== //depot/projects/wifi/sys/dev/an/if_an.c#19 (text+ko) ==== @@ -1151,6 +1151,12 @@ sc = xsc; AN_LOCK(sc); + + if (sc->an_gone) { + AN_UNLOCK(sc); + return; + } + ifp = sc->an_ifp; sc->an_status.an_type = AN_RID_STATUS; From owner-p4-projects@FreeBSD.ORG Tue Oct 30 18:39:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E51F716A46C; Tue, 30 Oct 2007 18:39:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C4A416A418 for ; Tue, 30 Oct 2007 18:39:52 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B9EC13C48D for ; Tue, 30 Oct 2007 18:39:52 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UIdqRq016178 for ; Tue, 30 Oct 2007 18:39:52 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UIdE0I016166 for perforce@freebsd.org; Tue, 30 Oct 2007 18:39:14 GMT (envelope-from delphij@freebsd.org) Date: Tue, 30 Oct 2007 18:39:14 GMT Message-Id: <200710301839.l9UIdE0I016166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 128352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 18:39:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=128352 Change 128352 by delphij@charlie on 2007/10/30 18:39:13 IFC Affected files ... .. //depot/projects/delphij_fork/Makefile#3 integrate .. //depot/projects/delphij_fork/Makefile.inc1#5 integrate .. //depot/projects/delphij_fork/ObsoleteFiles.inc#11 integrate .. //depot/projects/delphij_fork/UPDATING#5 integrate .. //depot/projects/delphij_fork/bin/ps/extern.h#2 integrate .. //depot/projects/delphij_fork/bin/ps/keyword.c#2 integrate .. //depot/projects/delphij_fork/bin/ps/print.c#3 integrate .. //depot/projects/delphij_fork/bin/ps/ps.c#3 integrate .. //depot/projects/delphij_fork/cddl/lib/Makefile#3 integrate .. //depot/projects/delphij_fork/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/delphij_fork/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/l4check/l4check.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/lib/printstate.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/in1#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/input/f11#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/regress/in1#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/delphij_fork/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/delphij_fork/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/delphij_fork/contrib/less/NEWS#3 integrate .. //depot/projects/delphij_fork/contrib/less/README#3 integrate .. //depot/projects/delphij_fork/contrib/less/charset.c#3 integrate .. //depot/projects/delphij_fork/contrib/less/less.man#3 integrate .. //depot/projects/delphij_fork/contrib/less/less.nro#3 integrate .. //depot/projects/delphij_fork/contrib/less/lessecho.man#3 integrate .. //depot/projects/delphij_fork/contrib/less/lessecho.nro#3 integrate .. //depot/projects/delphij_fork/contrib/less/lesskey.man#3 integrate .. //depot/projects/delphij_fork/contrib/less/lesskey.nro#3 integrate .. //depot/projects/delphij_fork/contrib/less/version.c#3 integrate .. //depot/projects/delphij_fork/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/FILES#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/INSTALL#2 delete .. //depot/projects/delphij_fork/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/README.dag#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/TODO#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/VERSION#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/configure#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/configure.in#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/inet.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/delphij_fork/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/delphij_fork/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/pf.h#2 delete .. //depot/projects/delphij_fork/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/delphij_fork/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/delphij_fork/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/delphij_fork/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/delphij_fork/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/delphij_fork/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/delphij_fork/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/VERSION#3 integrate .. //depot/projects/delphij_fork/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/delphij_fork/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/configure#3 integrate .. //depot/projects/delphij_fork/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/delphij_fork/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/delphij_fork/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/delphij_fork/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/FILES#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/README#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/af.c#1 branch .. //depot/projects/delphij_fork/contrib/tcpdump/af.h#1 branch .. //depot/projects/delphij_fork/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/configure#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/pf.h#2 delete .. //depot/projects/delphij_fork/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/delphij_fork/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/delphij_fork/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/delphij_fork/contrib/tcpdump/util.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcsh/sh.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/delphij_fork/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/delphij_fork/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/delphij_fork/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/delphij_fork/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/delphij_fork/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/delphij_fork/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/delphij_fork/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/delphij_fork/etc/Makefile#3 integrate .. //depot/projects/delphij_fork/etc/cached.conf#2 delete .. //depot/projects/delphij_fork/etc/defaults/devfs.rules#2 integrate .. //depot/projects/delphij_fork/etc/defaults/rc.conf#5 integrate .. //depot/projects/delphij_fork/etc/nscd.conf#1 branch .. //depot/projects/delphij_fork/etc/rc.d/Makefile#4 integrate .. //depot/projects/delphij_fork/etc/rc.d/amd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/early.sh#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/kerberos#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/named#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/nfslocking#3 delete .. //depot/projects/delphij_fork/etc/rc.d/ppp#2 integrate .. //depot/projects/delphij_fork/etc/rc.subr#2 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/delphij_fork/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/delphij_fork/gnu/lib/libobjc/Makefile#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/delphij_fork/include/_ctype.h#2 integrate .. //depot/projects/delphij_fork/include/ctype.h#2 integrate .. //depot/projects/delphij_fork/include/pthread.h#2 integrate .. //depot/projects/delphij_fork/include/pthread_np.h#2 integrate .. //depot/projects/delphij_fork/include/wctype.h#2 integrate .. //depot/projects/delphij_fork/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/Makefile#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/delphij_fork/lib/libbsm/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libc/arm/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/delphij_fork/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/delphij_fork/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/delphij_fork/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/big5.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/euc.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/gb2312.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/none.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/net/ethers.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/net/nscache.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/powerpc/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/minherit.2#3 integrate .. //depot/projects/delphij_fork/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/delphij_fork/lib/libelf/elf.3#2 integrate .. //depot/projects/delphij_fork/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/delphij_fork/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/delphij_fork/lib/libelf/elf_update.3#3 integrate .. //depot/projects/delphij_fork/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/delphij_fork/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/delphij_fork/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/delphij_fork/lib/libkse/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/enter_uts.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/arm/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/arm/arm/context.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/i386/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/thr_enter_uts.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/thr_getcontext.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/context.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/enter_uts.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/assym.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/assym.s#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/context.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/enter_uts.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/assym.s#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/pthread_md.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#2 integrate .. //depot/projects/delphij_fork/lib/libkse/kse.map#1 branch .. //depot/projects/delphij_fork/lib/libkse/pthread.map#2 delete .. //depot/projects/delphij_fork/lib/libkse/support/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/support/thr_support.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/sys/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/sys/lock.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/README#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/guard_b.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/guard_b.exp#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/guard_s.pl#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/hello_b.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/hello_d.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/hello_d.exp#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/hello_s.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/join_leak_d.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/join_leak_d.exp#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/mutex_d.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/mutex_d.exp#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/propagate_s.pl#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/sem_d.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/sem_d.exp#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/sigsuspend_d.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/sigsuspend_d.exp#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/sigwait_d.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/sigwait_d.exp#2 integrate .. //depot/projects/delphij_fork/lib/libkse/test/verify#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_autoinit.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_getprio.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_kern.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_printf.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_rtld.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sem.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/delphij_fork/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/delphij_fork/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/delphij_fork/lib/libpam/modules/pam_unix/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libpcap/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libpcap/config.h#2 integrate .. //depot/projects/delphij_fork/lib/libpthread/Makefile#3 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/amd64/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/amd64/amd64/context.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/amd64/include/atomic_ops.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/amd64/include/pthread_md.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/arm/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/arm/arm/context.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/arm/arm/pthread_md.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/arm/include/atomic_ops.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/arm/include/pthread_md.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/i386/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/i386/i386/pthread_md.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/i386/include/atomic_ops.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/i386/include/pthread_md.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/ia64/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/ia64/ia64/context.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/ia64/include/pthread_md.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/powerpc/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/powerpc/include/pthread_md.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/sparc64/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/sparc64/include/pthread_md.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete .. //depot/projects/delphij_fork/lib/libpthread/pthread.map#2 delete .. //depot/projects/delphij_fork/lib/libpthread/support/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/support/thr_support.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/sys/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/sys/lock.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/sys/lock.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/sys/thr_error.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/Makefile#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/README#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/guard_b.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/guard_b.exp#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/guard_s.pl#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/hello_b.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/hello_d.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/hello_d.exp#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/hello_s.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/join_leak_d.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/join_leak_d.exp#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/mutex_d.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/mutex_d.exp#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/propagate_s.pl#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/sem_d.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/sem_d.exp#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/sigsuspend_d.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/sigwait_d.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/sigwait_d.exp#2 delete .. //depot/projects/delphij_fork/lib/libpthread/test/verify#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/Makefile.inc#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_accept.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_aio_suspend.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_atfork.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_destroy.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_get_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getdetachstate.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getguardsize.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getinheritsched.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getschedparam.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getscope.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getstack.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getstackaddr.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_getstacksize.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_init.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setdetachstate.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setguardsize.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setinheritsched.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setschedparam.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setscope.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setstack.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setstackaddr.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_attr_setstacksize.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_autoinit.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_barrier.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_barrierattr.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_cancel.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_clean.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_close.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_concurrency.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_cond.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_condattr_destroy.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_condattr_init.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_condattr_pshared.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_connect.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_creat.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_create.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_detach.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_equal.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_execve.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_exit.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_fcntl.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_find_thread.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_fork.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_fsync.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_getprio.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_getschedparam.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_info.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_init.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_join.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_kern.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_kill.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_main_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_mattr_init.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_mattr_kind_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_mattr_pshared.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_msync.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_multi_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_mutex.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_mutex_prioceiling.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_mutex_protocol.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_mutexattr_destroy.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_nanosleep.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_once.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_open.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_pause.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_poll.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_printf.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_priority_queue.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_private.h#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_pselect.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_pspinlock.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_raise.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_read.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_readv.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_resume_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_rtld.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_rwlock.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_rwlockattr.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_select.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_self.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sem.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_seterrno.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_setprio.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_setschedparam.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sig.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sigaction.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sigaltstack.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sigmask.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sigpending.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sigprocmask.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sigsuspend.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sigwait.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_single_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_sleep.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_spec.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_spinlock.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_stack.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_suspend_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_switch_np.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_symbols.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_system.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_tcdrain.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_vfork.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_wait.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_wait4.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_waitpid.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_write.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_writev.c#2 delete .. //depot/projects/delphij_fork/lib/libpthread/thread/thr_yield.c#2 delete .. //depot/projects/delphij_fork/lib/libstand/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libstand/tftp.c#2 integrate .. //depot/projects/delphij_fork/lib/libthr/Makefile#3 integrate .. //depot/projects/delphij_fork/lib/libthr/libthr.3#2 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/delphij_fork/lib/libutil/pidfile.3#2 integrate .. //depot/projects/delphij_fork/lib/libutil/pidfile.c#3 integrate .. //depot/projects/delphij_fork/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/delphij_fork/libexec/rtld-elf/sparc64/reloc.c#3 integrate .. //depot/projects/delphij_fork/release/Makefile#4 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/delphij_fork/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/delphij_fork/rescue/rescue/Makefile#3 integrate .. //depot/projects/delphij_fork/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/delphij_fork/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/delphij_fork/sbin/ggate/Makefile#3 integrate .. //depot/projects/delphij_fork/sbin/gpt/Makefile#2 integrate .. //depot/projects/delphij_fork/sbin/gpt/add.c#2 integrate .. //depot/projects/delphij_fork/sbin/gpt/boot.c#1 branch .. //depot/projects/delphij_fork/sbin/gpt/gpt.8#2 integrate .. //depot/projects/delphij_fork/sbin/gpt/gpt.c#2 integrate .. //depot/projects/delphij_fork/sbin/gpt/gpt.h#2 integrate .. //depot/projects/delphij_fork/sbin/gpt/show.c#2 integrate .. //depot/projects/delphij_fork/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/delphij_fork/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/delphij_fork/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/delphij_fork/sbin/mount/mount.8#2 integrate .. //depot/projects/delphij_fork/sbin/mount_unionfs/mount_unionfs.8#2 integrate .. //depot/projects/delphij_fork/sbin/route/route.c#2 integrate .. //depot/projects/delphij_fork/sbin/sysctl/sysctl.8#3 integrate .. //depot/projects/delphij_fork/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/delphij_fork/share/examples/cvsup/stable-supfile#3 integrate .. //depot/projects/delphij_fork/share/man/man3/Makefile#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_barrier_destroy.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_barrierattr.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_detach.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_exit.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_once.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_spin_init.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_spin_lock.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_switch_add_np.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_testcancel.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/pthread_yield.3#2 integrate .. //depot/projects/delphij_fork/share/man/man4/Makefile#6 integrate .. //depot/projects/delphij_fork/share/man/man4/coretemp.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/mac.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/md.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/nxge.4#2 integrate .. //depot/projects/delphij_fork/share/man/man5/fstab.5#2 integrate .. //depot/projects/delphij_fork/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/delphij_fork/share/man/man5/quota.user.5#2 integrate .. //depot/projects/delphij_fork/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/delphij_fork/share/man/man5/src.conf.5#4 integrate .. //depot/projects/delphij_fork/share/man/man7/Makefile#2 integrate .. //depot/projects/delphij_fork/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/delphij_fork/share/man/man9/Makefile#3 integrate .. //depot/projects/delphij_fork/share/man/man9/kproc.9#1 branch .. //depot/projects/delphij_fork/share/man/man9/kthread.9#2 integrate .. //depot/projects/delphij_fork/share/man/man9/uio.9#2 integrate .. //depot/projects/delphij_fork/share/misc/committers-doc.dot#3 integrate .. //depot/projects/delphij_fork/share/misc/committers-src.dot#3 integrate .. //depot/projects/delphij_fork/share/misc/pci_vendors#2 integrate .. //depot/projects/delphij_fork/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/delphij_fork/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/delphij_fork/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/delphij_fork/share/mk/bsd.own.mk#2 integrate .. //depot/projects/delphij_fork/share/mk/bsd.symver.mk#2 integrate .. //depot/projects/delphij_fork/share/mk/sys.mk#3 integrate .. //depot/projects/delphij_fork/share/mk/version_gen.awk#3 integrate .. //depot/projects/delphij_fork/share/mklocale/UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/termcap/termcap.src#2 integrate .. //depot/projects/delphij_fork/share/zoneinfo/Makefile#2 integrate .. //depot/projects/delphij_fork/share/zoneinfo/africa#3 integrate .. //depot/projects/delphij_fork/share/zoneinfo/asia#2 integrate .. //depot/projects/delphij_fork/share/zoneinfo/southamerica#2 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/delphij_fork/sys/amd64/include/clock.h#2 integrate .. //depot/projects/delphij_fork/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/delphij_fork/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/delphij_fork/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/delphij_fork/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/delphij_fork/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/delphij_fork/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/delphij_fork/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/delphij_fork/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/delphij_fork/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/delphij_fork/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/delphij_fork/sys/arm/arm/support.S#2 integrate .. //depot/projects/delphij_fork/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/delphij_fork/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/delphij_fork/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/delphij_fork/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/delphij_fork/sys/arm/at91/ohci_atmelarm.c#3 integrate .. //depot/projects/delphij_fork/sys/arm/at91/std.at91#2 integrate .. //depot/projects/delphij_fork/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/delphij_fork/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/include/armreg.h#3 integrate .. //depot/projects/delphij_fork/sys/arm/include/asm.h#2 integrate .. //depot/projects/delphij_fork/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/delphij_fork/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/delphij_fork/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/delphij_fork/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/delphij_fork/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/delphij_fork/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/delphij_fork/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/delphij_fork/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/delphij_fork/sys/bsm/audit.h#3 integrate .. //depot/projects/delphij_fork/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/delphij_fork/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/delphij_fork/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/delphij_fork/sys/conf/files#9 integrate .. //depot/projects/delphij_fork/sys/conf/files.amd64#4 integrate .. //depot/projects/delphij_fork/sys/conf/files.arm#2 integrate .. //depot/projects/delphij_fork/sys/conf/files.i386#4 integrate .. //depot/projects/delphij_fork/sys/conf/files.ia64#2 integrate .. //depot/projects/delphij_fork/sys/conf/files.pc98#2 integrate .. //depot/projects/delphij_fork/sys/conf/files.powerpc#2 integrate .. //depot/projects/delphij_fork/sys/conf/files.sun4v#2 integrate .. //depot/projects/delphij_fork/sys/conf/newvers.sh#2 integrate .. //depot/projects/delphij_fork/sys/conf/options.arm#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/delphij_fork/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_examine.c#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_ps.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/aac/aac.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/md/md.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mii/miidevs#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 30 18:48:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F65516A469; Tue, 30 Oct 2007 18:48:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E326F16A420 for ; Tue, 30 Oct 2007 18:48:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D548113C48A for ; Tue, 30 Oct 2007 18:48:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UIm1Kj016675 for ; Tue, 30 Oct 2007 18:48:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UIm1k4016672 for perforce@freebsd.org; Tue, 30 Oct 2007 18:48:01 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 18:48:01 GMT Message-Id: <200710301848.l9UIm1k4016672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 18:48:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=128354 Change 128354 by kmacy@kmacy_home:ethng on 2007/10/30 18:47:48 add INFINIBAND ARPHDR Affected files ... .. //depot/projects/ethng/src/sys/net/if_arp.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/net/if_arp.h#2 (text+ko) ==== @@ -44,12 +44,14 @@ * specified. Field names used correspond to RFC 826. */ struct arphdr { - u_short ar_hrd; /* format of hardware address */ -#define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* token-ring hardware format */ -#define ARPHRD_ARCNET 7 /* arcnet hardware format */ -#define ARPHRD_FRELAY 15 /* frame relay hardware format */ -#define ARPHRD_IEEE1394 24 /* firewire hardware format */ + u_short ar_hrd; /* format of hardware address */ +#define ARPHRD_ETHER 1 /* ethernet hardware format */ +#define ARPHRD_IEEE802 6 /* token-ring hardware format */ +#define ARPHRD_ARCNET 7 /* arcnet hardware format */ +#define ARPHRD_FRELAY 15 /* frame relay hardware format */ +#define ARPHRD_IEEE1394 24 /* firewire hardware format */ +#define ARPHRD_INFINIBAND 32 /* InfiniBand */ + u_short ar_pro; /* format of protocol address */ u_char ar_hln; /* length of hardware address */ u_char ar_pln; /* length of protocol address */ From owner-p4-projects@FreeBSD.ORG Tue Oct 30 18:51:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3D9016A41B; Tue, 30 Oct 2007 18:51:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B16116A46E for ; Tue, 30 Oct 2007 18:51:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CB1513C4BE for ; Tue, 30 Oct 2007 18:51:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UIp5Bs016995 for ; Tue, 30 Oct 2007 18:51:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UIp51d016992 for perforce@freebsd.org; Tue, 30 Oct 2007 18:51:05 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 18:51:05 GMT Message-Id: <200710301851.l9UIp51d016992@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 18:51:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=128356 Change 128356 by kmacy@kmacy_home:ethng on 2007/10/30 18:50:07 add no-op defines for MODULE macros Affected files ... .. //depot/projects/ethng/src/sys/sys/linux_compat.h#7 edit Differences ... ==== //depot/projects/ethng/src/sys/sys/linux_compat.h#7 (text+ko) ==== @@ -66,6 +66,8 @@ { caddr_t tmp = m->m_data; + panic("FIXME"); + m->m_data += len; m->m_len += len; @@ -148,4 +150,9 @@ #define IS_ERR(ptr) ((unsigned long)(ptr) > (unsigned long)(-1000)) #define PTR_ERR(ptr) ((long)(ptr)) +#define MODULE_AUTHOR(x) +#define MODULE_DESCRIPTION(x) +#define MODULE_LICENSE(x) +#define EXPORT_SYMBOL(x) + #endif From owner-p4-projects@FreeBSD.ORG Tue Oct 30 18:52:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20DE516A46B; Tue, 30 Oct 2007 18:52:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA4CF16A417 for ; Tue, 30 Oct 2007 18:52:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A30B513C4C2 for ; Tue, 30 Oct 2007 18:52:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UIq6FE017130 for ; Tue, 30 Oct 2007 18:52:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UIq6IU017127 for perforce@freebsd.org; Tue, 30 Oct 2007 18:52:06 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 18:52:06 GMT Message-Id: <200710301852.l9UIq6IU017127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 18:52:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=128357 Change 128357 by kmacy@kmacy_home:ethng on 2007/10/30 18:52:00 switch to kproc calls Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#27 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#27 (text+ko) ==== @@ -629,7 +629,7 @@ t3_free_qset(qs->port->adapter, qs); qs->qs_flags &= ~QS_RUNNING; - kthread_exit(0); + kproc_exit(0); } static int @@ -666,7 +666,7 @@ qs->qs_cpuid = ((pi->first_qset + j) % mp_ncpus); device_printf(sc->dev, "starting thread for %d\n", qs->qs_cpuid); - kthread_create(cxgb_pcpu_start_proc, qs, &p, + kproc_create(cxgb_pcpu_start_proc, qs, &p, RFNOWAIT, 0, "cxgbsp"); DELAY(200); } From owner-p4-projects@FreeBSD.ORG Tue Oct 30 18:55:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1DE516A468; Tue, 30 Oct 2007 18:55:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38F1716A41B for ; Tue, 30 Oct 2007 18:55:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1277A13C48A for ; Tue, 30 Oct 2007 18:55:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UIt9j4017260 for ; Tue, 30 Oct 2007 18:55:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UIt9Dg017257 for perforce@freebsd.org; Tue, 30 Oct 2007 18:55:09 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 18:55:09 GMT Message-Id: <200710301855.l9UIt9Dg017257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 18:55:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=128358 Change 128358 by kmacy@kmacy:storage:toestack on 2007/10/30 18:54:42 commit Makefile for tom Affected files ... .. //depot/projects/toestack/sys/modules/cxgb/tom/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Oct 30 18:59:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B48E16A421; Tue, 30 Oct 2007 18:59:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D677616A418 for ; Tue, 30 Oct 2007 18:59:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B558513C4C8 for ; Tue, 30 Oct 2007 18:59:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UIxEO4017387 for ; Tue, 30 Oct 2007 18:59:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UIxERi017384 for perforce@freebsd.org; Tue, 30 Oct 2007 18:59:14 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 18:59:14 GMT Message-Id: <200710301859.l9UIxERi017384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 18:59:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=128359 Change 128359 by kmacy@kmacy_home:ethng on 2007/10/30 18:59:01 initial import of core support for in-kernel iwarp Affected files ... .. //depot/projects/ethng/src/sys/contrib/rdma/ib_addr.h#2 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#3 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#3 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#6 edit .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_addr.c#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_cma.c#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_device.c#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_iwcm.c#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_verbs.c#1 add .. //depot/projects/ethng/src/sys/modules/Makefile#7 edit .. //depot/projects/ethng/src/sys/modules/rdma/Makefile#1 add Differences ... ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_addr.h#2 (text+ko) ==== @@ -30,15 +30,11 @@ #if !defined(IB_ADDR_H) #define IB_ADDR_H -#include -#include -#include -#include -#include +#include struct rdma_addr_client { atomic_t refcount; - struct completion comp; + struct cv comp; }; /** ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#3 (text+ko) ==== @@ -326,10 +326,10 @@ * * If the join operation fails; status will be non-zero, with the following * failures possible: - * -ETIMEDOUT: The request timed out. - * -EIO: An error occurred sending the query. - * -EINVAL: The MCMemberRecord values differed from the existing group's. - * -ENETRESET: Indicates that an fatal error has occurred on the multicast + * ETIMEDOUT: The request timed out. + * EIO: An error occurred sending the query. + * EINVAL: The MCMemberRecord values differed from the existing group's. + * ENETRESET: Indicates that an fatal error has occurred on the multicast * group, and the user must rejoin the group to continue using it. */ struct ib_sa_multicast *ib_sa_join_multicast(struct ib_sa_client *client, ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#3 (text+ko) ==== @@ -74,7 +74,7 @@ static inline struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, size_t size, int access) { - return ERR_PTR(-EINVAL); + return ERR_PTR(EINVAL); } static inline void ib_umem_release(struct ib_umem *umem) { } static inline int ib_umem_page_count(struct ib_umem *umem) { return 0; } ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#6 (text+ko) ==== @@ -1072,12 +1072,12 @@ static inline int ib_copy_from_udata(void *dest, struct ib_udata *udata, size_t len) { - return copyin(udata->inbuf, dest, len) ? -EFAULT : 0; + return copyin(udata->inbuf, dest, len); } static inline int ib_copy_to_udata(struct ib_udata *udata, void *src, size_t len) { - return copyout(src, udata->outbuf, len) ? -EFAULT : 0; + return copyout(src, udata->outbuf, len); } /** @@ -1452,7 +1452,7 @@ { return cq->device->req_ncomp_notif ? cq->device->req_ncomp_notif(cq, wc_cnt) : - -ENOSYS; + ENOSYS; } /** @@ -1766,7 +1766,7 @@ /* XXX reference counting in corresponding MR? */ return mw->device->bind_mw ? mw->device->bind_mw(qp, mw, mw_bind) : - -ENOSYS; + ENOSYS; } /** ==== //depot/projects/ethng/src/sys/modules/Makefile#7 (text+ko) ==== @@ -216,6 +216,7 @@ ${_ray} \ rc \ rc4 \ + rdma \ re \ reiserfs \ rl \ From owner-p4-projects@FreeBSD.ORG Tue Oct 30 19:03:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C771D16A47E; Tue, 30 Oct 2007 19:03:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6664016A46B for ; Tue, 30 Oct 2007 19:03:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56B7C13C4B7 for ; Tue, 30 Oct 2007 19:03:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UJ3JRt018909 for ; Tue, 30 Oct 2007 19:03:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UJ3IW3018906 for perforce@freebsd.org; Tue, 30 Oct 2007 19:03:18 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 19:03:18 GMT Message-Id: <200710301903.l9UJ3IW3018906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 19:03:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=128360 Change 128360 by kmacy@kmacy:storage:toestack on 2007/10/30 19:02:59 IFethng #128359 Affected files ... .. //depot/projects/toestack/sys/contrib/rdma/ib_addr.h#2 integrate .. //depot/projects/toestack/sys/contrib/rdma/ib_sa.h#2 integrate .. //depot/projects/toestack/sys/contrib/rdma/ib_umem.h#3 integrate .. //depot/projects/toestack/sys/contrib/rdma/ib_verbs.h#3 integrate .. //depot/projects/toestack/sys/contrib/rdma/rdma_addr.c#1 branch .. //depot/projects/toestack/sys/contrib/rdma/rdma_cma.c#1 branch .. //depot/projects/toestack/sys/contrib/rdma/rdma_device.c#1 branch .. //depot/projects/toestack/sys/contrib/rdma/rdma_iwcm.c#1 branch .. //depot/projects/toestack/sys/contrib/rdma/rdma_verbs.c#1 branch .. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#8 integrate .. //depot/projects/toestack/sys/modules/Makefile#6 integrate .. //depot/projects/toestack/sys/modules/rdma/Makefile#1 branch .. //depot/projects/toestack/sys/net/if_arp.h#4 integrate .. //depot/projects/toestack/sys/sys/linux_compat.h#3 integrate Differences ... ==== //depot/projects/toestack/sys/contrib/rdma/ib_addr.h#2 (text+ko) ==== @@ -30,15 +30,11 @@ #if !defined(IB_ADDR_H) #define IB_ADDR_H -#include -#include -#include -#include -#include +#include struct rdma_addr_client { atomic_t refcount; - struct completion comp; + struct cv comp; }; /** ==== //depot/projects/toestack/sys/contrib/rdma/ib_sa.h#2 (text+ko) ==== @@ -326,10 +326,10 @@ * * If the join operation fails; status will be non-zero, with the following * failures possible: - * -ETIMEDOUT: The request timed out. - * -EIO: An error occurred sending the query. - * -EINVAL: The MCMemberRecord values differed from the existing group's. - * -ENETRESET: Indicates that an fatal error has occurred on the multicast + * ETIMEDOUT: The request timed out. + * EIO: An error occurred sending the query. + * EINVAL: The MCMemberRecord values differed from the existing group's. + * ENETRESET: Indicates that an fatal error has occurred on the multicast * group, and the user must rejoin the group to continue using it. */ struct ib_sa_multicast *ib_sa_join_multicast(struct ib_sa_client *client, ==== //depot/projects/toestack/sys/contrib/rdma/ib_umem.h#3 (text+ko) ==== @@ -74,7 +74,7 @@ static inline struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, size_t size, int access) { - return ERR_PTR(-EINVAL); + return ERR_PTR(EINVAL); } static inline void ib_umem_release(struct ib_umem *umem) { } static inline int ib_umem_page_count(struct ib_umem *umem) { return 0; } ==== //depot/projects/toestack/sys/contrib/rdma/ib_verbs.h#3 (text+ko) ==== @@ -1072,12 +1072,12 @@ static inline int ib_copy_from_udata(void *dest, struct ib_udata *udata, size_t len) { - return copyin(udata->inbuf, dest, len) ? -EFAULT : 0; + return copyin(udata->inbuf, dest, len); } static inline int ib_copy_to_udata(struct ib_udata *udata, void *src, size_t len) { - return copyout(src, udata->outbuf, len) ? -EFAULT : 0; + return copyout(src, udata->outbuf, len); } /** @@ -1452,7 +1452,7 @@ { return cq->device->req_ncomp_notif ? cq->device->req_ncomp_notif(cq, wc_cnt) : - -ENOSYS; + ENOSYS; } /** @@ -1766,7 +1766,7 @@ /* XXX reference counting in corresponding MR? */ return mw->device->bind_mw ? mw->device->bind_mw(qp, mw, mw_bind) : - -ENOSYS; + ENOSYS; } /** ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#8 (text+ko) ==== ==== //depot/projects/toestack/sys/modules/Makefile#6 (text+ko) ==== @@ -216,6 +216,7 @@ ${_ray} \ rc \ rc4 \ + rdma \ re \ reiserfs \ rl \ ==== //depot/projects/toestack/sys/net/if_arp.h#4 (text+ko) ==== @@ -44,12 +44,14 @@ * specified. Field names used correspond to RFC 826. */ struct arphdr { - u_short ar_hrd; /* format of hardware address */ -#define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* token-ring hardware format */ -#define ARPHRD_ARCNET 7 /* arcnet hardware format */ -#define ARPHRD_FRELAY 15 /* frame relay hardware format */ -#define ARPHRD_IEEE1394 24 /* firewire hardware format */ + u_short ar_hrd; /* format of hardware address */ +#define ARPHRD_ETHER 1 /* ethernet hardware format */ +#define ARPHRD_IEEE802 6 /* token-ring hardware format */ +#define ARPHRD_ARCNET 7 /* arcnet hardware format */ +#define ARPHRD_FRELAY 15 /* frame relay hardware format */ +#define ARPHRD_IEEE1394 24 /* firewire hardware format */ +#define ARPHRD_INFINIBAND 32 /* InfiniBand */ + u_short ar_pro; /* format of protocol address */ u_char ar_hln; /* length of hardware address */ u_char ar_pln; /* length of protocol address */ ==== //depot/projects/toestack/sys/sys/linux_compat.h#3 (text+ko) ==== @@ -66,6 +66,8 @@ { caddr_t tmp = m->m_data; + panic("FIXME"); + m->m_data += len; m->m_len += len; @@ -148,4 +150,9 @@ #define IS_ERR(ptr) ((unsigned long)(ptr) > (unsigned long)(-1000)) #define PTR_ERR(ptr) ((long)(ptr)) +#define MODULE_AUTHOR(x) +#define MODULE_DESCRIPTION(x) +#define MODULE_LICENSE(x) +#define EXPORT_SYMBOL(x) + #endif From owner-p4-projects@FreeBSD.ORG Tue Oct 30 19:05:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E5DE16A46C; Tue, 30 Oct 2007 19:05:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFC1116A417 for ; Tue, 30 Oct 2007 19:05:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E18D413C4B7 for ; Tue, 30 Oct 2007 19:05:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UJ5LMS019015 for ; Tue, 30 Oct 2007 19:05:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UJ5LVg019012 for perforce@freebsd.org; Tue, 30 Oct 2007 19:05:21 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 19:05:21 GMT Message-Id: <200710301905.l9UJ5LVg019012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 19:05:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=128361 Change 128361 by kmacy@kmacy:storage:toestack on 2007/10/30 19:04:26 remove some dead (kprobes) code and add debug prints Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#5 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#6 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#5 (text+ko) ==== @@ -197,7 +197,8 @@ } arpq_enqueue(e, m); mtx_unlock(&e->lock); - + printf("enqueueing arp request\n"); + if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return (ENOMEM); /* @@ -208,6 +209,7 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ + printf("doing arpresolve\n"); if (arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)) == 0) { mtx_lock(&e->lock); @@ -216,7 +218,9 @@ else m_freem(m); mtx_unlock(&e->lock); - } + } else + printf("arpresolve returned non-zero\n"); + } return 0; } @@ -379,6 +383,8 @@ /* Need to allocate a new entry */ e = alloc_l2e(d); if (e) { + printf("initializing new entry\n"); + mtx_lock(&e->lock); /* avoid race with t3_l2t_free */ e->next = d->l2tab[hash].first; d->l2tab[hash].first = e; @@ -433,11 +439,6 @@ } -#if defined(NETEVENT) || !defined(CONFIG_CHELSIO_T3_MODULE) -/* - * Called when the host's ARP layer makes a change to some entry that is - * loaded into the HW L2 table. - */ void t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh) { @@ -484,71 +485,6 @@ if (arpq) handle_failed_resolution(dev, arpq); } -#else -/* - * Called from a kprobe, interrupts are off. - */ -void -t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh) -{ - struct l2t_entry *e; - struct l2t_data *d = L2DATA(dev); - u32 addr = *(u32 *) rt_key(neigh); - int ifidx = neigh->dev->ifindex; - int hash = arp_hash(addr, ifidx, d); - - rw_rlock(&d->lock); - for (e = d->l2tab[hash].first; e; e = e->next) - if (e->addr == addr && e->ifindex == ifidx) { - mtx_lock(&e->lock); - if (atomic_load_acq_int(&e->refcnt)) { - if (neigh != e->neigh) - neigh_replace(e, neigh); - e->tdev = dev; - mod_timer(&e->update_timer, jiffies + 1); - } - mtx_unlock(&e->lock); - break; - } - rw_runlock(&d->lock); -} - -static void -update_timer_cb(unsigned long data) -{ - struct mbuf *arpq = NULL; - struct l2t_entry *e = (struct l2t_entry *)data; - struct rtentry *neigh = e->neigh; - struct t3cdev *dev = e->tdev; - - barrier(); - if (!atomic_load_acq_int(&e->refcnt)) - return; - - rw_rlock(&neigh->lock); - mtx_lock(&e->lock); - - if (atomic_load_acq_int(&e->refcnt)) { - if (e->state == L2T_STATE_RESOLVING) { - if (neigh->nud_state & NUD_FAILED) { - arpq = e->arpq_head; - e->arpq_head = e->arpq_tail = NULL; - } else if (neigh_is_connected(neigh) && e->arpq_head) - setup_l2e_send_pending(dev, NULL, e); - } else { - e->state = neigh_is_connected(neigh) ? - L2T_STATE_VALID : L2T_STATE_STALE; - if (memcmp(e->dmac, RT_ENADDR(neigh), sizeof(e->dmac))) - setup_l2e_send_pending(dev, NULL, e); - } - } - mtx_unlock(&e->lock); - rw_runlock(&neigh->lock); - - if (arpq) - handle_failed_resolution(dev, arpq); -} -#endif struct l2t_data * t3_init_l2t(unsigned int l2t_capacity) ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#6 (text+ko) ==== @@ -148,8 +148,13 @@ static inline int l2t_send(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { - if (__predict_true(e->state == L2T_STATE_VALID)) + if (__predict_true(e->state == L2T_STATE_VALID)) { + printf ("l2t_entry state is valid\n"); + return cxgb_ofld_send(dev, (struct mbuf *)m); + } + printf("send slow\n"); + return t3_l2t_send_slow(dev, (struct mbuf *)m, e); } From owner-p4-projects@FreeBSD.ORG Tue Oct 30 19:06:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BDFD16A468; Tue, 30 Oct 2007 19:06:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4041716A420 for ; Tue, 30 Oct 2007 19:06:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31BA113C494 for ; Tue, 30 Oct 2007 19:06:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UJ6NYA019061 for ; Tue, 30 Oct 2007 19:06:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UJ6NFu019058 for perforce@freebsd.org; Tue, 30 Oct 2007 19:06:23 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 19:06:23 GMT Message-Id: <200710301906.l9UJ6NFu019058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 19:06:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=128362 Change 128362 by kmacy@kmacy:storage:toestack on 2007/10/30 19:05:34 - fix null deref - fix error code return - add debug prints Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 (text+ko) ==== @@ -168,8 +168,24 @@ { unsigned int idx; struct tcpcb *tp = sototcpcb(so); - struct tom_data *d = TOM_DATA(TOE_DEV(so)); - const struct t3c_data *td = T3C_DATA(d->cdev); + struct tom_data *d; + const struct t3c_data *td; + struct toedev *toed; + + printf("getting toedev\n"); + + toed = TOE_DEV(so); + printf("toedev=%p\n", toed); + + printf("getting tom_data\n"); + d = TOM_DATA(toed); + printf("tom_data=%p\n", d); + if (d == NULL) + panic("tom_data not set"); + + printf("d->cdev=%p\n", d->cdev); + td = T3C_DATA(d->cdev); + #ifdef notyet struct rtentry *dst = sotoinpcb(so)->inp_route.ro_rt; #endif @@ -258,25 +274,33 @@ if (toep == NULL) return (ENOMEM); + printf("initializing offload socket\n"); + toepcb_init(toep); toepcb_hold(toep); tp->t_toe = toep; toep->tp_toedev = dev; + printf("tp->tp_toedev=%p\n", dev); + toep->tp_tid = tid; toep->tp_l2t = e; toep->tp_wr_max = toep->tp_wr_avail = TOM_TUNABLE(dev, max_wrs); toep->tp_wr_unacked = 0; toep->tp_delack_mode = 0; + toep->tp_mtu_idx = select_mss(so, dst->rt_ifp->if_mtu); + printf("mss selected\n"); + tp->rcv_wnd = select_rcv_wnd(so); + printf("rcv_wnd selected\n"); toep->tp_ulp_mode = TOM_TUNABLE(dev, ddp) && !(so->so_options & SO_NO_DDP) && tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0; toep->tp_qset_idx = 0; reset_wr_list(tp); - + printf("initialization done\n"); return (0); } @@ -401,7 +425,7 @@ struct inpcb *inp = sotoinpcb(so); struct tcpcb *tp = intotcpcb(inp); struct rtentry *dst = inp->inp_route.ro_rt; - struct toepcb *toep = tp->t_toe; + struct toepcb *toep; /* allocated by init_offload_socket */ int atid, err; @@ -418,18 +442,21 @@ if ((err = init_offload_socket(so, tdev, atid, e, dst))) return (err); - + install_offload_ops(so); mk_act_open_req(so, m, atid, e); l2t_send(d->cdev, (struct mbuf *)m, e); + + toep = tp->t_toe; if (toep->tp_ulp_mode) t3_enable_ddp(so, 0); - return 0; + + return (0); free_tid: cxgb_free_atid(d->cdev, atid); out_err: - return -1; + return (ENOMEM); } From owner-p4-projects@FreeBSD.ORG Tue Oct 30 19:07:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C303C16A46E; Tue, 30 Oct 2007 19:07:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87DDD16A417 for ; Tue, 30 Oct 2007 19:07:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 79A5113C4CE for ; Tue, 30 Oct 2007 19:07:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UJ7OPr019124 for ; Tue, 30 Oct 2007 19:07:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UJ7O9u019121 for perforce@freebsd.org; Tue, 30 Oct 2007 19:07:24 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 19:07:24 GMT Message-Id: <200710301907.l9UJ7O9u019121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 19:07:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=128363 Change 128363 by kmacy@kmacy:storage:toestack on 2007/10/30 19:06:58 - remove dead code (procfs) - add route_event handler for arp updates, pmtu changes, and redirects Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#9 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#9 (text+ko) ==== @@ -108,9 +108,14 @@ TAILQ_INSERT_TAIL(&client_list, client, client_entry); if (client->add) { + printf("client->add set\n"); + TAILQ_FOREACH(tdev, &ofld_dev_list, entry) { if (offload_activated(tdev)) client->add(tdev); + else + printf("%p not activated\n", tdev); + } } mtx_unlock(&cxgb_db_lock); @@ -818,6 +823,8 @@ } } + + static int do_set_tcb_rpl(struct t3cdev *dev, struct mbuf *m) { @@ -865,6 +872,30 @@ return (0); } +static void +route_event(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1) +{ + + switch (event) { + case RTEVENT_ARP_UPDATE: { + cxgb_neigh_update(rt0); + break; + } + case RTEVENT_REDIRECT_UPDATE: { + cxgb_redirect(rt0, rt1); + cxgb_neigh_update(rt1); + + break; + } + case RTEVENT_PMTU_UPDATE: + default: + break; + } + return 0; +} + + + #if defined(FOO) #include #include @@ -1147,9 +1178,7 @@ { int r; - critical_enter(); r = dev->send(dev, m); - critical_exit(); return r; } @@ -1577,78 +1606,4 @@ #endif } -#if 0 -static int -offload_info_read_proc(char *buf, char **start, off_t offset, - int length, int *eof, void *data) -{ - struct t3c_data *d = data; - struct tid_info *t = &d->tid_maps; - int len; - - len = sprintf(buf, "TID range: 0..%d, in use: %u\n" - "STID range: %d..%d, in use: %u\n" - "ATID range: %d..%d, in use: %u\n" - "MSS: %u\n", - t->ntids - 1, atomic_read(&t->tids_in_use), t->stid_base, - t->stid_base + t->nstids - 1, t->stids_in_use, - t->atid_base, t->atid_base + t->natids - 1, - t->atids_in_use, d->tx_max_chunk); - if (len > length) - len = length; - *eof = 1; - return len; -} - -static int -offload_info_proc_setup(struct proc_dir_entry *dir, - struct t3c_data *d) -{ - struct proc_dir_entry *p; - - if (!dir) - return (EINVAL); - - p = create_proc_read_entry("info", 0, dir, offload_info_read_proc, d); - if (!p) - return (ENOMEM); - - p->owner = THIS_MODULE; - return 0; -} - - -static int -offload_devices_read_proc(char *buf, char **start, off_t offset, - int length, int *eof, void *data) -{ - int len; - struct t3cdev *dev; - struct net_device *ndev; - - len = sprintf(buf, "Device Interfaces\n"); - - mtx_lock(&cxgb_db_lock); - TAILQ_FOREACH(dev, &ofld_dev_list, entry) { - len += sprintf(buf + len, "%-16s", dev->name); - read_lock(&dev_base_lock); - for (ndev = dev_base; ndev; ndev = ndev->next) { - if (T3CDEV(ndev) == dev) - len += sprintf(buf + len, " %s", ndev->name); - } - read_unlock(&dev_base_lock); - len += sprintf(buf + len, "\n"); - if (len >= length) - break; - } - mtx_unlock(&cxgb_db_lock); - - if (len > length) - len = length; - *eof = 1; - return len; -} - -#endif - MODULE_VERSION(if_cxgb, 1); From owner-p4-projects@FreeBSD.ORG Tue Oct 30 21:04:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27CB216A41B; Tue, 30 Oct 2007 21:04:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D618716A419 for ; Tue, 30 Oct 2007 21:04:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C77D213C48D for ; Tue, 30 Oct 2007 21:04:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UL4TMB046681 for ; Tue, 30 Oct 2007 21:04:29 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UL4TDi046678 for perforce@freebsd.org; Tue, 30 Oct 2007 21:04:29 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 21:04:29 GMT Message-Id: <200710302104.l9UL4TDi046678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 21:04:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=128366 Change 128366 by kmacy@kmacy:storage:toestack on 2007/10/30 21:03:52 register route_event handler Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#10 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#10 (text+ko) ==== @@ -873,7 +873,7 @@ } static void -route_event(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1) +cxgb_route_event(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1) { switch (event) { @@ -1586,6 +1586,9 @@ t3_register_cpl_handler(CPL_RX_DATA_DDP, do_hwtid_rpl); t3_register_cpl_handler(CPL_RX_DDP_COMPLETE, do_hwtid_rpl); t3_register_cpl_handler(CPL_ISCSI_HDR, do_hwtid_rpl); + + EVENTHANDLER_REGISTER(route_event, cxgb_route_event, NULL, EVENTHANDLER_PRI_ANY); + #if 0 if (offload_proc_init()) log(LOG_WARNING, "Unable to create /proc/net/cxgb3 dir\n"); From owner-p4-projects@FreeBSD.ORG Tue Oct 30 21:12:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A076E16A420; Tue, 30 Oct 2007 21:12:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5951A16A41B for ; Tue, 30 Oct 2007 21:12:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4988513C491 for ; Tue, 30 Oct 2007 21:12:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ULCcei047268 for ; Tue, 30 Oct 2007 21:12:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ULCcBm047265 for perforce@freebsd.org; Tue, 30 Oct 2007 21:12:38 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 21:12:38 GMT Message-Id: <200710302112.l9ULCcBm047265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 21:12:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=128367 Change 128367 by kmacy@kmacy:storage:toestack on 2007/10/30 21:12:12 remove jprobe support code Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#11 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#11 (text+ko) ==== @@ -891,229 +891,8 @@ default: break; } - return 0; -} - - - -#if defined(FOO) -#include -#include -#include -#include - -static int (*orig_arp_constructor)(struct ifnet *); - -static void -neigh_suspect(struct ifnet *neigh) -{ - struct hh_cache *hh; - - neigh->output = neigh->ops->output; - - for (hh = neigh->hh; hh; hh = hh->hh_next) - hh->hh_output = neigh->ops->output; -} - -static void -neigh_connect(struct ifnet *neigh) -{ - struct hh_cache *hh; - - neigh->output = neigh->ops->connected_output; - - for (hh = neigh->hh; hh; hh = hh->hh_next) - hh->hh_output = neigh->ops->hh_output; -} - -static inline int -neigh_max_probes(const struct neighbour *n) -{ - const struct neigh_parms *p = n->parms; - return (n->nud_state & NUD_PROBE ? - p->ucast_probes : - p->ucast_probes + p->app_probes + p->mcast_probes); } -static void -neigh_timer_handler_offload(unsigned long arg) -{ - unsigned long now, next; - struct neighbour *neigh = (struct neighbour *)arg; - unsigned state; - int notify = 0; - - write_lock(&neigh->lock); - - state = neigh->nud_state; - now = jiffies; - next = now + HZ; - - if (!(state & NUD_IN_TIMER)) { -#ifndef CONFIG_SMP - log(LOG_WARNING, "neigh: timer & !nud_in_timer\n"); -#endif - goto out; - } - - if (state & NUD_REACHABLE) { - if (time_before_eq(now, - neigh->confirmed + - neigh->parms->reachable_time)) { - next = neigh->confirmed + neigh->parms->reachable_time; - } else if (time_before_eq(now, - neigh->used + - neigh->parms->delay_probe_time)) { - neigh->nud_state = NUD_DELAY; - neigh->updated = jiffies; - neigh_suspect(neigh); - next = now + neigh->parms->delay_probe_time; - } else { - neigh->nud_state = NUD_STALE; - neigh->updated = jiffies; - neigh_suspect(neigh); - cxgb_neigh_update(neigh); - } - } else if (state & NUD_DELAY) { - if (time_before_eq(now, - neigh->confirmed + - neigh->parms->delay_probe_time)) { - neigh->nud_state = NUD_REACHABLE; - neigh->updated = jiffies; - neigh_connect(neigh); - cxgb_neigh_update(neigh); - next = neigh->confirmed + neigh->parms->reachable_time; - } else { - neigh->nud_state = NUD_PROBE; - neigh->updated = jiffies; - atomic_set_int(&neigh->probes, 0); - next = now + neigh->parms->retrans_time; - } - } else { - /* NUD_PROBE|NUD_INCOMPLETE */ - next = now + neigh->parms->retrans_time; - } - /* - * Needed for read of probes - */ - mb(); - if ((neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) && - neigh->probes >= neigh_max_probes(neigh)) { - struct mbuf *m; - - neigh->nud_state = NUD_FAILED; - neigh->updated = jiffies; - notify = 1; - cxgb_neigh_update(neigh); - NEIGH_CACHE_STAT_INC(neigh->tbl, res_failed); - - /* It is very thin place. report_unreachable is very - complicated routine. Particularly, it can hit the same - neighbour entry! - So that, we try to be accurate and avoid dead loop. --ANK - */ - while (neigh->nud_state == NUD_FAILED && - (skb = __skb_dequeue(&neigh->arp_queue)) != NULL) { - write_unlock(&neigh->lock); - neigh->ops->error_report(neigh, skb); - write_lock(&neigh->lock); - } - skb_queue_purge(&neigh->arp_queue); - } - - if (neigh->nud_state & NUD_IN_TIMER) { - if (time_before(next, jiffies + HZ/2)) - next = jiffies + HZ/2; - if (!mod_timer(&neigh->timer, next)) - neigh_hold(neigh); - } - if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) { - struct mbuf *m = skb_peek(&neigh->arp_queue); - - write_unlock(&neigh->lock); - neigh->ops->solicit(neigh, skb); - atomic_add_int(&neigh->probes, 1); - if (m) - m_free(m); - } else { -out: - write_unlock(&neigh->lock); - } - -#ifdef CONFIG_ARPD - if (notify && neigh->parms->app_probes) - neigh_app_notify(neigh); -#endif - neigh_release(neigh); -} - -static int -arp_constructor_offload(struct neighbour *neigh) -{ - if (neigh->ifp && is_offloading(neigh->ifp)) - neigh->timer.function = neigh_timer_handler_offload; - return orig_arp_constructor(neigh); -} - -/* - * This must match exactly the signature of neigh_update for jprobes to work. - * It runs from a trap handler with interrupts off so don't disable BH. - */ -static int -neigh_update_offload(struct neighbour *neigh, const u8 *lladdr, - u8 new, u32 flags) -{ - write_lock(&neigh->lock); - cxgb_neigh_update(neigh); - write_unlock(&neigh->lock); - jprobe_return(); - /* NOTREACHED */ - return 0; -} - -static struct jprobe neigh_update_jprobe = { - .entry = (kprobe_opcode_t *) neigh_update_offload, - .kp.addr = (kprobe_opcode_t *) neigh_update -}; - -#ifdef MODULE_SUPPORT -static int -prepare_arp_with_t3core(void) -{ - int err; - - err = register_jprobe(&neigh_update_jprobe); - if (err) { - log(LOG_ERR, "Could not install neigh_update jprobe, " - "error %d\n", err); - return err; - } - - orig_arp_constructor = arp_tbl.constructor; - arp_tbl.constructor = arp_constructor_offload; - - return 0; -} - -static void -restore_arp_sans_t3core(void) -{ - arp_tbl.constructor = orig_arp_constructor; - unregister_jprobe(&neigh_update_jprobe); -} - -#else /* Module suport */ -static inline int -prepare_arp_with_t3core(void) -{ - return 0; -} - -static inline void -restore_arp_sans_t3core(void) -{} -#endif -#endif /* * Process a received packet with an unknown/unexpected CPL opcode. */ From owner-p4-projects@FreeBSD.ORG Tue Oct 30 21:13:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE7FF16A41B; Tue, 30 Oct 2007 21:13:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93E4A16A476 for ; Tue, 30 Oct 2007 21:13:39 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8537B13C48E for ; Tue, 30 Oct 2007 21:13:39 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ULDd39047293 for ; Tue, 30 Oct 2007 21:13:39 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ULDda7047290 for perforce@freebsd.org; Tue, 30 Oct 2007 21:13:39 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 30 Oct 2007 21:13:39 GMT Message-Id: <200710302113.l9ULDda7047290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 128368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 21:13:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=128368 Change 128368 by zec@zec_tpx32 on 2007/10/30 21:13:05 In ng_pipe, drop a refcount to our own node on node shutdown, otherwise the node would remain a zombie invisible by "ngctl list". This was relatively benign for ng_pipe nodes living in the default vnet, but would lead to a panic on attempts to destroy a vnet with at least one such a zombie hanging in there. While here, remove an unused field in node_priv struct, and rename ngp_rmnode() -> ngp_shutdown(). Affected files ... .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#5 (text+ko) ==== @@ -96,7 +96,6 @@ /* Per node info */ struct node_priv { - node_p node; u_int64_t delay; u_int32_t overhead; u_int32_t header_offset; @@ -147,7 +146,7 @@ /* Netgraph methods */ static ng_constructor_t ngp_constructor; static ng_rcvmsg_t ngp_rcvmsg; -static ng_shutdown_t ngp_rmnode; +static ng_shutdown_t ngp_shutdown; static ng_newhook_t ngp_newhook; static ng_rcvdata_t ngp_rcvdata; static ng_disconnect_t ngp_disconnect; @@ -246,7 +245,7 @@ .name = NG_PIPE_NODE_TYPE, .mod_event = ngp_modevent, .constructor = ngp_constructor, - .shutdown = ngp_rmnode, + .shutdown = ngp_shutdown, .rcvmsg = ngp_rcvmsg, .newhook = ngp_newhook, .rcvdata = ngp_rcvdata, @@ -945,7 +944,7 @@ * a normal node would. */ static int -ngp_rmnode(node_p node) +ngp_shutdown(node_p node) { const priv_p priv = NG_NODE_PRIVATE(node); @@ -957,6 +956,7 @@ if (priv->lower.hook != NULL) ng_rmhook_self(priv->lower.hook); } + NG_NODE_UNREF(node); FREE(priv, M_NG_PIPE); return (0); } From owner-p4-projects@FreeBSD.ORG Tue Oct 30 23:16:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7B3816A421; Tue, 30 Oct 2007 23:16:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CAAB16A419 for ; Tue, 30 Oct 2007 23:16:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E10613C4A8 for ; Tue, 30 Oct 2007 23:16:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UNGsdw059741 for ; Tue, 30 Oct 2007 23:16:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UNGsXN059738 for perforce@freebsd.org; Tue, 30 Oct 2007 23:16:54 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 23:16:54 GMT Message-Id: <200710302316.l9UNGsXN059738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 23:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=128374 Change 128374 by kmacy@kmacy:storage:toestack on 2007/10/30 23:16:31 use the ifp pointer for the queue + priority Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 (text+ko) ==== @@ -353,7 +353,8 @@ struct inpcb *inp = sotoinpcb(so); struct toe_mbuf *tm = (struct toe_mbuf *)m; - tm->m_toe.priority = mkprio(CPL_PRIORITY_SETUP, so); + m_set_priority((struct mbuf *)m, mkprio(CPL_PRIORITY_SETUP, so)); + req = mtod(m, struct cpl_act_open_req *); m->m_len += sizeof(*req); From owner-p4-projects@FreeBSD.ORG Wed Oct 31 01:20:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65B6316A469; Wed, 31 Oct 2007 01:20:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10AD816A421 for ; Wed, 31 Oct 2007 01:20:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0223413C4B3 for ; Wed, 31 Oct 2007 01:20:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V1K5s9077673 for ; Wed, 31 Oct 2007 01:20:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V1K5DT077670 for perforce@freebsd.org; Wed, 31 Oct 2007 01:20:05 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 01:20:05 GMT Message-Id: <200710310120.l9V1K5DT077670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 01:20:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=128376 Change 128376 by kmacy@kmacy:storage:toestack on 2007/10/31 01:19:41 make TXQ index values explicit Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#9 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#9 (text+ko) ==== @@ -151,11 +151,9 @@ #define RSPQ_Q_SIZE 1024 #define TX_ETH_Q_SIZE 1024 -/* - * Types of Tx queues in each queue set. Order here matters, do not change. - * XXX TOE is not implemented yet, so the extra queues are just placeholders. - */ -enum { TXQ_ETH, TXQ_OFLD, TXQ_CTRL }; +enum { TXQ_ETH = 0, + TXQ_OFLD = 1, + TXQ_CTRL = 2, }; /* careful, the following are set on priv_flags and must not collide with From owner-p4-projects@FreeBSD.ORG Wed Oct 31 01:22:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F143A16A46C; Wed, 31 Oct 2007 01:22:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8143416A417 for ; Wed, 31 Oct 2007 01:22:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7374213C4AA for ; Wed, 31 Oct 2007 01:22:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V1M8fH077954 for ; Wed, 31 Oct 2007 01:22:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V1M8sK077951 for perforce@freebsd.org; Wed, 31 Oct 2007 01:22:08 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 01:22:08 GMT Message-Id: <200710310122.l9V1M8sK077951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 01:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=128377 Change 128377 by kmacy@kmacy:storage:toestack on 2007/10/31 01:21:09 make sure mbuf length gets set for offload ops Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#6 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#12 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#6 (text+ko) ==== @@ -130,6 +130,8 @@ * XXX MH_ALIGN */ req = mtod(m, struct cpl_l2t_write_req *); + m->m_pkthdr.len = m->m_len = sizeof(*req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_L2T_WRITE_REQ, e->idx)); req->params = htonl(V_L2T_W_IDX(e->idx) | V_L2T_W_IFF(e->smt_idx) | ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#12 (text+ko) ==== @@ -544,6 +544,7 @@ m_set_priority(m, CPL_PRIORITY_SETUP); req = mtod(m, struct cpl_tid_release *); + m->m_pkthdr.len = m->m_len = sizeof(*req); req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, tid)); } @@ -1018,6 +1019,8 @@ m_set_priority(m, CPL_PRIORITY_CONTROL); req = mtod(m, struct cpl_set_tcb_field *); + m->m_pkthdr.len = m->m_len = sizeof(*req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, tid)); req->reply = 0; From owner-p4-projects@FreeBSD.ORG Wed Oct 31 01:23:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11EAA16A420; Wed, 31 Oct 2007 01:23:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAEA116A419 for ; Wed, 31 Oct 2007 01:23:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BCAC213C4A5 for ; Wed, 31 Oct 2007 01:23:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V1N9Cn077976 for ; Wed, 31 Oct 2007 01:23:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V1N9jF077973 for perforce@freebsd.org; Wed, 31 Oct 2007 01:23:09 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 01:23:09 GMT Message-Id: <200710310123.l9V1N9jF077973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 01:23:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=128378 Change 128378 by kmacy@kmacy:storage:toestack on 2007/10/31 01:22:23 make sure mbuf length gets set for offload operations Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 (text+ko) ==== @@ -351,12 +351,11 @@ { struct cpl_act_open_req *req; struct inpcb *inp = sotoinpcb(so); - struct toe_mbuf *tm = (struct toe_mbuf *)m; m_set_priority((struct mbuf *)m, mkprio(CPL_PRIORITY_SETUP, so)); req = mtod(m, struct cpl_act_open_req *); - m->m_len += sizeof(*req); + m->m_pkthdr.len = m->m_len = sizeof(*req); req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ, atid)); From owner-p4-projects@FreeBSD.ORG Wed Oct 31 01:42:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38E0716A46C; Wed, 31 Oct 2007 01:42:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3C3516A41A for ; Wed, 31 Oct 2007 01:42:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5D8113C4B6 for ; Wed, 31 Oct 2007 01:42:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V1gUGr079103 for ; Wed, 31 Oct 2007 01:42:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V1gUl8079100 for perforce@freebsd.org; Wed, 31 Oct 2007 01:42:30 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 01:42:30 GMT Message-Id: <200710310142.l9V1gUl8079100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 01:42:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=128380 Change 128380 by kmacy@kmacy:storage:toestack on 2007/10/31 01:42:27 don't allocate an mbuf just so we can call arpresolve - arpresolve can now be called with m==NULL Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#7 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#7 (text+ko) ==== @@ -174,17 +174,12 @@ struct l2t_entry *e) { struct rtentry *rt; - struct mbuf *m0; - - if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) - return (ENOMEM); rt = e->neigh; - again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, NULL, rt->rt_gateway, RT_ENADDR(rt)); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) e->state = L2T_STATE_VALID; @@ -201,8 +196,6 @@ mtx_unlock(&e->lock); printf("enqueueing arp request\n"); - if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) - return (ENOMEM); /* * Only the first packet added to the arpq should kick off * resolution. However, because the m_gethdr below can fail, @@ -212,7 +205,9 @@ * entries when there's no memory. */ printf("doing arpresolve\n"); - if (arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)) == 0) { + if (arpresolve(rt->rt_ifp, rt, NULL, rt->rt_gateway, RT_ENADDR(rt)) == 0) { + if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) + return (ENOMEM); mtx_lock(&e->lock); if (e->arpq_head) From owner-p4-projects@FreeBSD.ORG Wed Oct 31 02:45:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7211916A46C; Wed, 31 Oct 2007 02:45:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1258A16A469 for ; Wed, 31 Oct 2007 02:45:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04C2D13C480 for ; Wed, 31 Oct 2007 02:45:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V2jbjA083585 for ; Wed, 31 Oct 2007 02:45:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V2jbYD083582 for perforce@freebsd.org; Wed, 31 Oct 2007 02:45:37 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 02:45:37 GMT Message-Id: <200710310245.l9V2jbYD083582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 02:45:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=128383 Change 128383 by kmacy@kmacy:storage:toestack on 2007/10/31 02:44:53 set the IP address when doing an active connect Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 (text+ko) ==== @@ -361,10 +361,9 @@ OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ, atid)); req->local_port = inp->inp_lport; req->peer_port = inp->inp_fport; -#ifdef notyet - req->local_ip = inp->inp_laddr; - req->peer_ip = inp->inp_faddr; -#endif + memcpy(&req->local_ip, &inp->inp_laddr, 4); + memcpy(&req->peer_ip, &inp->inp_faddr, 4); + req->opt0h = htonl(calc_opt0h(so) | V_L2T_IDX(e->idx) | V_TX_CHANNEL(e->smt_idx)); req->opt0l = htonl(calc_opt0l(so)); From owner-p4-projects@FreeBSD.ORG Wed Oct 31 02:53:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CCF616A477; Wed, 31 Oct 2007 02:53:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B507016A475 for ; Wed, 31 Oct 2007 02:53:46 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A6CF813C4B3 for ; Wed, 31 Oct 2007 02:53:46 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V2rkrN084110 for ; Wed, 31 Oct 2007 02:53:46 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V2rkgs084107 for perforce@freebsd.org; Wed, 31 Oct 2007 02:53:46 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 31 Oct 2007 02:53:46 GMT Message-Id: <200710310253.l9V2rkgs084107@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 128384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 02:53:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=128384 Change 128384 by zhouzhouyi@zhouzhouyi_mactest on 2007/10/31 02:53:18 Code stylize for mandatory access control tests for link Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#6 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/01.t#6 add Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#6 (text+ko) ==== @@ -12,62 +12,80 @@ n2=`namegen` n3=`namegen` -mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` -mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` +case "${os}:${fs}" in +FreeBSD:UFS) + + mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` + mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` -if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] ; then + if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] ; then - echo "1..10" + echo "1..10" #turn off all the switches first - for i in `sysctl security.mac | grep "\.enabled"| - sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do - sysctl ${i}=0 >/dev/null - done + for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do + sysctl ${i}=0 >/dev/null + done + + dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; - dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} -#first make working dir, the hook checks are already done in open: - if [ -f ${mactest_conf} ]; then - rm ${mactest_conf} - fi - touch ${mactest_conf} - sysctl security.mac.mls.enabled=1 >/dev/null + sysctl security.mac.mls.enabled=1 >/dev/null #case 1: mkdir - mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} 0755 + mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n3} \ + 0755 #case 2: setfmac - mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n3} + mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac \ + "mls/6" ${n3} #case 3: create - mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} create ${n3}/${n2} 0644 + mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} create ${n3}/${n2}\ + 0644 #case 4: setfmac - mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac "mls/5" ${n3}/${n2} + mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac \ + "mls/5" ${n3}/${n2} #case 5: link - echo -n "pid = -1 mac_test_check_vnode_link:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} - mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} - sysctl security.mac.mls.enabled=0 >/dev/null + echo -n "pid = -1 mac_test_check_vnode_link:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} + sysctl security.mac.mls.enabled=0 >/dev/null #case 6: link success - truncate -s 0 ${mactest_conf} - mactestexpect "" 0 -m "mls/5(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} - sysctl security.mac.mls.enabled=1 >/dev/null + truncate -s 0 ${mactest_conf} + mactestexpect "" 0 -m "mls/5(low-high)" -f ${mactest_conf} link ${n3}/${n2} \ + ${n3}/${n1} + sysctl security.mac.mls.enabled=1 >/dev/null #case 7: unlink - truncate -s 0 ${mactest_conf} - mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} + truncate -s 0 ${mactest_conf} + mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} #case 8: setfmac fail, old vnode not in range - echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(6-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} - mactestexpect "setfmac:.mac_set_link.${n3}.${n1},.biba.,mls.6.:.Operation.not.permitted" "" -m "mls/6(6-6)" -f ${mactest_conf} system setfmac "biba/,mls/6" ${n3}/${n1} + echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(6-6) biba/high,mls/5 biba/,mls/6" >> \ + ${mactest_conf} + mactestexpect \ + "setfmac:.mac_set_link.${n3}.${n1},.biba.,mls.6.:.Operation.not.permitted" ""\ + -m "mls/6(6-6)" -f ${mactest_conf} \ + system setfmac "biba/,mls/6" ${n3}/${n1} #case 9: setfmac success - echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(4-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} - mactestexpect "" "" -m "mls/6(4-6)" -f ${mactest_conf} system setfmac "biba/,mls/6" ${n3}/${n1} + echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(4-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} + mactestexpect "" "" -m "mls/6(4-6)" -f ${mactest_conf} \ + system setfmac "biba/,mls/6" ${n3}/${n1} #case 10: unlink - rm ${mactest_conf} - touch ${mactest_conf} - mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} + rm ${mactest_conf} + touch ${mactest_conf} + mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} #cleanup: - sysctl security.mac.mls.enabled=0 >/dev/null - rm -fr ${n3} - rm ${mactest_conf} + sysctl security.mac.mls.enabled=0 >/dev/null + rm -fr ${n3} + rm ${mactest_conf} fi + ;; +*) + quick_exit + ;; +esac From owner-p4-projects@FreeBSD.ORG Wed Oct 31 04:39:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B07A16A420; Wed, 31 Oct 2007 04:39:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D69E016A41A for ; Wed, 31 Oct 2007 04:39:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8C3913C48D for ; Wed, 31 Oct 2007 04:39:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V4dcY6098728 for ; Wed, 31 Oct 2007 04:39:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V4dckw098725 for perforce@freebsd.org; Wed, 31 Oct 2007 04:39:38 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 04:39:38 GMT Message-Id: <200710310439.l9V4dckw098725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 04:39:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=128386 Change 128386 by kmacy@kmacy:storage:toestack on 2007/10/31 04:39:12 use RTRFREE_LOCKED in case their an external reference to the route Affected files ... .. //depot/projects/toestack/sys/netinet/if_ether.c#9 edit Differences ... ==== //depot/projects/toestack/sys/netinet/if_ether.c#9 (text+ko) ==== @@ -810,12 +810,12 @@ * over who claims what Ether address. */ if (rt->rt_ifp == ifp) { - rtfree(rt); + RTFREE_LOCKED(rt); goto drop; } (void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln); (void)memcpy(ar_sha(ah), enaddr, ah->ar_hln); - rtfree(rt); + RTFREE_LOCKED(rt); /* * Also check that the node which sent the ARP packet @@ -833,10 +833,10 @@ " from %s via %s, expecting %s\n", inet_ntoa(isaddr), ifp->if_xname, rt->rt_ifp->if_xname); - rtfree(rt); + RTFREE_LOCKED(rt); goto drop; } - rtfree(rt); + RTFREE_LOCKED(rt); #ifdef DEBUG_PROXY printf("arp: proxying for %s\n", From owner-p4-projects@FreeBSD.ORG Wed Oct 31 04:40:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7686716A41B; Wed, 31 Oct 2007 04:40:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C17416A49C for ; Wed, 31 Oct 2007 04:40:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2EA4813C4BC for ; Wed, 31 Oct 2007 04:40:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V4eeFs098833 for ; Wed, 31 Oct 2007 04:40:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V4eeep098830 for perforce@freebsd.org; Wed, 31 Oct 2007 04:40:40 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 04:40:40 GMT Message-Id: <200710310440.l9V4eeep098830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 04:40:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=128387 Change 128387 by kmacy@kmacy:storage:toestack on 2007/10/31 04:40:37 ignore events on non-offloaded interfaces drop route lock so as to avoid LOR on t3cdev lock Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#13 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#13 (text+ko) ==== @@ -876,7 +876,28 @@ static void cxgb_route_event(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1) { + struct toedev *tdev0, *tdev1 = NULL; + + /* + * ignore events on non-offloaded interfaces + */ + tdev0 = TOEDEV(rt0->rt_ifp); + if (rt1) + tdev1 = TOEDEV(rt1->rt_ifp); + if (tdev0 == NULL && tdev1 == NULL) + return; + /* + * avoid LORs by dropping the route lock but keeping a reference + * + */ + RT_ADDREF(rt0); + RT_UNLOCK(rt0); + if (rt1) { + RT_ADDREF(rt1); + RT_UNLOCK(rt1); + } + switch (event) { case RTEVENT_ARP_UPDATE: { cxgb_neigh_update(rt0); @@ -892,6 +913,14 @@ default: break; } + + RT_LOCK(rt0); + RT_REMREF(rt0); + if (rt1) { + RT_LOCK(rt1); + RT_REMREF(rt1); + } + } /* From owner-p4-projects@FreeBSD.ORG Wed Oct 31 04:41:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9920D16A49A; Wed, 31 Oct 2007 04:41:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4425916A421 for ; Wed, 31 Oct 2007 04:41:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1E09813C4B0 for ; Wed, 31 Oct 2007 04:41:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V4fgjQ099022 for ; Wed, 31 Oct 2007 04:41:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V4ffNb099018 for perforce@freebsd.org; Wed, 31 Oct 2007 04:41:41 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 04:41:41 GMT Message-Id: <200710310441.l9V4ffNb099018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 04:41:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=128388 Change 128388 by kmacy@kmacy:storage:toestack on 2007/10/31 04:41:24 the route is locked here, don't keep the lock held Affected files ... .. //depot/projects/toestack/sys/netinet/ip_icmp.c#6 edit Differences ... ==== //depot/projects/toestack/sys/netinet/ip_icmp.c#6 (text+ko) ==== @@ -158,7 +158,7 @@ } } if (rt) - RTFREE(rt); + RTFREE_LOCKED(rt); } From owner-p4-projects@FreeBSD.ORG Wed Oct 31 05:08:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B64C16A46D; Wed, 31 Oct 2007 05:08:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8A0F16A468 for ; Wed, 31 Oct 2007 05:08:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A53D13C4A6 for ; Wed, 31 Oct 2007 05:08:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V58Bi9013438 for ; Wed, 31 Oct 2007 05:08:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V58BWt013435 for perforce@freebsd.org; Wed, 31 Oct 2007 05:08:11 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 05:08:11 GMT Message-Id: <200710310508.l9V58BWt013435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 05:08:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=128391 Change 128391 by kmacy@kmacy:storage:toestack on 2007/10/31 05:07:32 remove NETEVENT references remove procfs reference drop l2t_data lock as soon after last update to l2t_data Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#8 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#7 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#8 (text+ko) ==== @@ -385,6 +385,8 @@ mtx_lock(&e->lock); /* avoid race with t3_l2t_free */ e->next = d->l2tab[hash].first; d->l2tab[hash].first = e; + rw_wunlock(&d->lock); + e->state = L2T_STATE_RESOLVING; e->addr = addr; e->ifindex = ifidx; @@ -401,7 +403,10 @@ #endif e->vlan = VLAN_NONE; mtx_unlock(&e->lock); + + return (e); } + done: rw_wunlock(&d->lock); return e; @@ -503,12 +508,6 @@ d->l2tab[i].state = L2T_STATE_UNUSED; mtx_init(&d->l2tab[i].lock, "L2TAB", NULL, MTX_DEF); atomic_store_rel_int(&d->l2tab[i].refcnt, 0); -#ifndef NETEVENT -#ifdef CONFIG_CHELSIO_T3_MODULE - setup_timer(&d->l2tab[i].update_timer, update_timer_cb, - (unsigned long)&d->l2tab[i]); -#endif -#endif } return d; } @@ -516,86 +515,6 @@ void t3_free_l2t(struct l2t_data *d) { -#ifndef NETEVENT -#ifdef CONFIG_CHELSIO_T3_MODULE - int i; - - /* Stop all L2T timers */ - for (i = 0; i < d->nentries; ++i) - del_timer_sync(&d->l2tab[i].update_timer); -#endif -#endif cxgb_free_mem(d); } -#ifdef CONFIG_PROC_FS -#include -#include -#include - -static inline void * -l2t_get_idx(struct seq_file *seq, loff_t pos) -{ - struct l2t_data *d = seq->private; - - return pos >= d->nentries ? NULL : &d->l2tab[pos]; -} - -static void * -l2t_seq_start(struct seq_file *seq, loff_t *pos) -{ - return *pos ? l2t_get_idx(seq, *pos) : SEQ_START_TOKEN; -} - -static void * -l2t_seq_next(struct seq_file *seq, void *v, loff_t *pos) -{ - v = l2t_get_idx(seq, *pos + 1); - if (v) - ++*pos; - return v; -} - -static void -l2t_seq_stop(struct seq_file *seq, void *v) -{ -} - -static char -l2e_state(const struct l2t_entry *e) -{ - switch (e->state) { - case L2T_STATE_VALID: return 'V'; /* valid, fast-path entry */ - case L2T_STATE_STALE: return 'S'; /* needs revalidation, but usable */ - case L2T_STATE_RESOLVING: - return e->arpq_head ? 'A' : 'R'; - default: - return 'U'; - } -} - -static int -l2t_seq_show(struct seq_file *seq, void *v) -{ - if (v == SEQ_START_TOKEN) - seq_puts(seq, "Index IP address Ethernet address VLAN " - "Prio State Users SMTIDX Port\n"); - else { - char ip[20]; - struct l2t_entry *e = v; - - mtx_lock(&e->lock); - sprintf(ip, "%u.%u.%u.%u", NIPQUAD(e->addr)); - seq_printf(seq, "%-5u %-15s %02x:%02x:%02x:%02x:%02x:%02x %4d" - " %3u %c %7u %4u %s\n", - e->idx, ip, e->dmac[0], e->dmac[1], e->dmac[2], - e->dmac[3], e->dmac[4], e->dmac[5], - e->vlan & EVL_VLID_MASK, vlan_prio(e), - l2e_state(e), atomic_load_acq_int(&e->refcnt), e->smt_idx, - e->neigh ? e->neigh->dev->name : ""); - mtx_unlock(&e->lock); - } - return 0; -} - -#endif ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#7 (text+ko) ==== @@ -76,12 +76,6 @@ struct mtx lock; volatile uint32_t refcnt; /* entry reference count */ uint8_t dmac[6]; /* neighbour's MAC address */ -#ifndef NETEVENT -#ifdef CONFIG_CHELSIO_T3_MODULE - struct timer_list update_timer; - struct t3cdev *tdev; -#endif -#endif }; struct l2t_data { From owner-p4-projects@FreeBSD.ORG Wed Oct 31 05:42:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC1B516A47D; Wed, 31 Oct 2007 05:42:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4668216A477 for ; Wed, 31 Oct 2007 05:42:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 361A913C447 for ; Wed, 31 Oct 2007 05:42:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V5gmOA015259 for ; Wed, 31 Oct 2007 05:42:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V5gmBp015256 for perforce@freebsd.org; Wed, 31 Oct 2007 05:42:48 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 05:42:48 GMT Message-Id: <200710310542.l9V5gmBp015256@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 05:42:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=128392 Change 128392 by kmacy@kmacy:storage:toestack on 2007/10/31 05:42:44 resolve the host interface MAC address not the non-existent gateway Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#9 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#9 (text+ko) ==== @@ -179,7 +179,7 @@ again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, NULL, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), RT_ENADDR(rt)); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) e->state = L2T_STATE_VALID; @@ -205,7 +205,7 @@ * entries when there's no memory. */ printf("doing arpresolve\n"); - if (arpresolve(rt->rt_ifp, rt, NULL, rt->rt_gateway, RT_ENADDR(rt)) == 0) { + if (arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), RT_ENADDR(rt)) == 0) { if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return (ENOMEM); @@ -235,7 +235,7 @@ again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), RT_ENADDR(rt)); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) { e->state = L2T_STATE_VALID; @@ -262,7 +262,7 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), RT_ENADDR(rt)); } return; @@ -302,6 +302,7 @@ } e->state = L2T_STATE_UNUSED; } + return e; } @@ -392,6 +393,8 @@ e->ifindex = ifidx; e->smt_idx = smt_idx; atomic_store_rel_int(&e->refcnt, 1); + e->neigh = NULL; + neigh_replace(e, neigh); #ifdef notyet /* From owner-p4-projects@FreeBSD.ORG Wed Oct 31 08:15:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5DB816A41A; Wed, 31 Oct 2007 08:15:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C98B16A420 for ; Wed, 31 Oct 2007 08:15:36 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4CF5613C494 for ; Wed, 31 Oct 2007 08:15:36 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V8FahU027104 for ; Wed, 31 Oct 2007 08:15:36 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V8FaA9027101 for perforce@freebsd.org; Wed, 31 Oct 2007 08:15:36 GMT (envelope-from andrew@freebsd.org) Date: Wed, 31 Oct 2007 08:15:36 GMT Message-Id: <200710310815.l9V8FaA9027101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 128397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 08:15:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=128397 Change 128397 by andrew@andrew_hermies on 2007/10/31 08:15:23 Update the s3c2410 uart driver to compile and run on a Neo1973 Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#3 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2003 Marcel Moolenaar + * Copyright (c) 2007 Andrew Turner * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,14 +41,15 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; + +extern struct uart_class uart_s3c2410_class; + int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); } -extern int got_mmu; - extern struct uart_ops uart_s3c2410_ops; vm_offset_t s3c2410_uart_vaddr; @@ -55,7 +57,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_s3c2410_ops; + di->ops = uart_getops(&uart_s3c2410_class); di->bas.chan = 0; di->bas.bst = &s3c2xx0_bs_tag; di->bas.bsh = s3c2410_uart_vaddr; ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2003 Marcel Moolenaar + * Copyright (c) 2007 Andrew Turner * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,14 +39,13 @@ #include #include #include +#include #include #include #include "uart_if.h" #define DEFAULT_RCLK 3686400 -extern int got_mmu; - /* * Low-level UART interface. */ @@ -53,11 +53,9 @@ static void s3c2410_init(struct uart_bas *bas, int, int, int, int); static void s3c2410_term(struct uart_bas *bas); static void s3c2410_putc(struct uart_bas *bas, int); -static int s3c2410_poll(struct uart_bas *bas); +static int s3c2410_rxready(struct uart_bas *bas); static int s3c2410_getc(struct uart_bas *bas, struct mtx *mtx); -int did_mmu = 0; - extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; struct uart_ops uart_s3c2410_ops = { @@ -65,7 +63,7 @@ .init = s3c2410_init, .term = s3c2410_term, .putc = s3c2410_putc, - .poll = s3c2410_poll, + .rxready = s3c2410_rxready, .getc = s3c2410_getc, }; @@ -75,14 +73,6 @@ return (0); } -static void -s3c2410_addr_change(struct uart_bas *bas) -{ - - bas->bsh = 0xd000d000; - did_mmu = 1; -} - static int sscomspeed(long speed, long frequency) { @@ -107,10 +97,7 @@ int parity) { int brd; - - /* XXX: sigh. */ - if (!did_mmu && got_mmu) - s3c2410_addr_change(bas); + if (bas->rclk == 0) bas->rclk = DEFAULT_RCLK; uart_setreg(bas, SSCOM_ULCON, 0x23); @@ -135,10 +122,6 @@ static void s3c2410_putc(struct uart_bas *bas, int c) { - /* XXX: sigh. */ - if (!did_mmu && got_mmu) - s3c2410_addr_change(bas); - #if 0 while (uart_getreg(bas, SSCOM_UFSTAT) & UFSTAT_TXFULL); #endif @@ -146,18 +129,16 @@ } static int -s3c2410_poll(struct uart_bas *bas) +s3c2410_rxready(struct uart_bas *bas) { - return (sscom_getc(bas->bst, bas->bsh)); + return ((uart_getreg(bas, SSCOM_UTRSTAT) & UTRSTAT_RXREADY) == + UTRSTAT_RXREADY); } static int s3c2410_getc(struct uart_bas *bas, struct mtx *mtx) { int c; - /* XXX: sigh. */ - if (!did_mmu && got_mmu) - s3c2410_addr_change(bas); while (!sscom_rxrdy(bas->bst, bas->bsh)); return sscom_getc(bas->bst, bas->bsh); @@ -256,6 +237,7 @@ "s3c2410 class", s3c2410_methods, 1, + .uc_ops = &uart_s3c2410_ops, .uc_range = 8, .uc_rclk = 3686400 }; From owner-p4-projects@FreeBSD.ORG Wed Oct 31 09:12:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CCFA16A418; Wed, 31 Oct 2007 09:12:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09D5D16A41B for ; Wed, 31 Oct 2007 09:12:43 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5E8413C4A5 for ; Wed, 31 Oct 2007 09:12:42 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V9CgrP040777 for ; Wed, 31 Oct 2007 09:12:42 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V9CgeA040774 for perforce@freebsd.org; Wed, 31 Oct 2007 09:12:42 GMT (envelope-from andrew@freebsd.org) Date: Wed, 31 Oct 2007 09:12:42 GMT Message-Id: <200710310912.l9V9CgeA040774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 128402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 09:12:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=128402 Change 128402 by andrew@andrew_hermies on 2007/10/31 09:12:34 Fix s3c2xx0_space.c to let it compile Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0_space.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0_space.c#3 (text+ko) ==== @@ -200,7 +200,7 @@ } void -s3c2xx0_bs_unmap(void *t, bus_size_t size) +s3c2xx0_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { vm_offset_t va, endva; From owner-p4-projects@FreeBSD.ORG Wed Oct 31 20:00:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AEB916A480; Wed, 31 Oct 2007 20:00:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD55C16A477 for ; Wed, 31 Oct 2007 20:00:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ABB3B13C4C3 for ; Wed, 31 Oct 2007 20:00:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9VK0MZJ019513 for ; Wed, 31 Oct 2007 20:00:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9VK0MnY019510 for perforce@freebsd.org; Wed, 31 Oct 2007 20:00:22 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 20:00:22 GMT Message-Id: <200710312000.l9VK0MnY019510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 20:00:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=128428 Change 128428 by kmacy@kmacy:storage:toestack on 2007/10/31 19:59:40 move notification for arp updates into in_arpinput Affected files ... .. //depot/projects/toestack/sys/netinet/if_ether.c#10 edit Differences ... ==== //depot/projects/toestack/sys/netinet/if_ether.c#10 (text+ko) ==== @@ -415,7 +415,6 @@ sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) { bcopy(LLADDR(sdl), desten, sdl->sdl_alen); - EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL); /* * If entry has an expiry time and it is approaching, @@ -735,6 +734,7 @@ } (void)memcpy(LLADDR(sdl), ar_sha(ah), sdl->sdl_alen = ah->ar_hln); + /* * If we receive an arp from a token-ring station over * a token-ring nic then try to save the source @@ -777,6 +777,7 @@ la->la_preempt = arp_maxtries; hold = la->la_hold; la->la_hold = NULL; + EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL); RT_UNLOCK(rt); if (hold != NULL) (*ifp->if_output)(ifp, hold, rt_key(rt), rt); From owner-p4-projects@FreeBSD.ORG Wed Oct 31 22:20:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED29316A420; Wed, 31 Oct 2007 22:20:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B42516A419 for ; Wed, 31 Oct 2007 22:20:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7210313C480 for ; Wed, 31 Oct 2007 22:20:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9VMK6IU039671 for ; Wed, 31 Oct 2007 22:20:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9VMK6f2039668 for perforce@freebsd.org; Wed, 31 Oct 2007 22:20:06 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 22:20:06 GMT Message-Id: <200710312220.l9VMK6f2039668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 22:20:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=128431 Change 128431 by kmacy@kmacy:storage:toestack on 2007/10/31 22:19:17 - add sanity checks to write immediate - make sure rx_offload gets called for non-tunnelled packets Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#8 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#8 (text+ko) ==== @@ -1501,6 +1501,11 @@ struct work_request_hdr *from = mtod(m, struct work_request_hdr *); struct work_request_hdr *to = (struct work_request_hdr *)d; + if (len > WR_LEN) + panic("len too big %d\n", len); + if (len < sizeof(*from)) + panic("len too small %d", len); + memcpy(&to[1], &from[1], len - sizeof(*from)); to->wr_hi = from->wr_hi | htonl(F_WR_SOP | F_WR_EOP | V_WR_BCNTLFLT(len & 7)); @@ -1508,6 +1513,8 @@ to->wr_lo = from->wr_lo | htonl(V_WR_GEN(gen) | V_WR_LEN((len + 7) / 8)); wr_gen2(d, gen); + + printf("m_freeing %p\n", m); m_freem(m); } @@ -1617,13 +1624,14 @@ if (__predict_false(ret)) { if (ret == 1) { mtx_unlock(&q->lock); + printf("no desc available\n"); + return (-1); } goto again; } - write_imm(&q->desc[q->pidx], m, m->m_len, q->gen); - + q->in_use++; if (++q->pidx >= q->size) { q->pidx = 0; @@ -2017,7 +2025,9 @@ struct mbuf *m_vec[TX_CLEAN_MAX_DESC]; bus_dma_segment_t segs[TX_MAX_SEGS]; int cleaned; - struct tx_sw_desc *stx = &q->sdesc[q->pidx]; + struct tx_sw_desc *stx; + + stx = &q->sdesc[q->pidx]; mtx_lock(&q->lock); if ((ret = busdma_map_mbufs(&m, q, stx, segs, &nsegs)) != 0) { @@ -2174,7 +2184,7 @@ adapter_t *adap = tdev2adap(tdev); struct sge_qset *qs = &adap->sge.qs[queue_set(m)]; - if (__predict_false(is_ctrl_pkt(m))) + if (__predict_false(is_ctrl_pkt(m))) return ctrl_xmit(adap, &qs->txq[TXQ_CTRL], m); return ofld_xmit(adap, &qs->txq[TXQ_OFLD], m); @@ -2205,9 +2215,9 @@ struct mbuf *m, struct mbuf *rx_gather[], unsigned int gather_idx) { + rq->offload_pkts++; m->m_pkthdr.header = mtod(m, void *); - rx_gather[gather_idx++] = m; if (gather_idx == RX_BUNDLE_SIZE) { cxgb_ofld_recv(tdev, rx_gather, RX_BUNDLE_SIZE); @@ -2788,7 +2798,8 @@ } #else struct mbuf *m = NULL; - + + DPRINTF("IMM DATA VALID opcode=0x%x rspq->cidx=%d\n", r->rss_hdr.opcode, rspq->cidx); if (rspq->rspq_mbuf == NULL) rspq->rspq_mbuf = m_gethdr(M_DONTWAIT, MT_DATA); else @@ -2802,11 +2813,13 @@ budget_left--; break; } - if (get_imm_packet(adap, r, rspq->rspq_mbuf, m, flags)) + if (get_imm_packet(adap, r, rspq->rspq_mbuf, m, flags)) { + eop = 1; + rspq->imm_data++; goto skip; - eop = 1; + } + #endif - rspq->imm_data++; } else if (r->len_cq) { int drop_thresh = eth ? SGE_RX_DROP_THRES : 0; @@ -2850,26 +2863,26 @@ refill_rspq(adap, rspq, rspq->credits); rspq->credits = 0; } - - if (eop) { + DPRINTF("eth=%d eop=%d flags=0x%x\n", eth, eop, flags); + + if (!eth && eop) { + rspq->rspq_mh.mh_head->m_pkthdr.csum_data = rss_csum; + /* + * XXX size mismatch + */ + m_set_priority(rspq->rspq_mh.mh_head, rss_hash); + + ngathered = rx_offload(&adap->tdev, rspq, + rspq->rspq_mh.mh_head, offload_mbufs, ngathered); + rspq->rspq_mh.mh_head = NULL; + } else if (eth && eop) { prefetch(mtod(rspq->rspq_mh.mh_head, uint8_t *)); prefetch(mtod(rspq->rspq_mh.mh_head, uint8_t *) + L1_CACHE_BYTES); - if (eth) { - t3_rx_eth_lro(adap, rspq, rspq->rspq_mh.mh_head, ethpad, - rss_hash, rss_csum, lro); + t3_rx_eth_lro(adap, rspq, rspq->rspq_mh.mh_head, ethpad, + rss_hash, rss_csum, lro); rspq->rspq_mh.mh_head = NULL; - } else { - rspq->rspq_mh.mh_head->m_pkthdr.csum_data = rss_csum; - /* - * XXX size mismatch - */ - m_set_priority(rspq->rspq_mh.mh_head, rss_hash); - - ngathered = rx_offload(&adap->tdev, rspq, - rspq->rspq_mh.mh_head, offload_mbufs, ngathered); - } } __refill_fl_lt(adap, &qs->fl[0], 32); From owner-p4-projects@FreeBSD.ORG Wed Oct 31 22:22:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BCA216A46B; Wed, 31 Oct 2007 22:22:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D91D816A420 for ; Wed, 31 Oct 2007 22:22:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C78CA13C4AA for ; Wed, 31 Oct 2007 22:22:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9VMM8wg039954 for ; Wed, 31 Oct 2007 22:22:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9VMM8c8039951 for perforce@freebsd.org; Wed, 31 Oct 2007 22:22:08 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 31 Oct 2007 22:22:08 GMT Message-Id: <200710312222.l9VMM8c8039951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2007 22:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=128432 Change 128432 by kmacy@kmacy:storage:toestack on 2007/10/31 22:21:20 - free unreferenced rtentry - remove bogus la_hold check - call arpresolve to update rtentry before copying into l2t entry Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#10 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#10 (text+ko) ==== @@ -105,8 +105,7 @@ if (e->neigh) { RT_LOCK(e->neigh); - RT_REMREF(e->neigh); - RT_UNLOCK(e->neigh); + RTFREE_LOCKED(e->neigh); } e->neigh = rt; } @@ -454,7 +453,9 @@ int ifidx = neigh->rt_ifp->if_index; int hash = arp_hash(addr, ifidx, d); struct llinfo_arp *la; - + + arpresolve(neigh->rt_ifp, neigh, NULL, rt_key(neigh), RT_ENADDR(neigh)); + rw_rlock(&d->lock); for (e = d->l2tab[hash].first; e; e = e->next) if (e->addr == addr && e->ifindex == ifidx) { @@ -476,11 +477,10 @@ if (la->la_asked >= 5 /* arp_maxtries */) { arpq = e->arpq_head; e->arpq_head = e->arpq_tail = NULL; - } else if (la->la_hold == NULL) + } else setup_l2e_send_pending(dev, NULL, e); } else { - e->state = (la->la_hold == NULL) ? - L2T_STATE_VALID : L2T_STATE_STALE; + e->state = L2T_STATE_VALID; if (memcmp(e->dmac, RT_ENADDR(neigh), 6)) setup_l2e_send_pending(dev, NULL, e); } From owner-p4-projects@FreeBSD.ORG Thu Nov 1 01:39:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7442416A41B; Thu, 1 Nov 2007 01:39:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFD1C16A418 for ; Thu, 1 Nov 2007 01:39:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A13EF13C48D for ; Thu, 1 Nov 2007 01:39:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA11dkOr063162 for ; Thu, 1 Nov 2007 01:39:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA11dk0n063159 for perforce@freebsd.org; Thu, 1 Nov 2007 01:39:46 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 1 Nov 2007 01:39:46 GMT Message-Id: <200711010139.lA11dk0n063159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2007 01:39:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=128443 Change 128443 by kmacy@kmacy:storage:toestack on 2007/11/01 01:39:39 fix incorrect definition of get_imm_packet the length is not set the way it is on packets with non-immediate data Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#9 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#9 (text+ko) ==== @@ -296,38 +296,14 @@ static __inline int get_imm_packet(adapter_t *sc, const struct rsp_desc *resp, struct t3_mbuf_hdr *mh) { - struct mbuf *m; - int len; - uint32_t flags = ntohl(resp->flags); - uint8_t sopeop = G_RSPD_SOP_EOP(flags); - - /* - * would be a firmware bug - */ - if (sopeop == RSPQ_NSOP_NEOP || sopeop == RSPQ_SOP) return (0); m = m_gethdr(M_DONTWAIT, MT_DATA); - len = G_RSPD_LEN(ntohl(resp->len_cq)); + len = IMMED_PKT_SIZE; if (m) { - MH_ALIGN(m, IMMED_PKT_SIZE); memcpy(m->m_data, resp->imm_data, IMMED_PKT_SIZE); - m->m_len = len; - - switch (sopeop) { - case RSPQ_SOP_EOP: - mh->mh_head = mh->mh_tail = m; - m->m_pkthdr.len = len; - m->m_flags |= M_PKTHDR; - break; - case RSPQ_EOP: - m->m_flags &= ~M_PKTHDR; - mh->mh_head->m_pkthdr.len += len; - mh->mh_tail->m_next = m; - mh->mh_tail = m; - break; - } + m->m_pkthdr.len = m->m_len = len; } return (m != NULL); } @@ -336,39 +312,11 @@ static int get_imm_packet(adapter_t *sc, const struct rsp_desc *resp, struct mbuf *m, void *cl, uint32_t flags) { - int len, error; - uint8_t sopeop = G_RSPD_SOP_EOP(flags); + + m->m_len = m->m_pkthdr.len = IMMED_PKT_SIZE; + memcpy(mtod(m, uint8_t *), resp->imm_data, IMMED_PKT_SIZE); + return (0); - /* - * would be a firmware bug - */ - len = G_RSPD_LEN(ntohl(resp->len_cq)); - if (sopeop == RSPQ_NSOP_NEOP || sopeop == RSPQ_SOP) { - if (cxgb_debug) - device_printf(sc->dev, "unexpected value sopeop=%d flags=0x%x len=%din get_imm_packet\n", sopeop, flags, len); - bogus_imm++; - return (EINVAL); - } - error = 0; - switch (sopeop) { - case RSPQ_SOP_EOP: - m->m_len = m->m_pkthdr.len = len; - memcpy(mtod(m, uint8_t *), resp->imm_data, len); - break; - case RSPQ_EOP: - memcpy(cl, resp->imm_data, len); - /* - * XXX - */ - panic("bad append"); - m_iovappend(m, cl, MSIZE, len, 0, NULL); - break; - default: - bogus_imm++; - error = EINVAL; - } - - return (error); } #endif @@ -1514,7 +1462,7 @@ V_WR_LEN((len + 7) / 8)); wr_gen2(d, gen); - printf("m_freeing %p\n", m); + printf("write_imm m_freeing %p\n", m); m_freem(m); } @@ -2799,7 +2747,7 @@ #else struct mbuf *m = NULL; - DPRINTF("IMM DATA VALID opcode=0x%x rspq->cidx=%d\n", r->rss_hdr.opcode, rspq->cidx); + printf("IMM DATA VALID opcode=0x%x rspq->cidx=%d\n", r->rss_hdr.opcode, rspq->cidx); if (rspq->rspq_mbuf == NULL) rspq->rspq_mbuf = m_gethdr(M_DONTWAIT, MT_DATA); else @@ -2813,11 +2761,11 @@ budget_left--; break; } - if (get_imm_packet(adap, r, rspq->rspq_mbuf, m, flags)) { - eop = 1; - rspq->imm_data++; - goto skip; - } + get_imm_packet(adap, r, rspq->rspq_mbuf, m, flags); + + eop = 1; + rspq->imm_data++; + goto skip; #endif } else if (r->len_cq) { From owner-p4-projects@FreeBSD.ORG Thu Nov 1 01:40:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5828616A418; Thu, 1 Nov 2007 01:40:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DF9216A420 for ; Thu, 1 Nov 2007 01:40:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F09F13C4B6 for ; Thu, 1 Nov 2007 01:40:47 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA11el2T063255 for ; Thu, 1 Nov 2007 01:40:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA11el55063252 for perforce@freebsd.org; Thu, 1 Nov 2007 01:40:47 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 1 Nov 2007 01:40:47 GMT Message-Id: <200711010140.lA11el55063252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2007 01:40:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=128444 Change 128444 by kmacy@kmacy:storage:toestack on 2007/11/01 01:40:43 - remove some debug print statements - notify the stack that we are connected Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 (text+ko) ==== @@ -172,18 +172,10 @@ const struct t3c_data *td; struct toedev *toed; - printf("getting toedev\n"); - toed = TOE_DEV(so); - printf("toedev=%p\n", toed); - - printf("getting tom_data\n"); d = TOM_DATA(toed); - printf("tom_data=%p\n", d); if (d == NULL) panic("tom_data not set"); - - printf("d->cdev=%p\n", d->cdev); td = T3C_DATA(d->cdev); #ifdef notyet @@ -282,7 +274,6 @@ tp->t_toe = toep; toep->tp_toedev = dev; - printf("tp->tp_toedev=%p\n", dev); toep->tp_tid = tid; toep->tp_l2t = e; @@ -294,7 +285,6 @@ printf("mss selected\n"); tp->rcv_wnd = select_rcv_wnd(so); - printf("rcv_wnd selected\n"); toep->tp_ulp_mode = TOM_TUNABLE(dev, ddp) && !(so->so_options & SO_NO_DDP) && tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0; toep->tp_qset_idx = 0; @@ -405,6 +395,8 @@ INP_LOCK(inp); if (tp->t_state == TCPS_SYN_SENT || tp->t_state == TCPS_SYN_RECEIVED) { fail_act_open(so, EHOSTUNREACH); + printf("freeing %p\n", m); + m_free(m); } INP_UNLOCK(inp); @@ -450,6 +442,8 @@ if (toep->tp_ulp_mode) t3_enable_ddp(so, 0); + soisconnecting(so); + return (0); free_tid: @@ -579,6 +573,8 @@ sk_wake_async(sk, 0, POLL_OUT); #endif } + printf("freeing %p\n", m); + m_free(m); #ifdef notyet /* @@ -598,6 +594,11 @@ if (t3_push_frames(sk, 1)) sk->sk_write_space(sk); #endif + + soisconnected(so); + tp->t_state = TCPS_ESTABLISHED; + tcpstat.tcps_connects++; + } /* From owner-p4-projects@FreeBSD.ORG Thu Nov 1 03:20:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0844616A41B; Thu, 1 Nov 2007 03:20:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 888AD16A418 for ; Thu, 1 Nov 2007 03:20:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6384413C4B8 for ; Thu, 1 Nov 2007 03:20:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA13KZYk075599 for ; Thu, 1 Nov 2007 03:20:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA13KZgD075596 for perforce@freebsd.org; Thu, 1 Nov 2007 03:20:35 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 1 Nov 2007 03:20:35 GMT Message-Id: <200711010320.lA13KZgD075596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2007 03:20:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=128445 Change 128445 by kmacy@kmacy:storage:toestack on 2007/11/01 03:19:43 connect is part of the toedev because the toepcb hasn't been allocated yet Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#5 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#5 (text+ko) ==== @@ -96,7 +96,6 @@ } struct toe_usrreqs { - int (*tu_connect)(struct tcpcb *tp, struct sockaddr *nam); int (*tu_disconnect)(struct tcpcb *tp); int (*tu_abort)(struct tcpcb *tp); int (*tu_send)(struct tcpcb *tp); From owner-p4-projects@FreeBSD.ORG Thu Nov 1 03:21:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 070E216A46E; Thu, 1 Nov 2007 03:21:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0D7816A46C for ; Thu, 1 Nov 2007 03:21:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B3F8913C4AA for ; Thu, 1 Nov 2007 03:21:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA13La9E075771 for ; Thu, 1 Nov 2007 03:21:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA13La0N075767 for perforce@freebsd.org; Thu, 1 Nov 2007 03:21:36 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 1 Nov 2007 03:21:36 GMT Message-Id: <200711010321.lA13La0N075767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2007 03:21:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=128446 Change 128446 by kmacy@kmacy:storage:toestack on 2007/11/01 03:21:13 add placeholder routines for toe usrreqs Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -121,8 +122,56 @@ */ #define MIN_RCV_WND (24 * 1024U) -static struct toe_usrreqs cxgb_toe_usrreqs; +static int +cxgb_toe_disconnect(struct tcpcb *tp) +{ + printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + return (0); +} + +static int +cxgb_toe_abort(struct tcpcb *tp) +{ + printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + return (0); +} + +static int +cxgb_toe_send(struct tcpcb *tp) +{ + printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + return (0); +} + +static int +cxgb_toe_listen_start(struct tcpcb *tp) +{ + printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + return (0); +} + +static int +cxgb_toe_listen_stop(struct tcpcb *tp) +{ + printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + return (0); +} + +static int +cxgb_toe_rcvd(struct tcpcb *tp) +{ + printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + return (0); +} +static struct toe_usrreqs cxgb_toe_usrreqs = { + .tu_disconnect = cxgb_toe_disconnect, + .tu_abort = cxgb_toe_abort, + .tu_send = cxgb_toe_send, + .tu_listen_start = cxgb_toe_listen_start, + .tu_listen_stop = cxgb_toe_listen_stop, + .tu_rcvd = cxgb_toe_rcvd, +}; void t3_enable_ddp(struct socket *so, int on) @@ -594,7 +643,7 @@ if (t3_push_frames(sk, 1)) sk->sk_write_space(sk); #endif - + soisconnected(so); tp->t_state = TCPS_ESTABLISHED; tcpstat.tcps_connects++; From owner-p4-projects@FreeBSD.ORG Thu Nov 1 05:56:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44CD016A473; Thu, 1 Nov 2007 05:56:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C59E716A469 for ; Thu, 1 Nov 2007 05:56:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B929213C494 for ; Thu, 1 Nov 2007 05:56:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA15uMD5097222 for ; Thu, 1 Nov 2007 05:56:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA15uMkG097219 for perforce@freebsd.org; Thu, 1 Nov 2007 05:56:22 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 1 Nov 2007 05:56:22 GMT Message-Id: <200711010556.lA15uMkG097219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2007 05:56:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=128449 Change 128449 by kmacy@kmacy:storage:toestack on 2007/11/01 05:55:26 don't trash rtentry's fields - we should be copying into rt_gateway be more careful about GC'ing rtentrys Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#11 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#11 (text+ko) ==== @@ -59,7 +59,7 @@ #define VLAN_NONE 0xfff #define SDL(s) ((struct sockaddr_dl *)s) -#define RT_ENADDR(rt) ((u_char *)LLADDR(SDL((rt)))) +#define RT_ENADDR(sa) ((u_char *)LLADDR(SDL((sa)))) #define rt_expire rt_rmx.rmx_expire struct llinfo_arp { @@ -103,10 +103,8 @@ RT_ADDREF(rt); RT_UNLOCK(rt); - if (e->neigh) { - RT_LOCK(e->neigh); - RTFREE_LOCKED(e->neigh); - } + if (e->neigh) + RTFREE(e->neigh); e->neigh = rt; } @@ -137,7 +135,6 @@ V_L2T_W_VLAN(e->vlan & EVL_VLID_MASK) | V_L2T_W_PRIO(vlan_prio(e))); - memcpy(e->dmac, RT_ENADDR(e->neigh), sizeof(e->dmac)); memcpy(req->dst_mac, e->dmac, sizeof(req->dst_mac)); m_set_priority(m, CPL_PRIORITY_CONTROL); cxgb_ofld_send(dev, m); @@ -173,12 +170,14 @@ struct l2t_entry *e) { struct rtentry *rt; - + rt = e->neigh; + printf("send slow on rt=%p\n", rt); + again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), e->dmac); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) e->state = L2T_STATE_VALID; @@ -203,8 +202,8 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - printf("doing arpresolve\n"); - if (arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), RT_ENADDR(rt)) == 0) { + printf("doing arpresolve\n"); + if (arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), e->dmac) == 0) { if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return (ENOMEM); @@ -216,7 +215,6 @@ mtx_unlock(&e->lock); } else printf("arpresolve returned non-zero\n"); - } return 0; } @@ -234,7 +232,7 @@ again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), e->dmac); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) { e->state = L2T_STATE_VALID; @@ -261,7 +259,7 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), e->dmac); } return; @@ -319,19 +317,21 @@ void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e) { + struct rtentry *rt = NULL; + mtx_lock(&e->lock); if (atomic_load_acq_int(&e->refcnt) == 0) { /* hasn't been recycled */ - if (e->neigh) { - RT_LOCK(e->neigh); - RT_REMREF(e->neigh); - RT_UNLOCK(e->neigh); - e->neigh = NULL; - } + rt = e->neigh; + e->neigh = NULL; } + mtx_unlock(&e->lock); atomic_add_int(&d->nfree, 1); + if (rt) + RTFREE(rt); } + /* * Update an L2T entry that was previously used for the same next hop as neigh. * Must be called with softirqs disabled. @@ -347,7 +347,7 @@ if (neigh != e->neigh) neigh_replace(e, neigh); - if (memcmp(e->dmac, RT_ENADDR(neigh), sizeof(e->dmac)) || + if (memcmp(e->dmac, RT_ENADDR(neigh->rt_gateway), sizeof(e->dmac)) || (neigh->rt_expire > time_uptime)) e->state = L2T_STATE_RESOLVING; else if (la->la_hold == NULL) @@ -453,9 +453,11 @@ int ifidx = neigh->rt_ifp->if_index; int hash = arp_hash(addr, ifidx, d); struct llinfo_arp *la; + u_char edst[ETHER_ADDR_LEN]; + - arpresolve(neigh->rt_ifp, neigh, NULL, rt_key(neigh), RT_ENADDR(neigh)); - + arpresolve(neigh->rt_ifp, neigh, NULL, rt_key(neigh), edst); + rw_rlock(&d->lock); for (e = d->l2tab[hash].first; e; e = e->next) if (e->addr == addr && e->ifindex == ifidx) { @@ -467,6 +469,8 @@ found: rw_runlock(&d->lock); + memcpy(e->dmac, edst, ETHER_ADDR_LEN); + if (atomic_load_acq_int(&e->refcnt)) { if (neigh != e->neigh) neigh_replace(e, neigh); @@ -481,7 +485,7 @@ setup_l2e_send_pending(dev, NULL, e); } else { e->state = L2T_STATE_VALID; - if (memcmp(e->dmac, RT_ENADDR(neigh), 6)) + if (memcmp(e->dmac, RT_ENADDR(neigh->rt_gateway), 6)) setup_l2e_send_pending(dev, NULL, e); } } From owner-p4-projects@FreeBSD.ORG Thu Nov 1 09:28:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A0A816A41A; Thu, 1 Nov 2007 09:28:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21C4816A418 for ; Thu, 1 Nov 2007 09:28:11 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3A6513C48D for ; Thu, 1 Nov 2007 09:28:10 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA19SAmY026767 for ; Thu, 1 Nov 2007 09:28:10 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA19SAmp026764 for perforce@freebsd.org; Thu, 1 Nov 2007 09:28:10 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 1 Nov 2007 09:28:10 GMT Message-Id: <200711010928.lA19SAmp026764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 128453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2007 09:28:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=128453 Change 128453 by zec@zec_tpx32 on 2007/11/01 09:27:42 Set / clear vnet context in ng_callout_trampoline(), which is timer driven and as such has no vnet context on entry. Affected files ... .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#22 edit Differences ... ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#22 (text+ko) ==== @@ -3867,7 +3867,9 @@ { item_p item = arg; + CURVNET_SET(NGI_NODE(item)->nd_vnet); ng_snd_item(item, 0); + CURVNET_RESTORE(); } From owner-p4-projects@FreeBSD.ORG Thu Nov 1 21:50:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE2B016A475; Thu, 1 Nov 2007 21:50:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E469116A421 for ; Thu, 1 Nov 2007 21:50:41 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D12B813C4B5 for ; Thu, 1 Nov 2007 21:50:41 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA1Lofpl023967 for ; Thu, 1 Nov 2007 21:50:41 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA1Lof9v023964 for perforce@freebsd.org; Thu, 1 Nov 2007 21:50:41 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 1 Nov 2007 21:50:41 GMT Message-Id: <200711012150.lA1Lof9v023964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 128481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2007 21:50:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=128481 Change 128481 by zec@zec_tpx32 on 2007/11/01 21:50:14 "vimage -l" now lists only direct children vimages, while "vimage -lr" traverses the entire hierarchy bellow the current position. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#55 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#50 edit .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#8 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#55 (text+ko) ==== @@ -503,19 +503,21 @@ static struct vimage * -vimage_get_next(struct vimage *top, struct vimage *where) +vimage_get_next(struct vimage *top, struct vimage *where, int recurse) { struct vimage *next; - /* Try to go deeper in the hierarchy */ - next = LIST_FIRST(&where->vi_child_head); - if (next != NULL) - return(next); + if (recurse) { + /* Try to go deeper in the hierarchy */ + next = LIST_FIRST(&where->vi_child_head); + if (next != NULL) + return(next); + } do { /* Try to find next sibling */ next = LIST_NEXT(where, vi_sibling); - if (next != NULL) + if (!recurse || next != NULL) return(next); /* Nothing left on this level, go one level up */ @@ -547,12 +549,17 @@ if (vip_r != NULL && vi_req->req_action & VI_CREATE) return (EADDRINUSE); if (vi_req->req_action == VI_GETNEXT) { - vip_r = vimage_get_next(vip, vip_r); + vip_r = vimage_get_next(vip, vip_r, 0); + if (vip_r == NULL) + return (ESRCH); + } + if (vi_req->req_action == VI_GETNEXT_RECURSE) { + vip_r = vimage_get_next(vip, vip_r, 1); if (vip_r == NULL) return (ESRCH); } - if (vip_r && !vi_child_of(vip, vip_r) && /* XXX delete the rest! */ + if (vip_r && !vi_child_of(vip, vip_r) && /* XXX delete the rest? */ vi_req->req_action != VI_GET && vi_req->req_action != VI_GETNEXT) return (EPERM); ==== //depot/projects/vimage/src/sys/sys/vimage.h#50 (text+ko) ==== @@ -483,6 +483,7 @@ #define VI_GET 0x00000100 #define VI_GETNEXT 0x00000200 +#define VI_GETNEXT_RECURSE 0x00000300 #define VI_SET_CPU_MIN 0x00001000 #define VI_SET_CPU_MAX 0x00002000 ==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#8 (text+ko) ==== @@ -128,7 +128,12 @@ if (argc == 2 && strcmp(argv[1], "-l") == 0) { strcpy(vi_req.vi_name, "."); - cmd = VI_GETNEXT; /* here this means walk! */ + cmd = VI_GETNEXT; + } + + if (argc == 2 && strcmp(argv[1], "-lr") == 0) { + strcpy(vi_req.vi_name, "."); + cmd = VI_GETNEXT_RECURSE; } if (argc == 3) { @@ -164,13 +169,16 @@ exit(0); case VI_GETNEXT: + case VI_GETNEXT_RECURSE: vi_req.req_action = VI_GET; if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; vi_print(&vi_req); - vi_req.req_action = VI_GETNEXT; - while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0) + vi_req.req_action = VI_GETNEXT_RECURSE; + while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0) { vi_print(&vi_req); + vi_req.req_action = cmd; + } exit(0); case VI_IFACE: From owner-p4-projects@FreeBSD.ORG Fri Nov 2 01:21:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC43A16A41A; Fri, 2 Nov 2007 01:21:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9744416A418 for ; Fri, 2 Nov 2007 01:21:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8214113C491 for ; Fri, 2 Nov 2007 01:21:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA21Lg00048994 for ; Fri, 2 Nov 2007 01:21:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA21LSUe048989 for perforce@freebsd.org; Fri, 2 Nov 2007 01:21:28 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 01:21:28 GMT Message-Id: <200711020121.lA21LSUe048989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 01:21:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=128492 Change 128492 by kmacy@freefall_kmacy_iwarp on 2007/11/02 01:21:18 IFethng 128359 Affected files ... .. //depot/projects/iwarp/Makefile#2 integrate .. //depot/projects/iwarp/Makefile.inc1#2 integrate .. //depot/projects/iwarp/ObsoleteFiles.inc#2 integrate .. //depot/projects/iwarp/UPDATING#2 integrate .. //depot/projects/iwarp/bin/ps/extern.h#2 integrate .. //depot/projects/iwarp/bin/ps/keyword.c#2 integrate .. //depot/projects/iwarp/bin/ps/print.c#2 integrate .. //depot/projects/iwarp/bin/ps/ps.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/l4check/l4check.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/lib/printstate.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/expected/in1#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/input/f11#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/regress/in1#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/iwarp/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/iwarp/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/iwarp/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/iwarp/contrib/libpcap/FILES#2 integrate .. //depot/projects/iwarp/contrib/libpcap/INSTALL#2 delete .. //depot/projects/iwarp/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/iwarp/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/libpcap/README.dag#2 integrate .. //depot/projects/iwarp/contrib/libpcap/TODO#2 integrate .. //depot/projects/iwarp/contrib/libpcap/VERSION#2 integrate .. //depot/projects/iwarp/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/iwarp/contrib/libpcap/configure#2 integrate .. //depot/projects/iwarp/contrib/libpcap/configure.in#2 integrate .. //depot/projects/iwarp/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/iwarp/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/iwarp/contrib/libpcap/inet.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/iwarp/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/iwarp/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/iwarp/contrib/libpcap/pf.h#2 delete .. //depot/projects/iwarp/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/iwarp/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/iwarp/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/iwarp/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/iwarp/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/iwarp/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/iwarp/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/FILES#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/README#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/af.c#1 branch .. //depot/projects/iwarp/contrib/tcpdump/af.h#1 branch .. //depot/projects/iwarp/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/configure#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/pf.h#2 delete .. //depot/projects/iwarp/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-bgp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/iwarp/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/iwarp/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/util.c#2 integrate .. //depot/projects/iwarp/contrib/tcsh/sh.c#2 integrate .. //depot/projects/iwarp/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/iwarp/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/iwarp/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/iwarp/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/iwarp/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/iwarp/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/iwarp/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/iwarp/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/iwarp/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/iwarp/etc/Makefile#2 integrate .. //depot/projects/iwarp/etc/cached.conf#2 delete .. //depot/projects/iwarp/etc/defaults/rc.conf#2 integrate .. //depot/projects/iwarp/etc/nscd.conf#1 branch .. //depot/projects/iwarp/etc/rc.d/Makefile#2 integrate .. //depot/projects/iwarp/etc/rc.d/amd#2 integrate .. //depot/projects/iwarp/etc/rc.d/kerberos#2 integrate .. //depot/projects/iwarp/etc/rc.d/named#2 integrate .. //depot/projects/iwarp/etc/rc.d/nfslocking#2 delete .. //depot/projects/iwarp/etc/rc.d/ppp#2 integrate .. //depot/projects/iwarp/etc/rc.d/sensorsd#2 delete .. //depot/projects/iwarp/etc/sensorsd.conf#2 delete .. //depot/projects/iwarp/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/iwarp/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/iwarp/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/iwarp/include/_ctype.h#2 integrate .. //depot/projects/iwarp/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/iwarp/lib/Makefile#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/iwarp/lib/libbsm/Makefile#2 integrate .. //depot/projects/iwarp/lib/libc/arm/Symbol.map#2 integrate .. //depot/projects/iwarp/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/iwarp/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/iwarp/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/iwarp/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/iwarp/lib/libc/net/nscache.c#2 integrate .. //depot/projects/iwarp/lib/libc/powerpc/Symbol.map#2 integrate .. //depot/projects/iwarp/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/iwarp/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/iwarp/lib/libelf/elf.3#2 integrate .. //depot/projects/iwarp/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/iwarp/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/iwarp/lib/libelf/elf_update.3#2 integrate .. //depot/projects/iwarp/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/iwarp/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/iwarp/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/iwarp/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/iwarp/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/iwarp/lib/libpam/modules/pam_unix/Makefile#2 integrate .. //depot/projects/iwarp/lib/libpcap/Makefile#2 integrate .. //depot/projects/iwarp/lib/libpcap/config.h#2 integrate .. //depot/projects/iwarp/lib/libstand/Makefile#2 integrate .. //depot/projects/iwarp/lib/libstand/tftp.c#2 integrate .. //depot/projects/iwarp/lib/libthr/libthr.3#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/iwarp/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/iwarp/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/iwarp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/iwarp/rescue/rescue/Makefile#2 integrate .. //depot/projects/iwarp/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/iwarp/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/iwarp/sbin/gpt/Makefile#2 integrate .. //depot/projects/iwarp/sbin/gpt/add.c#2 integrate .. //depot/projects/iwarp/sbin/gpt/boot.c#1 branch .. //depot/projects/iwarp/sbin/gpt/gpt.8#2 integrate .. //depot/projects/iwarp/sbin/gpt/gpt.c#2 integrate .. //depot/projects/iwarp/sbin/gpt/gpt.h#2 integrate .. //depot/projects/iwarp/sbin/gpt/show.c#2 integrate .. //depot/projects/iwarp/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/iwarp/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/iwarp/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/iwarp/sbin/mount/mount.8#2 integrate .. //depot/projects/iwarp/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/iwarp/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_barrier_destroy.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_barrierattr.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_detach.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_exit.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_once.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_spin_init.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_spin_lock.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_switch_add_np.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_testcancel.3#2 integrate .. //depot/projects/iwarp/share/man/man3/pthread_yield.3#2 integrate .. //depot/projects/iwarp/share/man/man4/Makefile#2 integrate .. //depot/projects/iwarp/share/man/man4/coretemp.4#2 integrate .. //depot/projects/iwarp/share/man/man4/it.4#2 delete .. //depot/projects/iwarp/share/man/man4/lm.4#2 delete .. //depot/projects/iwarp/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/iwarp/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/iwarp/share/man/man5/src.conf.5#2 integrate .. //depot/projects/iwarp/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/iwarp/share/man/man9/Makefile#2 integrate .. //depot/projects/iwarp/share/man/man9/kproc.9#1 branch .. //depot/projects/iwarp/share/man/man9/kthread.9#2 integrate .. //depot/projects/iwarp/share/man/man9/sensor_attach.9#2 delete .. //depot/projects/iwarp/share/misc/committers-doc.dot#2 integrate .. //depot/projects/iwarp/share/misc/committers-src.dot#2 integrate .. //depot/projects/iwarp/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/iwarp/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/iwarp/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/iwarp/share/mk/bsd.own.mk#2 integrate .. //depot/projects/iwarp/share/mk/bsd.symver.mk#2 integrate .. //depot/projects/iwarp/share/mk/sys.mk#2 integrate .. //depot/projects/iwarp/share/mk/version_gen.awk#2 integrate .. //depot/projects/iwarp/share/termcap/termcap.src#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/iwarp/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/iwarp/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/iwarp/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/iwarp/sys/amd64/include/clock.h#2 integrate .. //depot/projects/iwarp/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/iwarp/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/iwarp/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/iwarp/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/iwarp/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/iwarp/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/iwarp/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/iwarp/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/iwarp/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/iwarp/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/iwarp/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/iwarp/sys/arm/at91/std.at91#2 integrate .. //depot/projects/iwarp/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/iwarp/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/iwarp/sys/arm/include/armreg.h#2 integrate .. //depot/projects/iwarp/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/iwarp/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/iwarp/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/iwarp/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/iwarp/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/iwarp/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/iwarp/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/iwarp/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/iwarp/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/i386/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/iwarp/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/iwarp/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/iwarp/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/iwarp/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/iwarp/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/iwarp/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/iwarp/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/iwarp/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/iwarp/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/iwarp/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/iwarp/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/iwarp/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/iwarp/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/iwarp/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/iwarp/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/iwarp/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/iwarp/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/iwarp/sys/conf/files#2 integrate .. //depot/projects/iwarp/sys/conf/files.amd64#2 integrate .. //depot/projects/iwarp/sys/conf/files.arm#2 integrate .. //depot/projects/iwarp/sys/conf/files.i386#2 integrate .. //depot/projects/iwarp/sys/conf/files.ia64#2 integrate .. //depot/projects/iwarp/sys/conf/files.pc98#2 integrate .. //depot/projects/iwarp/sys/conf/files.powerpc#2 integrate .. //depot/projects/iwarp/sys/conf/files.sun4v#2 integrate .. //depot/projects/iwarp/sys/conf/options.arm#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/iwarp/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/iwarp/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/iwarp/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/iwarp/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/iwarp/sys/contrib/rdma/ib_addr.h#2 integrate .. //depot/projects/iwarp/sys/contrib/rdma/ib_sa.h#2 integrate .. //depot/projects/iwarp/sys/contrib/rdma/ib_umem.h#2 integrate .. //depot/projects/iwarp/sys/contrib/rdma/ib_user_verbs.h#2 integrate .. //depot/projects/iwarp/sys/contrib/rdma/ib_verbs.h#2 integrate .. //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#1 branch .. //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#1 branch .. //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#1 branch .. //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#1 branch .. //depot/projects/iwarp/sys/contrib/rdma/rdma_verbs.c#1 branch .. //depot/projects/iwarp/sys/ddb/db_examine.c#2 integrate .. //depot/projects/iwarp/sys/ddb/db_ps.c#2 integrate .. //depot/projects/iwarp/sys/dev/aac/aac.c#2 integrate .. //depot/projects/iwarp/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/iwarp/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/iwarp/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/iwarp/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/iwarp/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/iwarp/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/iwarp/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/iwarp/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/iwarp/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/iwarp/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/iwarp/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_dbg.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.h#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cq.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_ev.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_mem.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_user.h#1 branch .. //depot/projects/iwarp/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/iwarp/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/iwarp/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/iwarp/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/iwarp/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/iwarp/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/iwarp/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/iwarp/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/iwarp/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/iwarp/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/iwarp/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/iwarp/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/iwarp/sys/dev/it/it.c#2 delete .. //depot/projects/iwarp/sys/dev/it/itvar.h#2 delete .. //depot/projects/iwarp/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/iwarp/sys/dev/lm/lm78.c#2 delete .. //depot/projects/iwarp/sys/dev/lm/lm78_isa.c#2 delete .. //depot/projects/iwarp/sys/dev/lm/lm78var.h#2 delete .. //depot/projects/iwarp/sys/dev/md/md.c#2 integrate .. //depot/projects/iwarp/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/iwarp/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/iwarp/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/iwarp/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/iwarp/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/iwarp/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/iwarp/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/iwarp/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/iwarp/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/iwarp/sys/dev/random/harvest.c#2 integrate .. //depot/projects/iwarp/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/iwarp/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/iwarp/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/iwarp/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/iwarp/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/iwarp/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/iwarp/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/usb.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/iwarp/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/iwarp/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/iwarp/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/iwarp/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/iwarp/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/iwarp/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/iwarp/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/iwarp/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/iwarp/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/iwarp/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/iwarp/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/iwarp/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/iwarp/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/iwarp/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/iwarp/sys/geom/geom_io.c#2 integrate .. //depot/projects/iwarp/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/iwarp/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/iwarp/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/iwarp/sys/geom/part/g_part.c#2 integrate .. //depot/projects/iwarp/sys/geom/part/g_part.h#2 integrate .. //depot/projects/iwarp/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/iwarp/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/iwarp/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/iwarp/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/iwarp/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/iwarp/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/iwarp/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/iwarp/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/iwarp/sys/i386/bios/apm.c#2 integrate .. //depot/projects/iwarp/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/iwarp/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/iwarp/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/iwarp/sys/i386/conf/PAE#2 integrate .. //depot/projects/iwarp/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/msi.c#2 integrate .. //depot/projects/iwarp/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/iwarp/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/iwarp/sys/i386/include/clock.h#2 integrate .. //depot/projects/iwarp/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/iwarp/sys/i386/isa/clock.c#2 integrate .. //depot/projects/iwarp/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/iwarp/sys/kern/init_main.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_acct.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_alq.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_environment.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_exec.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_exit.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_fork.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_idle.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_intr.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_jail.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_linker.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_prot.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_sensors.c#2 delete .. //depot/projects/iwarp/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_sig.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_thread.c#2 integrate .. //depot/projects/iwarp/sys/kern/link_elf.c#2 integrate .. //depot/projects/iwarp/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/iwarp/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/iwarp/sys/kern/sched_ule.c#2 integrate .. //depot/projects/iwarp/sys/kern/subr_param.c#2 integrate .. //depot/projects/iwarp/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/iwarp/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/iwarp/sys/kern/sys_socket.c#2 integrate .. //depot/projects/iwarp/sys/kern/syscalls.master#2 integrate .. //depot/projects/iwarp/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/iwarp/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/iwarp/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/iwarp/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/iwarp/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/iwarp/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/iwarp/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/iwarp/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/iwarp/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/iwarp/sys/modules/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/geom/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/it/Makefile#2 delete .. //depot/projects/iwarp/sys/modules/lm/Makefile#2 delete .. //depot/projects/iwarp/sys/modules/nvram/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/rdma/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/uchcom/Makefile#1 branch .. //depot/projects/iwarp/sys/net/bpf.c#2 integrate .. //depot/projects/iwarp/sys/net/bpf.h#2 integrate .. //depot/projects/iwarp/sys/net/bsd_comp.c#2 integrate .. //depot/projects/iwarp/sys/net/ethernet.h#2 integrate .. //depot/projects/iwarp/sys/net/if.c#2 integrate .. //depot/projects/iwarp/sys/net/if_arp.h#2 integrate .. //depot/projects/iwarp/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/iwarp/sys/net/if_bridge.c#2 integrate .. //depot/projects/iwarp/sys/net/if_disc.c#2 integrate .. //depot/projects/iwarp/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/iwarp/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/iwarp/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/iwarp/sys/net/if_gif.c#2 integrate .. //depot/projects/iwarp/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/iwarp/sys/net/if_lagg.c#2 integrate .. //depot/projects/iwarp/sys/net/if_loop.c#2 integrate .. //depot/projects/iwarp/sys/net/if_ppp.c#2 integrate .. //depot/projects/iwarp/sys/net/if_stf.c#2 integrate .. //depot/projects/iwarp/sys/net/if_tun.c#2 integrate .. //depot/projects/iwarp/sys/net/if_vlan.c#2 integrate .. //depot/projects/iwarp/sys/net/route.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/iwarp/sys/netatalk/aarp.c#2 integrate .. //depot/projects/iwarp/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/iwarp/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/iwarp/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/iwarp/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/iwarp/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/iwarp/sys/netinet/if_ether.c#2 integrate .. //depot/projects/iwarp/sys/netinet/igmp.c#2 integrate .. //depot/projects/iwarp/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip.h#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_input.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_options.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_output.c#2 integrate .. //depot/projects/iwarp/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/iwarp/sys/netinet/sctputil.c#2 integrate .. //depot/projects/iwarp/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/iwarp/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/iwarp/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/iwarp/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/iwarp/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/iwarp/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/iwarp/sys/netinet6/nd6.c#2 integrate .. //depot/projects/iwarp/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/iwarp/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/iwarp/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/iwarp/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/iwarp/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/iwarp/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/iwarp/sys/pci/intpm.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit.c#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit.h#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/iwarp/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/iwarp/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/iwarp/sys/sys/apm.h#2 integrate .. //depot/projects/iwarp/sys/sys/gpt.h#2 integrate .. //depot/projects/iwarp/sys/sys/kthread.h#2 integrate .. //depot/projects/iwarp/sys/sys/linker.h#2 integrate .. //depot/projects/iwarp/sys/sys/linux_atomic.h#1 branch .. //depot/projects/iwarp/sys/sys/linux_compat.h#2 integrate .. //depot/projects/iwarp/sys/sys/linux_pci.h#1 branch .. //depot/projects/iwarp/sys/sys/param.h#2 integrate .. //depot/projects/iwarp/sys/sys/pciio.h#2 integrate .. //depot/projects/iwarp/sys/sys/priv.h#2 integrate .. //depot/projects/iwarp/sys/sys/proc.h#2 integrate .. //depot/projects/iwarp/sys/sys/sensors.h#2 delete .. //depot/projects/iwarp/sys/sys/sysctl.h#2 integrate .. //depot/projects/iwarp/sys/sys/vnode.h#2 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/iwarp/sys/vm/swap_pager.c#2 integrate .. //depot/projects/iwarp/sys/vm/vm_map.c#2 integrate .. //depot/projects/iwarp/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/iwarp/sys/vm/vm_object.c#2 integrate .. //depot/projects/iwarp/sys/vm/vm_page.c#2 integrate .. //depot/projects/iwarp/sys/vm/vm_param.h#2 integrate .. //depot/projects/iwarp/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/iwarp/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/iwarp/tools/build/options/WITHOUT_NS_CACHING#2 integrate .. //depot/projects/iwarp/tools/regression/geom_eli/init-a.t#2 integrate .. //depot/projects/iwarp/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/iwarp/tools/regression/geom_eli/integrity-copy.t#2 integrate .. //depot/projects/iwarp/tools/regression/geom_eli/integrity-data.t#2 integrate .. //depot/projects/iwarp/tools/regression/geom_eli/integrity-hmac.t#2 integrate .. //depot/projects/iwarp/tools/regression/geom_eli/onetime-a.t#2 integrate .. //depot/projects/iwarp/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/iwarp/usr.bin/awk/Makefile#2 integrate .. //depot/projects/iwarp/usr.bin/awk/lib.c.diff#2 delete .. //depot/projects/iwarp/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/iwarp/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/iwarp/usr.bin/fmt/fmt.c#2 integrate .. //depot/projects/iwarp/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/iwarp/usr.bin/locate/locate/locate.rc#2 integrate .. //depot/projects/iwarp/usr.bin/locate/locate/updatedb.sh#2 integrate .. //depot/projects/iwarp/usr.bin/makewhatis/makewhatis.c#2 integrate .. //depot/projects/iwarp/usr.bin/netstat/sctp.c#2 integrate .. //depot/projects/iwarp/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/iwarp/usr.bin/nfsstat/nfsstat.c#2 integrate .. //depot/projects/iwarp/usr.bin/su/su.c#2 integrate .. //depot/projects/iwarp/usr.bin/systat/Makefile#2 integrate .. //depot/projects/iwarp/usr.bin/systat/cmdtab.c#2 integrate .. //depot/projects/iwarp/usr.bin/systat/extern.h#2 integrate .. //depot/projects/iwarp/usr.bin/systat/sensors.c#2 delete .. //depot/projects/iwarp/usr.bin/systat/systat.1#2 integrate .. //depot/projects/iwarp/usr.bin/tail/read.c#2 integrate .. //depot/projects/iwarp/usr.bin/top/machine.c#2 integrate .. //depot/projects/iwarp/usr.sbin/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/iwarp/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/iwarp/usr.sbin/adduser/rmuser.sh#2 integrate .. //depot/projects/iwarp/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/iwarp/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/iwarp/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/iwarp/usr.sbin/sensorsd/Makefile#2 delete .. //depot/projects/iwarp/usr.sbin/sensorsd/sensorsd.8#2 delete .. //depot/projects/iwarp/usr.sbin/sensorsd/sensorsd.c#2 delete .. //depot/projects/iwarp/usr.sbin/sensorsd/sensorsd.conf.5#2 delete .. //depot/projects/iwarp/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/tcpdump/tcpdump/config.h#2 integrate .. //depot/projects/iwarp/usr.sbin/traceroute6/traceroute6.c#2 integrate .. //depot/projects/iwarp/usr.sbin/wpa/hostapd/hostapd.8#2 integrate .. //depot/projects/iwarp/usr.sbin/wpa/l2_packet.c#2 integrate Differences ... ==== //depot/projects/iwarp/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $ +# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ # # The user-driven targets are: # @@ -147,14 +147,14 @@ .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} .if exists(${BW_CANONICALOBJDIR}/) -rm -rf ${BW_CANONICALOBJDIR}/* - chflags -R 0 ${BW_CANONICALOBJDIR} + -chflags -R 0 ${BW_CANONICALOBJDIR} rm -rf ${BW_CANONICALOBJDIR}/* .endif # To be safe in this case, fall back to a 'make cleandir' ${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir .else -rm -rf ${.OBJDIR}/* - chflags -R 0 ${.OBJDIR} + -chflags -R 0 ${.OBJDIR} rm -rf ${.OBJDIR}/* .endif ==== //depot/projects/iwarp/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.588 2007/10/09 23:31:09 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -578,7 +578,12 @@ date echo egrep find grep install-info \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ - cp `which $$prog` ${INSTALLTMP}; \ + if progpath=`which $$prog`; then \ + cp $$progpath ${INSTALLTMP}; \ + else \ + echo "Required install tool $$prog not found" >&2; \ + exit 1; \ + fi; \ done ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} ==== //depot/projects/iwarp/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd +OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached @@ -579,11 +581,17 @@ # 20070201: remove libmytinfo link OLD_FILES+=usr/lib/libmytinfo.a OLD_FILES+=usr/lib/libmytinfo.so -OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfow.a +OLD_FILES+=usr/lib/libmytinfow.so +OLD_FILES+=usr/lib/libmytinfow_p.a .if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libmytinfo.a OLD_FILES+=usr/lib32/libmytinfo.so OLD_FILES+=usr/lib32/libmytinfo_p.a +OLD_FILES+=usr/lib32/libmytinfow.a +OLD_FILES+=usr/lib32/libmytinfow.so +OLD_FILES+=usr/lib32/libmytinfow_p.a .endif # 20070128: remove vnconfig OLD_FILES+=usr/sbin/vnconfig ==== //depot/projects/iwarp/UPDATING#2 (text+ko) ==== @@ -21,6 +21,27 @@ developers choose to disable these features on build machines to maximize performance. +20071024: + It has been decided that it is desirable to provide ABI + backwards compatibility to the FreeBSD 4/5/6 versions of the + PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was + broken with the introduction of PCI domain support (see the + 20070930 entry). Unfortunately, this required the ABI of + PCIOCGETCONF to be broken again in order to be able to + provide backwards compatibility to the old version of that + IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled + again. As for prominent ports this affects neither pciutils + nor xorg-server this time, the hal port needs to be rebuilt + however. + +20071020: + The misnamed kthread_create() and friends have been renamed + to kproc_create() etc. Many of the callers already + used kproc_start().. + I will return kthread_create() and friends in a while + with implementations that actually create threads, not procs. + Renaming corresponds with version 800002. + 20071010: RELENG_7 branched. @@ -913,4 +934,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $ +$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $ ==== //depot/projects/iwarp/bin/ps/extern.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $ */ struct kinfo; @@ -39,7 +39,7 @@ extern int cflag, eval, fscale, nlistread, rawcpu; extern unsigned long mempages; extern time_t now; -extern int sumrusage, termwidth, totwidth; +extern int showthreads, sumrusage, termwidth, totwidth; extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS @@ -78,6 +78,7 @@ void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); ==== //depot/projects/iwarp/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $"); #include #include @@ -187,6 +187,8 @@ UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, + {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, + NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 2 01:31:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EF1716A420; Fri, 2 Nov 2007 01:31:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 168CB16A419 for ; Fri, 2 Nov 2007 01:31:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01DD213C465 for ; Fri, 2 Nov 2007 01:31:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA21VrTA049495 for ; Fri, 2 Nov 2007 01:31:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA21VqYU049492 for perforce@freebsd.org; Fri, 2 Nov 2007 01:31:52 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 01:31:52 GMT Message-Id: <200711020131.lA21VqYU049492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128493 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 01:31:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=128493 Change 128493 by kmacy@freefall_kmacy_iwarp on 2007/11/02 01:31:35 IFtoestack #128449 Affected files ... .. //depot/projects/iwarp/sys/amd64/conf/MULTIQ#2 integrate .. //depot/projects/iwarp/sys/conf/files#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/toecore/toedev.h#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/iwarp/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/iwarp/sys/net/if.h#2 integrate .. //depot/projects/iwarp/sys/net/route.c#3 integrate .. //depot/projects/iwarp/sys/net/route.h#2 integrate .. //depot/projects/iwarp/sys/netinet/if_ether.c#3 integrate .. //depot/projects/iwarp/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/iwarp/sys/netinet/tcp_ofld.c#1 branch .. //depot/projects/iwarp/sys/netinet/tcp_ofld.h#1 branch .. //depot/projects/iwarp/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/iwarp/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/iwarp/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/iwarp/sys/sys/param.h#3 integrate .. //depot/projects/iwarp/sys/sys/socket.h#2 integrate Differences ... ==== //depot/projects/iwarp/sys/amd64/conf/MULTIQ#2 (text+ko) ==== @@ -80,6 +80,8 @@ # CPU frequency control device cpufreq +options HWPMC_HOOKS + # Bus support. device acpi device pci ==== //depot/projects/iwarp/sys/conf/files#3 (text+ko) ==== @@ -1893,6 +1893,7 @@ netinet/tcp_timer.c optional inet netinet/tcp_timewait.c optional inet netinet/tcp_usrreq.c optional inet +netinet/tcp_ofld.c optional inet netinet/udp_usrreq.c optional inet netinet/libalias/alias.c optional libalias | netgraph_nat netinet/libalias/alias_db.c optional libalias | netgraph_nat ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_adapter.h#3 (text+ko) ==== @@ -151,11 +151,9 @@ #define RSPQ_Q_SIZE 1024 #define TX_ETH_Q_SIZE 1024 -/* - * Types of Tx queues in each queue set. Order here matters, do not change. - * XXX TOE is not implemented yet, so the extra queues are just placeholders. - */ -enum { TXQ_ETH, TXQ_OFLD, TXQ_CTRL }; +enum { TXQ_ETH = 0, + TXQ_OFLD = 1, + TXQ_CTRL = 2, }; /* careful, the following are set on priv_flags and must not collide with ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ #define VLAN_NONE 0xfff #define SDL(s) ((struct sockaddr_dl *)s) -#define RT_ENADDR(rt) ((u_char *)LLADDR(SDL((rt)))) +#define RT_ENADDR(sa) ((u_char *)LLADDR(SDL((sa)))) #define rt_expire rt_rmx.rmx_expire struct llinfo_arp { @@ -103,11 +103,8 @@ RT_ADDREF(rt); RT_UNLOCK(rt); - if (e->neigh) { - RT_LOCK(e->neigh); - RT_REMREF(e->neigh); - RT_UNLOCK(e->neigh); - } + if (e->neigh) + RTFREE(e->neigh); e->neigh = rt; } @@ -130,13 +127,14 @@ * XXX MH_ALIGN */ req = mtod(m, struct cpl_l2t_write_req *); + m->m_pkthdr.len = m->m_len = sizeof(*req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_L2T_WRITE_REQ, e->idx)); req->params = htonl(V_L2T_W_IDX(e->idx) | V_L2T_W_IFF(e->smt_idx) | V_L2T_W_VLAN(e->vlan & EVL_VLID_MASK) | V_L2T_W_PRIO(vlan_prio(e))); - memcpy(e->dmac, RT_ENADDR(e->neigh), sizeof(e->dmac)); memcpy(req->dst_mac, e->dmac, sizeof(req->dst_mac)); m_set_priority(m, CPL_PRIORITY_CONTROL); cxgb_ofld_send(dev, m); @@ -172,17 +170,14 @@ struct l2t_entry *e) { struct rtentry *rt; - struct mbuf *m0; - if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) - return (ENOMEM); - rt = e->neigh; + printf("send slow on rt=%p\n", rt); again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), e->dmac); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) e->state = L2T_STATE_VALID; @@ -197,9 +192,8 @@ } arpq_enqueue(e, m); mtx_unlock(&e->lock); - - if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) - return (ENOMEM); + printf("enqueueing arp request\n"); + /* * Only the first packet added to the arpq should kick off * resolution. However, because the m_gethdr below can fail, @@ -208,7 +202,10 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - if (arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)) == 0) { + printf("doing arpresolve\n"); + if (arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), e->dmac) == 0) { + if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) + return (ENOMEM); mtx_lock(&e->lock); if (e->arpq_head) @@ -216,7 +213,8 @@ else m_freem(m); mtx_unlock(&e->lock); - } + } else + printf("arpresolve returned non-zero\n"); } return 0; } @@ -234,7 +232,7 @@ again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), e->dmac); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) { e->state = L2T_STATE_VALID; @@ -261,7 +259,7 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), e->dmac); } return; @@ -301,6 +299,7 @@ } e->state = L2T_STATE_UNUSED; } + return e; } @@ -318,19 +317,21 @@ void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e) { + struct rtentry *rt = NULL; + mtx_lock(&e->lock); if (atomic_load_acq_int(&e->refcnt) == 0) { /* hasn't been recycled */ - if (e->neigh) { - RT_LOCK(e->neigh); - RT_REMREF(e->neigh); - RT_UNLOCK(e->neigh); - e->neigh = NULL; - } + rt = e->neigh; + e->neigh = NULL; } + mtx_unlock(&e->lock); atomic_add_int(&d->nfree, 1); + if (rt) + RTFREE(rt); } + /* * Update an L2T entry that was previously used for the same next hop as neigh. * Must be called with softirqs disabled. @@ -346,7 +347,7 @@ if (neigh != e->neigh) neigh_replace(e, neigh); - if (memcmp(e->dmac, RT_ENADDR(neigh), sizeof(e->dmac)) || + if (memcmp(e->dmac, RT_ENADDR(neigh->rt_gateway), sizeof(e->dmac)) || (neigh->rt_expire > time_uptime)) e->state = L2T_STATE_RESOLVING; else if (la->la_hold == NULL) @@ -379,14 +380,20 @@ /* Need to allocate a new entry */ e = alloc_l2e(d); if (e) { + printf("initializing new entry\n"); + mtx_lock(&e->lock); /* avoid race with t3_l2t_free */ e->next = d->l2tab[hash].first; d->l2tab[hash].first = e; + rw_wunlock(&d->lock); + e->state = L2T_STATE_RESOLVING; e->addr = addr; e->ifindex = ifidx; e->smt_idx = smt_idx; atomic_store_rel_int(&e->refcnt, 1); + e->neigh = NULL; + neigh_replace(e, neigh); #ifdef notyet /* @@ -398,7 +405,10 @@ #endif e->vlan = VLAN_NONE; mtx_unlock(&e->lock); + + return (e); } + done: rw_wunlock(&d->lock); return e; @@ -433,11 +443,6 @@ } -#if defined(NETEVENT) || !defined(CONFIG_CHELSIO_T3_MODULE) -/* - * Called when the host's ARP layer makes a change to some entry that is - * loaded into the HW L2 table. - */ void t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh) { @@ -448,7 +453,11 @@ int ifidx = neigh->rt_ifp->if_index; int hash = arp_hash(addr, ifidx, d); struct llinfo_arp *la; + u_char edst[ETHER_ADDR_LEN]; + + arpresolve(neigh->rt_ifp, neigh, NULL, rt_key(neigh), edst); + rw_rlock(&d->lock); for (e = d->l2tab[hash].first; e; e = e->next) if (e->addr == addr && e->ifindex == ifidx) { @@ -460,6 +469,8 @@ found: rw_runlock(&d->lock); + memcpy(e->dmac, edst, ETHER_ADDR_LEN); + if (atomic_load_acq_int(&e->refcnt)) { if (neigh != e->neigh) neigh_replace(e, neigh); @@ -470,12 +481,11 @@ if (la->la_asked >= 5 /* arp_maxtries */) { arpq = e->arpq_head; e->arpq_head = e->arpq_tail = NULL; - } else if (la->la_hold == NULL) + } else setup_l2e_send_pending(dev, NULL, e); } else { - e->state = (la->la_hold == NULL) ? - L2T_STATE_VALID : L2T_STATE_STALE; - if (memcmp(e->dmac, RT_ENADDR(neigh), 6)) + e->state = L2T_STATE_VALID; + if (memcmp(e->dmac, RT_ENADDR(neigh->rt_gateway), 6)) setup_l2e_send_pending(dev, NULL, e); } } @@ -484,72 +494,7 @@ if (arpq) handle_failed_resolution(dev, arpq); } -#else -/* - * Called from a kprobe, interrupts are off. - */ -void -t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh) -{ - struct l2t_entry *e; - struct l2t_data *d = L2DATA(dev); - u32 addr = *(u32 *) rt_key(neigh); - int ifidx = neigh->dev->ifindex; - int hash = arp_hash(addr, ifidx, d); - - rw_rlock(&d->lock); - for (e = d->l2tab[hash].first; e; e = e->next) - if (e->addr == addr && e->ifindex == ifidx) { - mtx_lock(&e->lock); - if (atomic_load_acq_int(&e->refcnt)) { - if (neigh != e->neigh) - neigh_replace(e, neigh); - e->tdev = dev; - mod_timer(&e->update_timer, jiffies + 1); - } - mtx_unlock(&e->lock); - break; - } - rw_runlock(&d->lock); -} - -static void -update_timer_cb(unsigned long data) -{ - struct mbuf *arpq = NULL; - struct l2t_entry *e = (struct l2t_entry *)data; - struct rtentry *neigh = e->neigh; - struct t3cdev *dev = e->tdev; - barrier(); - if (!atomic_load_acq_int(&e->refcnt)) - return; - - rw_rlock(&neigh->lock); - mtx_lock(&e->lock); - - if (atomic_load_acq_int(&e->refcnt)) { - if (e->state == L2T_STATE_RESOLVING) { - if (neigh->nud_state & NUD_FAILED) { - arpq = e->arpq_head; - e->arpq_head = e->arpq_tail = NULL; - } else if (neigh_is_connected(neigh) && e->arpq_head) - setup_l2e_send_pending(dev, NULL, e); - } else { - e->state = neigh_is_connected(neigh) ? - L2T_STATE_VALID : L2T_STATE_STALE; - if (memcmp(e->dmac, RT_ENADDR(neigh), sizeof(e->dmac))) - setup_l2e_send_pending(dev, NULL, e); - } - } - mtx_unlock(&e->lock); - rw_runlock(&neigh->lock); - - if (arpq) - handle_failed_resolution(dev, arpq); -} -#endif - struct l2t_data * t3_init_l2t(unsigned int l2t_capacity) { @@ -570,12 +515,6 @@ d->l2tab[i].state = L2T_STATE_UNUSED; mtx_init(&d->l2tab[i].lock, "L2TAB", NULL, MTX_DEF); atomic_store_rel_int(&d->l2tab[i].refcnt, 0); -#ifndef NETEVENT -#ifdef CONFIG_CHELSIO_T3_MODULE - setup_timer(&d->l2tab[i].update_timer, update_timer_cb, - (unsigned long)&d->l2tab[i]); -#endif -#endif } return d; } @@ -583,86 +522,6 @@ void t3_free_l2t(struct l2t_data *d) { -#ifndef NETEVENT -#ifdef CONFIG_CHELSIO_T3_MODULE - int i; - - /* Stop all L2T timers */ - for (i = 0; i < d->nentries; ++i) - del_timer_sync(&d->l2tab[i].update_timer); -#endif -#endif cxgb_free_mem(d); } -#ifdef CONFIG_PROC_FS -#include -#include -#include - -static inline void * -l2t_get_idx(struct seq_file *seq, loff_t pos) -{ - struct l2t_data *d = seq->private; - - return pos >= d->nentries ? NULL : &d->l2tab[pos]; -} - -static void * -l2t_seq_start(struct seq_file *seq, loff_t *pos) -{ - return *pos ? l2t_get_idx(seq, *pos) : SEQ_START_TOKEN; -} - -static void * -l2t_seq_next(struct seq_file *seq, void *v, loff_t *pos) -{ - v = l2t_get_idx(seq, *pos + 1); - if (v) - ++*pos; - return v; -} - -static void -l2t_seq_stop(struct seq_file *seq, void *v) -{ -} - -static char -l2e_state(const struct l2t_entry *e) -{ - switch (e->state) { - case L2T_STATE_VALID: return 'V'; /* valid, fast-path entry */ - case L2T_STATE_STALE: return 'S'; /* needs revalidation, but usable */ - case L2T_STATE_RESOLVING: - return e->arpq_head ? 'A' : 'R'; - default: - return 'U'; - } -} - -static int -l2t_seq_show(struct seq_file *seq, void *v) -{ - if (v == SEQ_START_TOKEN) - seq_puts(seq, "Index IP address Ethernet address VLAN " - "Prio State Users SMTIDX Port\n"); - else { - char ip[20]; - struct l2t_entry *e = v; - - mtx_lock(&e->lock); - sprintf(ip, "%u.%u.%u.%u", NIPQUAD(e->addr)); - seq_printf(seq, "%-5u %-15s %02x:%02x:%02x:%02x:%02x:%02x %4d" - " %3u %c %7u %4u %s\n", - e->idx, ip, e->dmac[0], e->dmac[1], e->dmac[2], - e->dmac[3], e->dmac[4], e->dmac[5], - e->vlan & EVL_VLID_MASK, vlan_prio(e), - l2e_state(e), atomic_load_acq_int(&e->refcnt), e->smt_idx, - e->neigh ? e->neigh->dev->name : ""); - mtx_unlock(&e->lock); - } - return 0; -} - -#endif ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.h#3 (text+ko) ==== @@ -76,12 +76,6 @@ struct mtx lock; volatile uint32_t refcnt; /* entry reference count */ uint8_t dmac[6]; /* neighbour's MAC address */ -#ifndef NETEVENT -#ifdef CONFIG_CHELSIO_T3_MODULE - struct timer_list update_timer; - struct t3cdev *tdev; -#endif -#endif }; struct l2t_data { @@ -95,6 +89,9 @@ typedef void (*arp_failure_handler_func)(struct t3cdev *dev, struct mbuf *m); +typedef void (*opaque_arp_failure_handler_func)(void *dev, + struct mbuf *m); + /* * Callback stored in an skb to handle address resolution failure. */ @@ -111,10 +108,10 @@ static __inline void set_arp_failure_handler(struct mbuf *m, arp_failure_handler_func hnd) { -#if 0 - L2T_SKB_CB(skb)->arp_failure_handler = hnd; -#endif - panic("implement me"); + struct toe_mbuf *tm = (struct toe_mbuf *)m; + + tm->m_toe.mt_arp_fail = (opaque_arp_failure_handler_func)hnd; + } /* @@ -145,9 +142,14 @@ static inline int l2t_send(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { - if (__predict_true(e->state == L2T_STATE_VALID)) - return cxgb_ofld_send(dev, m); - return t3_l2t_send_slow(dev, m, e); + if (__predict_true(e->state == L2T_STATE_VALID)) { + printf ("l2t_entry state is valid\n"); + + return cxgb_ofld_send(dev, (struct mbuf *)m); + } + printf("send slow\n"); + + return t3_l2t_send_slow(dev, (struct mbuf *)m, e); } static inline void l2t_release(struct l2t_data *d, struct l2t_entry *e) ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#3 (text+ko) ==== @@ -120,10 +120,7 @@ static int cxgb_get_regs_len(void); static int offload_open(struct port_info *pi); static void touch_bars(device_t dev); - -#ifdef notyet static int offload_close(struct t3cdev *tdev); -#endif static device_method_t cxgb_controller_methods[] = { DEVMETHOD(device_probe, cxgb_controller_probe), @@ -694,14 +691,14 @@ bus_generic_detach(sc->dev); if (sc->tq != NULL) taskqueue_free(sc->tq); -#ifdef notyet if (is_offload(sc)) { cxgb_adapter_unofld(sc); if (isset(&sc->open_device_map, OFFLOAD_DEVMAP_BIT)) offload_close(&sc->tdev); - } -#endif - + else + printf("cxgb_free: DEVMAP_BIT not set\n"); + } else + printf("not offloading set\n"); #ifndef IFNET_MULTIQUEUE t3_free_sge_resources(sc); #endif @@ -1039,7 +1036,7 @@ ether_ifdetach(p->ifp); printf("waiting for callout to stop ..."); - DELAY(100000); + DELAY(1000000); printf("done\n"); /* * the lock may be acquired in ifdetach @@ -1289,9 +1286,7 @@ { int ret; - critical_enter(); ret = t3_offload_tx(tdev, m); - critical_exit(); return (ret); } @@ -1306,6 +1301,8 @@ return (ENOMEM); req = mtod(m, struct cpl_smt_write_req *); + m->m_pkthdr.len = m->m_len = sizeof(struct cpl_smt_write_req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SMT_WRITE_REQ, idx)); req->mtu_idx = NMTUS - 1; /* should be 0 but there's a T3 bug */ @@ -1592,6 +1589,8 @@ cxgb_teardown_msix(sc); ADAPTER_UNLOCK(sc); + callout_stop(&sc->cxgb_tick_ch); + callout_stop(&sc->sge_timer_ch); callout_drain(&sc->cxgb_tick_ch); callout_drain(&sc->sge_timer_ch); @@ -1606,15 +1605,22 @@ offload_open(struct port_info *pi) { struct adapter *adapter = pi->adapter; - struct t3cdev *tdev = T3CDEV(pi->ifp); + struct t3cdev *tdev = &adapter->tdev; +#ifdef notyet + T3CDEV(pi->ifp); +#endif int adap_up = adapter->open_device_map & PORT_MASK; int err = 0; + printf("device_map=0x%x\n", adapter->open_device_map); if (atomic_cmpset_int(&adapter->open_device_map, - (adapter->open_device_map & ~OFFLOAD_DEVMAP_BIT), - (adapter->open_device_map | OFFLOAD_DEVMAP_BIT)) == 0) + (adapter->open_device_map & ~(1<open_device_map | (1<open_device_map, OFFLOAD_DEVMAP_BIT)) + printf("offload_open: DEVMAP_BIT did not get set 0x%x\n", adapter->open_device_map); ADAPTER_LOCK(pi->adapter); if (!adap_up) err = cxgb_up(adapter); @@ -1623,7 +1629,7 @@ return (err); t3_tp_set_offload_mode(adapter, 1); - tdev->lldev = adapter->port[0].ifp; + tdev->lldev = pi->ifp; err = cxgb_offload_activate(adapter); if (err) goto out; @@ -1647,15 +1653,18 @@ } return (err); } -#ifdef notyet + static int offload_close(struct t3cdev *tdev) { struct adapter *adapter = tdev2adap(tdev); - if (!isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT)) + if (!isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT)) { + printf("offload_close: DEVMAP_BIT not set\n"); + return (0); - + } + /* Call back all registered clients */ cxgb_remove_clients(tdev); tdev->lldev = NULL; @@ -1663,13 +1672,15 @@ t3_tp_set_offload_mode(adapter, 0); clrbit(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT); + ADAPTER_LOCK(adapter); if (!adapter->open_device_map) - cxgb_down(adapter); - + cxgb_down_locked(adapter); + else + ADAPTER_UNLOCK(adapter); cxgb_offload_deactivate(adapter); return (0); } -#endif + static void cxgb_init(void *arg) @@ -1709,6 +1720,8 @@ if (err) log(LOG_WARNING, "Could not initialize offload capabilities\n"); + else + printf("offload opened\n"); } cxgb_link_start(p); t3_link_changed(sc, p->port_id); @@ -1752,7 +1765,6 @@ ADAPTER_LOCK(p->adapter); clrbit(&p->adapter->open_device_map, p->port_id); - if (p->adapter->open_device_map == 0) { cxgb_down_locked(p->adapter); } else @@ -1941,7 +1953,7 @@ struct sge_qset *qs; struct sge_txq *txq; struct port_info *p = ifp->if_softc; - int err, qsidx = 0; + int err; if (!p->link_config.link_ok) return (ENXIO); @@ -1950,10 +1962,7 @@ return (ENOBUFS); } - if (p->adapter->params.nports <= 2) - qsidx = p->first_qset; - - qs = &p->adapter->sge.qs[qsidx]; + qs = &p->adapter->sge.qs[p->first_qset]; txq = &qs->txq[TXQ_ETH]; err = 0; ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_multiq.c#3 (text+ko) ==== @@ -489,7 +489,7 @@ qs = &pi->adapter->sge.qs[qidx]; } else qs = &pi->adapter->sge.qs[pi->first_qset]; - + txq = &qs->txq[TXQ_ETH]; if (((sc->tunq_coalesce == 0) || (buf_ring_count(&txq->txq_mr) > TX_WR_COUNT_MAX)) && mtx_trylock(&txq->lock)) { @@ -638,9 +638,6 @@ int qidx; uint32_t tmp; - /* - * Will probably need to be changed for 4-port XXX - */ tmp = pi->tx_chan ? cookie : cookie & ((RSS_TABLE_SIZE>>1)-1); DPRINTF(" tmp=%d ", tmp); qidx = (tmp & (pi->nqsets -1)) + pi->first_qset; @@ -681,6 +678,7 @@ for (i = 0; i < sc->params.nports; i++) { struct port_info *pi = &sc->port[i]; int first = pi->first_qset; + for (j = 0; j < pi->nqsets; j++) { struct sge_qset *qs = &sc->sge.qs[first + j]; ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#3 (text+ko) ==== @@ -108,9 +108,14 @@ TAILQ_INSERT_TAIL(&client_list, client, client_entry); if (client->add) { - TAILQ_FOREACH(tdev, &ofld_dev_list, ofld_entry) { + printf("client->add set\n"); + + TAILQ_FOREACH(tdev, &ofld_dev_list, entry) { if (offload_activated(tdev)) client->add(tdev); + else + printf("%p not activated\n", tdev); + } } mtx_unlock(&cxgb_db_lock); @@ -132,7 +137,7 @@ TAILQ_REMOVE(&client_list, client, client_entry); if (client->remove) { - TAILQ_FOREACH(tdev, &ofld_dev_list, ofld_entry) { + TAILQ_FOREACH(tdev, &ofld_dev_list, entry) { if (offload_activated(tdev)) client->remove(tdev); } @@ -480,7 +485,7 @@ cxgb_set_dummy_ops(struct t3cdev *dev) { dev->recv = rx_offload_blackhole; - dev->neigh_update = dummy_neigh_update; + dev->arp_update = dummy_neigh_update; } /* @@ -539,6 +544,7 @@ m_set_priority(m, CPL_PRIORITY_SETUP); req = mtod(m, struct cpl_tid_release *); + m->m_pkthdr.len = m->m_len = sizeof(*req); req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, tid)); } @@ -818,6 +824,8 @@ } } + + static int do_set_tcb_rpl(struct t3cdev *dev, struct mbuf *m) { @@ -865,225 +873,57 @@ return (0); } -#if defined(FOO) -#include -#include -#include -#include - -static int (*orig_arp_constructor)(struct ifnet *); - static void -neigh_suspect(struct ifnet *neigh) +cxgb_route_event(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1) { - struct hh_cache *hh; + struct toedev *tdev0, *tdev1 = NULL; - neigh->output = neigh->ops->output; - - for (hh = neigh->hh; hh; hh = hh->hh_next) - hh->hh_output = neigh->ops->output; -} - -static void -neigh_connect(struct ifnet *neigh) -{ - struct hh_cache *hh; - - neigh->output = neigh->ops->connected_output; - - for (hh = neigh->hh; hh; hh = hh->hh_next) - hh->hh_output = neigh->ops->hh_output; -} - -static inline int -neigh_max_probes(const struct neighbour *n) -{ - const struct neigh_parms *p = n->parms; - return (n->nud_state & NUD_PROBE ? - p->ucast_probes : - p->ucast_probes + p->app_probes + p->mcast_probes); -} - -static void -neigh_timer_handler_offload(unsigned long arg) -{ - unsigned long now, next; - struct neighbour *neigh = (struct neighbour *)arg; - unsigned state; - int notify = 0; - - write_lock(&neigh->lock); - - state = neigh->nud_state; - now = jiffies; - next = now + HZ; - - if (!(state & NUD_IN_TIMER)) { -#ifndef CONFIG_SMP - log(LOG_WARNING, "neigh: timer & !nud_in_timer\n"); -#endif - goto out; + /* + * ignore events on non-offloaded interfaces + */ + + tdev0 = TOEDEV(rt0->rt_ifp); + if (rt1) + tdev1 = TOEDEV(rt1->rt_ifp); + if (tdev0 == NULL && tdev1 == NULL) + return; + /* + * avoid LORs by dropping the route lock but keeping a reference + * + */ + RT_ADDREF(rt0); + RT_UNLOCK(rt0); + if (rt1) { + RT_ADDREF(rt1); + RT_UNLOCK(rt1); } - if (state & NUD_REACHABLE) { - if (time_before_eq(now, - neigh->confirmed + - neigh->parms->reachable_time)) { - next = neigh->confirmed + neigh->parms->reachable_time; - } else if (time_before_eq(now, - neigh->used + - neigh->parms->delay_probe_time)) { - neigh->nud_state = NUD_DELAY; - neigh->updated = jiffies; - neigh_suspect(neigh); - next = now + neigh->parms->delay_probe_time; - } else { - neigh->nud_state = NUD_STALE; - neigh->updated = jiffies; - neigh_suspect(neigh); - cxgb_neigh_update(neigh); + switch (event) { + case RTEVENT_ARP_UPDATE: { + cxgb_neigh_update(rt0); + break; } - } else if (state & NUD_DELAY) { - if (time_before_eq(now, - neigh->confirmed + - neigh->parms->delay_probe_time)) { - neigh->nud_state = NUD_REACHABLE; - neigh->updated = jiffies; - neigh_connect(neigh); - cxgb_neigh_update(neigh); - next = neigh->confirmed + neigh->parms->reachable_time; - } else { - neigh->nud_state = NUD_PROBE; - neigh->updated = jiffies; - atomic_set_int(&neigh->probes, 0); - next = now + neigh->parms->retrans_time; + case RTEVENT_REDIRECT_UPDATE: { + cxgb_redirect(rt0, rt1); + cxgb_neigh_update(rt1); + + break; } - } else { - /* NUD_PROBE|NUD_INCOMPLETE */ - next = now + neigh->parms->retrans_time; + case RTEVENT_PMTU_UPDATE: + default: + break; } - /* - * Needed for read of probes - */ - mb(); - if ((neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) && - neigh->probes >= neigh_max_probes(neigh)) { - struct mbuf *m; - neigh->nud_state = NUD_FAILED; - neigh->updated = jiffies; - notify = 1; - cxgb_neigh_update(neigh); - NEIGH_CACHE_STAT_INC(neigh->tbl, res_failed); - - /* It is very thin place. report_unreachable is very - complicated routine. Particularly, it can hit the same - neighbour entry! - So that, we try to be accurate and avoid dead loop. --ANK - */ - while (neigh->nud_state == NUD_FAILED && - (skb = __skb_dequeue(&neigh->arp_queue)) != NULL) { - write_unlock(&neigh->lock); - neigh->ops->error_report(neigh, skb); - write_lock(&neigh->lock); - } - skb_queue_purge(&neigh->arp_queue); + RT_LOCK(rt0); + RT_REMREF(rt0); + if (rt1) { + RT_LOCK(rt1); + RT_REMREF(rt1); } - - if (neigh->nud_state & NUD_IN_TIMER) { - if (time_before(next, jiffies + HZ/2)) - next = jiffies + HZ/2; - if (!mod_timer(&neigh->timer, next)) - neigh_hold(neigh); - } - if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) { - struct mbuf *m = skb_peek(&neigh->arp_queue); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 2 04:53:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 162DA16A419; Fri, 2 Nov 2007 04:53:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B188C16A417 for ; Fri, 2 Nov 2007 04:53:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FCF613C491 for ; Fri, 2 Nov 2007 04:53:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA24rS7M076426 for ; Fri, 2 Nov 2007 04:53:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA24rSjX076423 for perforce@freebsd.org; Fri, 2 Nov 2007 04:53:28 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 04:53:28 GMT Message-Id: <200711020453.lA24rSjX076423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 04:53:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=128495 Change 128495 by kmacy@kmacy:storage:toestack on 2007/11/02 04:52:49 remove null tdev printf and redundant tdev==NULL check Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.c#4 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#4 (text+ko) ==== @@ -47,12 +47,10 @@ ifp = inp->inp_route.ro_rt->rt_ifp; tdev = TOEDEV(ifp); - if (tdev == NULL) { - printf("tdev not set for ifp=%p name=%s\n", ifp, if_name(ifp)); + if (tdev == NULL) return (EINVAL); - } - if ((tdev == NULL) || (tdev->can_offload(tdev, so) == 0)) { + if (tdev->can_offload(tdev, so) == 0) { printf("can't offload\n"); return (EINVAL); From owner-p4-projects@FreeBSD.ORG Fri Nov 2 04:54:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D2F216A41A; Fri, 2 Nov 2007 04:54:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5302F16A418 for ; Fri, 2 Nov 2007 04:54:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B6DB13C465 for ; Fri, 2 Nov 2007 04:54:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA24sT0V076480 for ; Fri, 2 Nov 2007 04:54:29 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA24sT2d076477 for perforce@freebsd.org; Fri, 2 Nov 2007 04:54:29 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 04:54:29 GMT Message-Id: <200711020454.lA24sT2d076477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 04:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=128496 Change 128496 by kmacy@kmacy:storage:toestack on 2007/11/02 04:54:03 add macros to overload pkthdr for offload operations Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#8 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#8 (text+ko) ==== @@ -68,6 +68,10 @@ #define m_get_priority(m) ((uintptr_t)(m)->m_pkthdr.rcvif) #define m_set_priority(m, pri) ((m)->m_pkthdr.rcvif = (struct ifnet *)((uintptr_t)pri)) +#define m_set_sgl(m, sgl) ((m)->m_pkthdr.header = (sgl)) +#define m_get_sgl(m) ((bus_dma_segment_t *)(m)->m_pkthdr.header) +#define m_set_sgllen(m, len) ((m)->m_pkthdr.ether_vtag = len) +#define m_get_sgllen(m) ((m)->m_pkthdr.ether_vtag) #if __FreeBSD_version > 700030 #define INTR_FILTERS From owner-p4-projects@FreeBSD.ORG Fri Nov 2 04:55:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D40E16A421; Fri, 2 Nov 2007 04:55:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45E3716A418 for ; Fri, 2 Nov 2007 04:55:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3530A13C4A3 for ; Fri, 2 Nov 2007 04:55:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA24tVl4076566 for ; Fri, 2 Nov 2007 04:55:31 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA24tVkg076561 for perforce@freebsd.org; Fri, 2 Nov 2007 04:55:31 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 04:55:31 GMT Message-Id: <200711020455.lA24tVkg076561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 04:55:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=128497 Change 128497 by kmacy@kmacy:storage:toestack on 2007/11/02 04:54:47 print the address of the mbuf we're discarding as it may be corrupted from use after free Affected files ... .. //depot/projects/toestack/sys/net/if_ethersubr.c#6 edit Differences ... ==== //depot/projects/toestack/sys/net/if_ethersubr.c#6 (text+ko) ==== @@ -684,7 +684,7 @@ etype = ntohs(eh->ether_type); if ((m->m_flags & M_PKTHDR) == 0) - if_printf(ifp, "discard frame w/o packet header\n"); + if_printf(ifp, "discard frame w/o packet header m=%p\n", m); if (m->m_len < ETHER_HDR_LEN) if_printf(ifp, "discard frame w/o leading ethernet " "header (len %u pkt len %u)\n", From owner-p4-projects@FreeBSD.ORG Fri Nov 2 04:56:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8199116A419; Fri, 2 Nov 2007 04:56:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4770F16A417 for ; Fri, 2 Nov 2007 04:56:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 370FD13C494 for ; Fri, 2 Nov 2007 04:56:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA24uXkm076603 for ; Fri, 2 Nov 2007 04:56:33 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA24uXfB076600 for perforce@freebsd.org; Fri, 2 Nov 2007 04:56:33 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 04:56:33 GMT Message-Id: <200711020456.lA24uXfB076600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 04:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=128498 Change 128498 by kmacy@kmacy:storage:toestack on 2007/11/02 04:55:31 add placeholder function for translating virtual sgl to bus sgl Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#6 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#6 (text+ko) ==== @@ -145,6 +145,12 @@ int busdma_map_sg_collapse(struct mbuf **m, bus_dma_segment_t *segs, int *nsegs); int busdma_map_sg_vec(struct mbuf **m, struct mbuf **mp, bus_dma_segment_t *segs, int count); +static __inline int busdma_map_sgl(bus_dma_segment_t *vsegs, bus_dma_segment_t *segs, int count) +{ + panic("BEEEWM!!!"); + +} + struct mbuf *mi_collapse_mbuf(struct mbuf_iovec *mi, struct mbuf *m); static __inline int From owner-p4-projects@FreeBSD.ORG Fri Nov 2 04:58:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECFB116A421; Fri, 2 Nov 2007 04:58:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DE9416A41A for ; Fri, 2 Nov 2007 04:58:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D43113C4AA for ; Fri, 2 Nov 2007 04:58:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA24wZcq076692 for ; Fri, 2 Nov 2007 04:58:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA24wZNN076689 for perforce@freebsd.org; Fri, 2 Nov 2007 04:58:35 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 04:58:35 GMT Message-Id: <200711020458.lA24wZNN076689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128499 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 04:58:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=128499 Change 128499 by kmacy@kmacy:storage:toestack on 2007/11/02 04:57:51 fix mtx_lock call to mtx_unlock validate toe_tid before dereferencing add some debug printfs Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#14 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#14 (text+ko) ==== @@ -502,7 +502,7 @@ p->next = t->afree; t->afree = p; t->atids_in_use--; - mtx_lock(&t->atid_lock); + mtx_unlock(&t->atid_lock); return ctx; } @@ -808,16 +808,22 @@ static int do_act_establish(struct t3cdev *dev, struct mbuf *m) { - struct cpl_act_establish *req = cplhdr(m); - unsigned int atid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); + struct cpl_act_establish *req; + unsigned int atid; struct toe_tid_entry *toe_tid; + req = cplhdr(m); + atid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); toe_tid = lookup_atid(&(T3C_DATA (dev))->tid_maps, atid); - if (toe_tid->ctx && toe_tid->client->handlers && + if (toe_tid && toe_tid->ctx && toe_tid->client->handlers && toe_tid->client->handlers[CPL_ACT_ESTABLISH]) { + printf("active establish callback\n"); + return toe_tid->client->handlers[CPL_ACT_ESTABLISH] (dev, m, toe_tid->ctx); } else { + printf("toe_tid=%p\n", toe_tid); + log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", dev->name, CPL_PASS_ACCEPT_REQ); return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG; @@ -961,8 +967,12 @@ { while (n--) { struct mbuf *m0 = *m++; - unsigned int opcode = G_OPCODE(ntohl(m0->m_pkthdr.csum_data)); - int ret = cpl_handlers[opcode] (dev, m0); + unsigned int opcode = G_OPCODE(ntohl(m0->m_pkthdr.csum_data)); + int ret; + + printf("processing op=0x%x m=%p data=%p\n", opcode, m0, m0->m_data); + + ret = cpl_handlers[opcode] (dev, m0); #if VALIDATE_TID if (ret & CPL_RET_UNKNOWN_TID) { From owner-p4-projects@FreeBSD.ORG Fri Nov 2 04:59:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31DA416A41B; Fri, 2 Nov 2007 04:59:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9E4416A417 for ; Fri, 2 Nov 2007 04:59:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D981213C4AA for ; Fri, 2 Nov 2007 04:59:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA24xahM076717 for ; Fri, 2 Nov 2007 04:59:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA24xa8e076714 for perforce@freebsd.org; Fri, 2 Nov 2007 04:59:36 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 04:59:36 GMT Message-Id: <200711020459.lA24xa8e076714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 04:59:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=128500 Change 128500 by kmacy@kmacy:storage:toestack on 2007/11/02 04:59:23 remove unused arguments from tx reclaim fix ofld_xmit to line up with what TOM passes in (sgl not mbuf chain) remove some dead code (#if 0 ) Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#10 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#10 (text+ko) ==== @@ -202,7 +202,7 @@ * queue's lock held. */ static __inline int -reclaim_completed_tx(struct sge_txq *q, int nbufs, struct mbuf **mvec) +reclaim_completed_tx(struct sge_txq *q) { int reclaim = desc_reclaimable(q); @@ -826,7 +826,6 @@ sge_txq_reclaim_(struct sge_txq *txq) { int reclaimable, n; - struct mbuf *m_vec[TX_CLEAN_MAX_DESC]; struct port_info *pi; pi = txq->port; @@ -834,19 +833,9 @@ n = 0; reclaimable = desc_reclaimable(txq); if (reclaimable > 0 && mtx_trylock(&txq->lock)) { - n = reclaim_completed_tx(txq, TX_CLEAN_MAX_DESC, m_vec); + n = reclaim_completed_tx(txq); mtx_unlock(&txq->lock); } - if (n == 0) - return; -#if 0 - { - int i; - for (i = 0; i < n; i++) { - m_freem_vec(m_vec[i]); - } - } -#endif if (pi && pi->ifp->if_drv_flags & IFF_DRV_OACTIVE && txq->size - txq->in_use >= TX_START_MAX_DESC) { txq_fills++; @@ -1970,27 +1959,25 @@ int ret, nsegs; unsigned int ndesc; unsigned int pidx, gen; - struct mbuf *m_vec[TX_CLEAN_MAX_DESC]; - bus_dma_segment_t segs[TX_MAX_SEGS]; - int cleaned; + bus_dma_segment_t segs[TX_MAX_SEGS], *vsegs; struct tx_sw_desc *stx; + nsegs = m_get_sgllen(m); + vsegs = m_get_sgl(m); + ndesc = calc_tx_descs_ofld(m, nsegs); + busdma_map_sgl(vsegs, segs, nsegs); + stx = &q->sdesc[q->pidx]; - + KASSERT(stx->mi.mi_base == NULL, ("mi_base set")); + mtx_lock(&q->lock); - if ((ret = busdma_map_mbufs(&m, q, stx, segs, &nsegs)) != 0) { - mtx_unlock(&q->lock); - return (ret); - } - ndesc = calc_tx_descs_ofld(m, nsegs); -again: cleaned = reclaim_completed_tx(q, TX_CLEAN_MAX_DESC, m_vec); - +again: reclaim_completed_tx(q); ret = check_desc_avail(adap, q, m, ndesc, TXQ_OFLD); if (__predict_false(ret)) { if (ret == 1) { m_set_priority(m, ndesc); /* save for restart */ mtx_unlock(&q->lock); - return EINTR; + return (EINTR); } goto again; } @@ -2013,14 +2000,7 @@ write_ofld_wr(adap, m, q, pidx, gen, ndesc, segs, nsegs); check_ring_tx_db(adap, q); -#if 0 - { - int i; - for (i = 0; i < cleaned; i++) { - m_freem_vec(m_vec[i]); - } - } -#endif + return (0); } @@ -2037,13 +2017,12 @@ struct sge_qset *qs = data; struct sge_txq *q = &qs->txq[TXQ_OFLD]; adapter_t *adap = qs->port->adapter; - struct mbuf *m_vec[TX_CLEAN_MAX_DESC]; bus_dma_segment_t segs[TX_MAX_SEGS]; struct tx_sw_desc *stx = &q->sdesc[q->pidx]; int nsegs, cleaned; mtx_lock(&q->lock); -again: cleaned = reclaim_completed_tx(q, TX_CLEAN_MAX_DESC, m_vec); +again: cleaned = reclaim_completed_tx(q); while ((m = mbufq_peek(&q->sendq)) != NULL) { unsigned int gen, pidx; From owner-p4-projects@FreeBSD.ORG Fri Nov 2 05:03:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4283316A420; Fri, 2 Nov 2007 05:03:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAC4816A419 for ; Fri, 2 Nov 2007 05:03:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A9F5413C481 for ; Fri, 2 Nov 2007 05:03:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA253gOR078242 for ; Fri, 2 Nov 2007 05:03:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA253gVi078239 for perforce@freebsd.org; Fri, 2 Nov 2007 05:03:42 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 2 Nov 2007 05:03:42 GMT Message-Id: <200711020503.lA253gVi078239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 05:03:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=128501 Change 128501 by kmacy@kmacy:storage:toestack on 2007/11/02 05:03:39 add core functionality for transmit - but don't yet hook in to cxgb_toe_send Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 (text+ko) ==== @@ -108,7 +108,7 @@ * in the skb and whether it has any payload in its main body. This maps the * length of the gather list represented by an skb into the # of necessary WRs. */ -static unsigned int skb_wrs[MAX_PAGE_IOV + 2] __read_mostly; +static unsigned int mbuf_wrs[TX_MAX_SEGS] __read_mostly; /* * Max receive window supported by HW in bytes. Only a small part of it can @@ -122,6 +122,133 @@ */ #define MIN_RCV_WND (24 * 1024U) + +extern int tcp_do_autorcvbuf; +extern int tcp_do_autosndbuf; +extern int tcp_autorcvbuf_max; +extern int tcp_autosndbuf_max; + +static inline unsigned int +mkprio(unsigned int cntrl, const struct socket *so) +{ + return cntrl; +} + + +static inline void +make_tx_data_wr(struct socket *so, struct mbuf *m, int len, struct mbuf *tail) +{ + struct tcpcb *tp = sototcpcb(so); + struct toepcb *toep = tp->t_toe; + struct tx_data_wr *req; + + req = mtod(m, struct tx_data_wr *); + m->m_len = sizeof(*req); + req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); + req->wr_lo = htonl(V_WR_TID(toep->tp_tid)); + req->sndseq = htonl(tp->snd_nxt); + /* len includes the length of any HW ULP additions */ + req->len = htonl(len); + req->param = htonl(V_TX_PORT(toep->tp_l2t->smt_idx)); + /* V_TX_ULP_SUBMODE sets both the mode and submode */ + req->flags = htonl(V_TX_ULP_SUBMODE(/*skb_ulp_mode(skb)*/ 0) | + V_TX_URG(/* skb_urgent(skb) */ 0 ) | + V_TX_SHOVE((!(tp->t_flags & TF_MORETOCOME) && + (tail ? 0 : 1)))); + + if (__predict_false((toep->tp_flags & TP_DATASENT) == 0)) { + req->flags |= htonl(V_TX_ACK_PAGES(2) | F_TX_INIT | + V_TX_CPU_IDX(toep->tp_qset_idx)); + + /* Sendbuffer is in units of 32KB. + */ + if (tcp_do_autosndbuf && so->so_snd.sb_flags & SB_AUTOSIZE) + req->param |= htonl(V_TX_SNDBUF(tcp_autosndbuf_max >> 15)); + else + req->param |= htonl(V_TX_SNDBUF(so->so_snd.sb_hiwat >> 15)); + toep->tp_flags |= TP_DATASENT; + } + + + +} + +int +t3_push_frames(struct socket *so, int req_completion) +{ + struct tcpcb *tp = sototcpcb(so); + struct toepcb *toep = tp->t_toe; + + struct mbuf *tail, *m0; + struct t3cdev *cdev; + struct tom_data *d; + int bytes, count, total_bytes; + bus_dma_segment_t segs[TX_MAX_SEGS], *segp; + segp = segs; + + if (tp->t_state == TCPS_SYN_SENT || tp->t_state == TCPS_CLOSED) + return (0); + + if (so->so_state & (SS_ISDISCONNECTING|SS_ISDISCONNECTED)) + return (0); + + d = TOM_DATA(TOE_DEV(so)); + cdev = d->cdev; + tail = so->so_snd.sb_sndptr ? so->so_snd.sb_sndptr : so->so_snd.sb_mb; + total_bytes = 0; + + while (toep->tp_wr_avail && (tail != NULL)) { + + count = bytes = 0; + if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) + return (0); + + while ((mbuf_wrs[count + 1] <= toep->tp_wr_avail) && (tail != NULL) && (count < TX_MAX_SEGS)) { + bytes += tail->m_len; + count++; + + /* + * technically an abuse to be using this for a VA + * but less gross than defining my own structure + * or calling pmap_kextract from here :-| + */ + segp->ds_addr = (bus_addr_t)tail->m_data; + segp->ds_len = tail->m_len; + segp++; + tail = tail->m_next; + } + + so->so_snd.sb_sndptr = tail; + so->so_snd.sb_sndptroff += bytes; + total_bytes += bytes; + + + /* + * XXX can drop socket buffer lock here + */ + + toep->tp_wr_avail -= mbuf_wrs[count]; + toep->tp_wr_unacked += mbuf_wrs[count]; + + make_tx_data_wr(so, m0, bytes, tail); + m_set_priority(m0, mkprio(CPL_PRIORITY_DATA, so)); + m_set_sgl(m0, segs); + m_set_sgllen(m0, count); + m0->m_pkthdr.len = bytes; + if ((req_completion && toep->tp_wr_unacked == mbuf_wrs[count]) || + toep->tp_wr_unacked >= toep->tp_wr_max / 2) { + struct work_request_hdr *wr = cplhdr(m0); + + wr->wr_hi |= htonl(F_WR_COMPL); + toep->tp_wr_unacked = 0; + } + + l2t_send(cdev, m0, toep->tp_l2t); + } + + return (total_bytes); +} + static int cxgb_toe_disconnect(struct tcpcb *tp) { @@ -188,12 +315,6 @@ cxgb_insert_tid(d->cdev, d->client, so, tid); } -static inline unsigned int -mkprio(unsigned int cntrl, const struct socket *so) -{ - return cntrl; -} - /** * find_best_mtu - find the entry in the MTU table closest to an MTU * @d: TOM state @@ -247,9 +368,6 @@ tp->t_tu = &cxgb_toe_usrreqs; } -extern int tcp_do_autorcvbuf; -extern int tcp_autorcvbuf_max; - /* * Determine the receive window scaling factor given a target max * receive window. @@ -684,14 +802,14 @@ { int i; - if (skb_wrs[1]) /* already initialized */ + if (mbuf_wrs[1]) /* already initialized */ return; - for (i = 1; i < ARRAY_SIZE(skb_wrs); i++) { + for (i = 1; i < ARRAY_SIZE(mbuf_wrs); i++) { int sgl_len = (3 * i) / 2 + (i & 1); sgl_len += 3; - skb_wrs[i] = sgl_len <= wr_len ? + mbuf_wrs[i] = sgl_len <= wr_len ? 1 : 1 + (sgl_len - 2) / (wr_len - 1); } ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 (text+ko) ==== @@ -13,6 +13,8 @@ void t3tom_register_cpl_handler(unsigned int opcode, cxgb_cpl_handler_func h); void t3_init_offload_ops(void); void t3_init_wr_tab(unsigned int wr_len); +int t3_push_frames(struct socket *so, int req_completion); + void toepcb_hold(struct toepcb *); void toepcb_release(struct toepcb *); void toepcb_init(struct toepcb *); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 (text+ko) ==== @@ -78,6 +78,8 @@ #define T3C_DEV(sk) ((TOM_DATA(TOE_DEV(sk)))->cdev) #define TOM_TUNABLE(dev, param) (TOM_DATA(dev)->conf.param) +#define TP_DATASENT (1 << 0) + struct toepcb { struct toedev *tp_toedev; int tp_tid; @@ -91,6 +93,8 @@ int tp_qset_idx; int tp_mss_clamp; int tp_qset; + int tp_flags; + volatile int tp_refcount; struct tcpcb *tp_tp; From owner-p4-projects@FreeBSD.ORG Fri Nov 2 18:53:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F001E16A506; Fri, 2 Nov 2007 18:53:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6C6716A419 for ; Fri, 2 Nov 2007 18:53:38 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D374F13C45D for ; Fri, 2 Nov 2007 18:53:38 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2I0sgR071666 for ; Fri, 2 Nov 2007 18:00:54 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2I0rx0071650 for perforce@freebsd.org; Fri, 2 Nov 2007 18:00:53 GMT (envelope-from delphij@freebsd.org) Date: Fri, 2 Nov 2007 18:00:53 GMT Message-Id: <200711021800.lA2I0rx0071650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 128517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 18:53:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=128517 Change 128517 by delphij@charlie on 2007/11/02 18:00:13 IFC Affected files ... .. //depot/projects/delphij_fork/Makefile.inc1#6 integrate .. //depot/projects/delphij_fork/bin/mv/mv.1#2 integrate .. //depot/projects/delphij_fork/include/_ctype.h#3 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/delphij_fork/libexec/Makefile#2 integrate .. //depot/projects/delphij_fork/sbin/gpt/boot.c#2 integrate .. //depot/projects/delphij_fork/sbin/gpt/gpt.c#3 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/delphij_fork/sbin/route/route.8#2 integrate .. //depot/projects/delphij_fork/share/man/man3/queue.3#2 integrate .. //depot/projects/delphij_fork/share/man/man4/ng_car.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/delphij_fork/share/man/man5/bluetooth.device.conf.5#2 integrate .. //depot/projects/delphij_fork/share/man/man5/xfs.5#2 integrate .. //depot/projects/delphij_fork/share/misc/committers-ports.dot#3 integrate .. //depot/projects/delphij_fork/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/delphij_fork/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/delphij_fork/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/delphij_fork/sys/conf/options.arm#3 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/aac/aac.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/delphij_fork/sys/modules/Makefile#8 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/delphij_fork/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/delphij_fork/sys/pci/agp.c#3 integrate .. //depot/projects/delphij_fork/sys/pci/agp_ali.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp_amd.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp_ati.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp_i810.c#4 integrate .. //depot/projects/delphij_fork/sys/pci/agp_intel.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp_sis.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp_via.c#3 integrate .. //depot/projects/delphij_fork/sys/pci/agppriv.h#3 integrate .. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/delphij_fork/usr.bin/file2c/file2c.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/file2c/file2c.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/lockf/lockf.1#3 integrate .. //depot/projects/delphij_fork/usr.bin/make/make.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/xstr/xstr.1#2 integrate .. //depot/projects/delphij_fork/usr.sbin/fwcontrol/fwcontrol.8#3 integrate .. //depot/projects/delphij_fork/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpc.statd/statd.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/tcpdrop/tcpdrop.c#2 integrate Differences ... ==== //depot/projects/delphij_fork/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -159,7 +159,14 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install +.endif # # Building a world goes through the following stages @@ -265,14 +272,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -564,6 +573,14 @@ .endfor # +# Required install tools to be saved in a scratch dir for safety. +# +ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic + +# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -574,19 +591,20 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ + for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - cp $$progpath ${INSTALLTMP}; \ + progs="$$progs $$progpath"; \ else \ - echo "Required install tool $$prog not found" >&2; \ + echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} - rm -rf ${INSTALLTMP} + done; \ + cp $$progs ${INSTALLTMP}; \ + cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ + sort -u` ${INSTALLTMP} + cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ + ${IMAKEENV} rm -rf ${INSTALLTMP} # installskel # ==== //depot/projects/delphij_fork/bin/mv/mv.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $ .\" -.Dd July 9, 2002 +.Dd May 12, 2007 .Dt MV 1 .Os .Sh NAME ==== //depot/projects/delphij_fork/include/_ctype.h#3 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.34 2007/11/01 03:18:02 ache Exp $ */ #ifndef __CTYPE_H_ @@ -126,7 +126,7 @@ static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c & ~0x7F) ? 0 : + return (_c < 0 || _c >= 128) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } ==== //depot/projects/delphij_fork/lib/libthr/thread/thr_mutex.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.57 2007/10/30 09:24:23 kris Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.60 2007/10/31 01:50:48 davidxu Exp $ */ #include "namespace.h" @@ -39,8 +39,6 @@ #include #include #include -#include -#include #include #include "un-namespace.h" @@ -67,6 +65,12 @@ #endif /* + * For adaptive mutexes, how many times to spin doing trylock2 + * before entering the kernel to block + */ +#define MUTEX_ADAPTIVE_SPINS 200 + +/* * Prototypes */ int __pthread_mutex_init(pthread_mutex_t *mutex, @@ -356,34 +360,56 @@ } else if (m->m_owner == curthread) { ret = mutex_self_lock(m, abstime); } else { - if (_thr_spinloops != 0 && _thr_is_smp && - !(m->m_lock.m_flags & UMUTEX_PRIO_PROTECT)) { - count = _thr_spinloops; - while (count && m->m_lock.m_owner != UMUTEX_UNOWNED) { - count--; + /* + * For adaptive mutexes, spin for a bit in the expectation + * that if the application requests this mutex type then + * the lock is likely to be released quickly and it is + * faster than entering the kernel + */ + if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) + goto sleep_in_kernel; + + if (!_thr_is_smp) + goto yield_loop; + + if (m->m_type == PTHREAD_MUTEX_ADAPTIVE_NP) { + count = MUTEX_ADAPTIVE_SPINS; + + while (count--) { + ret = _thr_umutex_trylock2(&m->m_lock, id); + if (ret == 0) + break; CPU_SPINWAIT; } - if (count) { - ret = _thr_umutex_trylock2(&m->m_lock, id); - if (ret == 0) { - ENQUEUE_MUTEX(curthread, m); - return (ret); + if (ret == 0) + goto done; + } else { + if (_thr_spinloops != 0) { + count = _thr_spinloops; + while (count) { + if (m->m_lock.m_owner == UMUTEX_UNOWNED) { + ret = _thr_umutex_trylock2(&m->m_lock, id); + if (ret == 0) + goto done; + } + CPU_SPINWAIT; + count--; } } } +yield_loop: if (_thr_yieldloops != 0) { count = _thr_yieldloops; while (count--) { _sched_yield(); ret = _thr_umutex_trylock2(&m->m_lock, id); - if (ret == 0) { - ENQUEUE_MUTEX(curthread, m); - return (ret); - } + if (ret == 0) + goto done; } } +sleep_in_kernel: if (abstime == NULL) { ret = __thr_umutex_lock(&m->m_lock); } else if (__predict_false( @@ -401,6 +427,7 @@ if (ret == EINTR) ret = ETIMEDOUT; } +done: if (ret == 0) ENQUEUE_MUTEX(curthread, m); } ==== //depot/projects/delphij_fork/libexec/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.77 2007/07/03 12:46:04 mlaier Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.78 2007/10/31 11:19:32 yar Exp $ .include @@ -43,7 +43,7 @@ _tftp-proxy= tftp-proxy .endif -.if !defined(NO_PIC) +.if !defined(NO_PIC) && !defined(NO_RTLD) _rtld-elf= rtld-elf .endif ==== //depot/projects/delphij_fork/sbin/gpt/boot.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/boot.c,v 1.1 2007/10/24 21:32:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/boot.c,v 1.2 2007/11/01 20:06:12 jhb Exp $"); #include #include @@ -168,7 +168,6 @@ warn("unable to open GPT boot loader"); return; } - /* Fourth step: find an existing boot partition or create one. */ if (gpt_find(&boot_uuid, &gptboot) != 0) @@ -191,8 +190,14 @@ return; } - /* Fourth step, write out the gptboot binary to the boot partition. */ - buf = malloc(sb.st_size); + /* + * Fourth step, write out the gptboot binary to the boot partition. + * When writing to a disk device, the write must be sector aligned + * and not write to any partial sectors, so round up the buffer size + * to the next sector and zero it. + */ + bsize = (sb.st_size + secsz - 1) / secsz * secsz; + buf = calloc(1, bsize); nbytes = read(bfd, buf, sb.st_size); if (nbytes < 0) { warn("unable to read GPT boot loader"); @@ -209,12 +214,12 @@ device_name); return; } - nbytes = write(fd, buf, sb.st_size); + nbytes = write(fd, buf, bsize); if (nbytes < 0) { warn("unable to write GPT boot loader"); return; } - if (nbytes != sb.st_size) { + if (nbytes != bsize) { warnx("short write of GPT boot loader"); return; } ==== //depot/projects/delphij_fork/sbin/gpt/gpt.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.17 2007/10/24 21:32:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.18 2007/11/01 20:51:04 jhb Exp $"); #include #include @@ -585,10 +585,16 @@ if (gpt_mbr(fd, 0LL) == -1) goto close; - if (gpt_gpt(fd, 1LL) == -1) - goto close; - if (gpt_gpt(fd, mediasz / secsz - 1LL) == -1) - goto close; + + /* + * Don't look for a GPT unless we have a valid PMBR. + */ + if (map_find(MAP_TYPE_PMBR) != NULL) { + if (gpt_gpt(fd, 1LL) == -1) + goto close; + if (gpt_gpt(fd, mediasz / secsz - 1LL) == -1) + goto close; + } return (fd); ==== //depot/projects/delphij_fork/sbin/ifconfig/ifconfig.8#4 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.142 2007/08/01 00:33:52 thompsa Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.143 2007/11/02 05:23:22 sam Exp $ .\" -.Dd July 8, 2007 +.Dd October 31, 2007 .Dt IFCONFIG 8 .Os .Sh NAME @@ -606,7 +606,7 @@ an access point will temporarily leave the channel to scan for neighboring stations. This allows a station to maintain a cache of nearby access points -so that roaming between access points can be done without doing +so that roaming between access points can be done without a lengthy scan operation. Background scanning is done only when a station is not busy and any outbound traffic will cancel a scan operation. @@ -637,7 +637,7 @@ The .Ar interval parameter is specified in seconds. -By default a background scanning is considered every 300 seconds (5 minutes). +By default a background scan is considered every 300 seconds (5 minutes). The .Ar interval may not be set to less than 15 seconds. @@ -817,7 +817,7 @@ To re-enable the broadcast of the SSID etc., use .Fl hidessid . .It Cm ff -Enable the user of Atheros Fast Frames when communicating with +Enable the use of Atheros Fast Frames when communicating with another Fast Frames-capable station. Fast Frames are an encapsulation technique by which two 802.3 frames are transmitted in a single 802.11 frame. @@ -863,6 +863,9 @@ on the channel. .Cm list freq is another way of requesting this information. +By default a compacted list of channels is displayed; if the +.Fl v +option is specified then all channels are shown. .It Cm list mac Display the current MAC Access Control List state. Each address is prefixed with a character that indicates the @@ -880,6 +883,8 @@ The .Fl v flag may be used to display long SSIDs. +.Fl v +also causes received information elements to be displayed symbolicaly. This information may be updated automatically by the adaptor and/or with a .Cm scan @@ -918,6 +923,11 @@ data frame. QoS encapsulation is enabled only when WME mode is enabled. .El +.Pp +By default information elements received from associated stations +are displayed in a short form; the +.Fl v +flag causes this information to be displayed symbolicaly. .It Cm list wme Display the current parameters to use when operating in WME mode. When WME mode is enabled for an adaptor this information will be @@ -991,7 +1001,7 @@ 802.11a BSS. The .Ar rssi -parameter specifies the receive signal strength in .5 dBm units +parameter specifies the receive signal strength in dBm units at which roaming should be considered. If the current rssi drops below this setting and background scanning is enabled, then the system will check if a more desirable access point is @@ -1177,8 +1187,8 @@ background scan operations. .It Cm stationname Ar name Set the name of this station. -It appears that the station name is not really part of the IEEE 802.11 -protocol though all interfaces seem to support it. +The station name is not part of the IEEE 802.11 +protocol though some interfaces support it. As such it only seems to be meaningful to identical or virtually identical equipment. Setting the station name is identical in syntax to setting the SSID. @@ -1186,9 +1196,7 @@ Set the power used to transmit frames. The .Ar power -argument -is a unitless value in the range 0 to 100 that is interpreted -by drivers to derive a device-specific value. +argument is specified in .5 dBm units. Out of range values are truncated. Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value. ==== //depot/projects/delphij_fork/sbin/ifconfig/ifieee80211.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.47 2007/06/12 00:52:40 thompsa Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.48 2007/11/02 05:24:57 sam Exp $ */ /*- @@ -91,9 +91,41 @@ #include #include #include +#include /* NB: for offsetof */ #include "ifconfig.h" +#define MAXCOL 78 +static int col; +static char spacer; + +static void LINE_INIT(char c); +static void LINE_BREAK(void); +static void LINE_CHECK(const char *fmt, ...); + +/* XXX need max array size */ +static const int htrates[16] = { + 13, /* IFM_IEEE80211_MCS0 */ + 26, /* IFM_IEEE80211_MCS1 */ + 39, /* IFM_IEEE80211_MCS2 */ + 52, /* IFM_IEEE80211_MCS3 */ + 78, /* IFM_IEEE80211_MCS4 */ + 104, /* IFM_IEEE80211_MCS5 */ + 117, /* IFM_IEEE80211_MCS6 */ + 130, /* IFM_IEEE80211_MCS7 */ + 26, /* IFM_IEEE80211_MCS8 */ + 52, /* IFM_IEEE80211_MCS9 */ + 78, /* IFM_IEEE80211_MCS10 */ + 104, /* IFM_IEEE80211_MCS11 */ + 156, /* IFM_IEEE80211_MCS12 */ + 208, /* IFM_IEEE80211_MCS13 */ + 234, /* IFM_IEEE80211_MCS14 */ + 260, /* IFM_IEEE80211_MCS15 */ +}; + +static int get80211(int s, int type, void *data, int len); +static int get80211len(int s, int type, void *data, int len, int *plen); +static int get80211val(int s, int type, int *val); static void set80211(int s, int type, int val, int len, void *data); static const char *get_string(const char *val, const char *sep, u_int8_t *buf, int *lenp); @@ -101,7 +133,21 @@ static struct ieee80211req_chaninfo chaninfo; static struct ifmediareq *ifmr; +static struct ieee80211_channel curchan; +static int gotcurchan = 0; +static int htconf = 0; +static int gothtconf = 0; +static void +gethtconf(int s) +{ + if (gothtconf) + return; + if (get80211val(s, IEEE80211_IOC_HTCONF, &htconf) < 0) + warn("unable to get HT configuration information"); + gothtconf = 1; +} + /* * Collect channel info from the kernel. We use this (mostly) * to handle mapping between frequency and IEEE channel number. @@ -109,19 +155,13 @@ static void getchaninfo(int s) { - struct ieee80211req ireq; - if (chaninfo.ic_nchans != 0) return; - (void) memset(&ireq, 0, sizeof(ireq)); - (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = IEEE80211_IOC_CHANINFO; - ireq.i_data = &chaninfo; - ireq.i_len = sizeof(chaninfo); - if (ioctl(s, SIOCG80211, &ireq) < 0) + if (get80211(s, IEEE80211_IOC_CHANINFO, &chaninfo, sizeof(chaninfo)) < 0) errx(1, "unable to get channel information"); ifmr = ifmedia_getstate(s); + gethtconf(s); } /* @@ -188,21 +228,25 @@ /* NB: we abitrarily pick HT40+ over HT40- */ if (chanmode != IFM_IEEE80211_11B) i = canpromote(i, IEEE80211_CHAN_B, IEEE80211_CHAN_G); - if (chanmode != IFM_IEEE80211_11G) { + if (chanmode != IFM_IEEE80211_11G && (htconf & 1)) { i = canpromote(i, IEEE80211_CHAN_G, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20); - i = canpromote(i, IEEE80211_CHAN_G, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT40D); - i = canpromote(i, IEEE80211_CHAN_G, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT40U); + if (htconf & 2) { + i = canpromote(i, IEEE80211_CHAN_G, + IEEE80211_CHAN_G | IEEE80211_CHAN_HT40D); + i = canpromote(i, IEEE80211_CHAN_G, + IEEE80211_CHAN_G | IEEE80211_CHAN_HT40U); + } } - if (chanmode != IFM_IEEE80211_11A) { + if (chanmode != IFM_IEEE80211_11A && (htconf & 1)) { i = canpromote(i, IEEE80211_CHAN_A, IEEE80211_CHAN_A | IEEE80211_CHAN_HT20); - i = canpromote(i, IEEE80211_CHAN_A, - IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D); - i = canpromote(i, IEEE80211_CHAN_A, - IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U); + if (htconf & 2) { + i = canpromote(i, IEEE80211_CHAN_A, + IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D); + i = canpromote(i, IEEE80211_CHAN_A, + IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U); + } } return i; } @@ -244,7 +288,24 @@ return; } } - errx(1, "unknown/undefined channel number %d", ieee); + errx(1, "unknown/undefined channel number %d flags 0x%x", ieee, flags); +} + +static const struct ieee80211_channel * +getcurchan(int s) +{ + if (gotcurchan) + return &curchan; + if (get80211(s, IEEE80211_IOC_CURCHAN, &curchan, sizeof(curchan)) < 0) { + int val; + /* fall back to legacy ioctl */ + if (get80211val(s, IEEE80211_IOC_CHANNEL, &val) < 0) + errx(-1, "cannot figure out current channel"); + getchaninfo(s); + mapchan(&curchan, val, 0); + } + gotcurchan = 1; + return &curchan; } static int @@ -258,8 +319,8 @@ static int isanyarg(const char *arg) { - return (strcmp(arg, "-") == 0 || - strcasecmp(arg, "any") == 0 || strcasecmp(arg, "off") == 0); + return (strncmp(arg, "-", 1) == 0 || + strncasecmp(arg, "any", 3) == 0 || strncasecmp(arg, "off", 3) == 0); } static void @@ -310,9 +371,8 @@ * checked against the channel table fetched from the kernel. */ static int -getchannelflags(const char *val) +getchannelflags(const char *val, int freq) { -#define CHAN_HT_DEFAULT IEEE80211_CHAN_HT40U #define _CHAN_HT 0x80000000 const char *cp; int flags; @@ -352,7 +412,7 @@ flags |= IEEE80211_CHAN_STURBO; break; default: - errx(-1, "%s: Invalid channel attribute %c", + errx(-1, "%s: Invalid channel attribute %c\n", val, *cp); } } @@ -378,11 +438,9 @@ flags |= IEEE80211_CHAN_HT40U; else if (ep != NULL && *ep == '-') flags |= IEEE80211_CHAN_HT40D; - else /* NB: pick something */ - flags |= CHAN_HT_DEFAULT; break; default: - errx(-1, "%s: Invalid channel width", val); + errx(-1, "%s: Invalid channel width\n", val); } } /* @@ -404,11 +462,20 @@ * provide the default settings. */ flags &= ~_CHAN_HT; - if ((flags & IEEE80211_CHAN_HT) == 0) - flags |= CHAN_HT_DEFAULT; + if ((flags & IEEE80211_CHAN_HT) == 0) { + struct ieee80211_channel chan; + /* + * Consult the channel list to see if we can use + * HT40+ or HT40- (if both the map routines choose). + */ + if (freq > 255) + mapfreq(&chan, freq, 0); + else + mapchan(&chan, freq, 0); + flags |= (chan.ic_flags & IEEE80211_CHAN_HT); + } } return flags; -#undef CHAN_HT_DEFAULT #undef _CHAN_HT } @@ -419,10 +486,11 @@ memset(&chan, 0, sizeof(chan)); if (!isanyarg(val)) { - int v = atoi(val); - int flags = getchannelflags(val); + int v, flags; getchaninfo(s); + v = atoi(val); + flags = getchannelflags(val, v); if (v > 255) { /* treat as frequency */ mapfreq(&chan, v, flags); } else { @@ -612,7 +680,7 @@ mode = IEEE80211_PROTMODE_OFF; } else if (strcasecmp(val, "cts") == 0) { mode = IEEE80211_PROTMODE_CTS; - } else if (strcasecmp(val, "rtscts") == 0) { + } else if (strncasecmp(val, "rtscts", 3) == 0) { mode = IEEE80211_PROTMODE_RTSCTS; } else { errx(1, "unknown protection mode"); @@ -622,9 +690,31 @@ } static void +set80211htprotmode(const char *val, int d, int s, const struct afswtch *rafp) +{ + int mode; + + if (strcasecmp(val, "off") == 0) { + mode = IEEE80211_PROTMODE_OFF; + } else if (strncasecmp(val, "rts", 3) == 0) { + mode = IEEE80211_PROTMODE_RTSCTS; + } else { + errx(1, "unknown protection mode"); + } + + set80211(s, IEEE80211_IOC_HTPROTMODE, mode, 0, NULL); +} + +static void set80211txpower(const char *val, int d, int s, const struct afswtch *rafp) { - set80211(s, IEEE80211_IOC_TXPOWER, atoi(val), 0, NULL); + double v = atof(val); + int txpow; + + txpow = (int) (2*v); + if (txpow != 2*v) + errx(-1, "invalid tx power (must be .5 dBm units)"); + set80211(s, IEEE80211_IOC_TXPOWER, txpow, 0, NULL); } #define IEEE80211_ROAMING_DEVICE 0 @@ -692,7 +782,7 @@ memset(&chanlist, 0, sizeof(chanlist)); cp = temp; for (;;) { - int first, last, f; + int first, last, f, c; tp = strchr(cp, ','); if (tp != NULL) @@ -720,9 +810,10 @@ } if (tp == NULL) break; - while (isspace(*tp)) + c = *tp; + while (isspace(c)) tp++; - if (!isdigit(*tp)) + if (!isdigit(c)) break; cp = tp; } @@ -1017,6 +1108,181 @@ set80211(s, IEEE80211_IOC_DOTH, d, 0, NULL); } +static void +set80211shortgi(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_SHORTGI, + d ? (IEEE80211_HTCAP_SHORTGI20 | IEEE80211_HTCAP_SHORTGI40) : 0, + 0, NULL); +} + +static void +set80211ampdu(const char *val, int d, int s, const struct afswtch *rafp) +{ + int ampdu; + + if (get80211val(s, IEEE80211_IOC_AMPDU, &du) < 0) + errx(-1, "cannot get AMPDU setting"); + if (d < 0) { + d = -d; + ampdu &= ~d; + } else + ampdu |= d; + set80211(s, IEEE80211_IOC_AMPDU, ampdu, 0, NULL); +} + +static +DECL_CMD_FUNC(set80211ampdulimit, val, d) +{ + int v; + + switch (atoi(val)) { + case 8: + case 8*1024: + v = IEEE80211_HTCAP_MAXRXAMPDU_8K; + break; + case 16: + case 16*1024: + v = IEEE80211_HTCAP_MAXRXAMPDU_16K; + break; + case 32: + case 32*1024: + v = IEEE80211_HTCAP_MAXRXAMPDU_32K; + break; + case 64: + case 64*1024: + v = IEEE80211_HTCAP_MAXRXAMPDU_64K; + break; + default: + errx(-1, "invalid A-MPDU limit %s", val); + } + set80211(s, IEEE80211_IOC_AMPDU_LIMIT, v, 0, NULL); +} + +static +DECL_CMD_FUNC(set80211ampdudensity, val, d) +{ + int v; + + if (isanyarg(val)) + v = IEEE80211_HTCAP_MPDUDENSITY_NA; + else switch ((int)(atof(val)*4)) { + case 0: + v = IEEE80211_HTCAP_MPDUDENSITY_NA; + break; + case 1: + v = IEEE80211_HTCAP_MPDUDENSITY_025; + break; + case 2: + v = IEEE80211_HTCAP_MPDUDENSITY_05; + break; + case 4: + v = IEEE80211_HTCAP_MPDUDENSITY_1; + break; + case 8: + v = IEEE80211_HTCAP_MPDUDENSITY_2; + break; + case 16: + v = IEEE80211_HTCAP_MPDUDENSITY_4; + break; + case 32: + v = IEEE80211_HTCAP_MPDUDENSITY_8; + break; + case 64: + v = IEEE80211_HTCAP_MPDUDENSITY_16; + break; + default: + errx(-1, "invalid A-MPDU density %s", val); + } + set80211(s, IEEE80211_IOC_AMPDU_DENSITY, v, 0, NULL); +} + +static void +set80211amsdu(const char *val, int d, int s, const struct afswtch *rafp) +{ + int amsdu; + + if (get80211val(s, IEEE80211_IOC_AMSDU, &amsdu) < 0) + errx(-1, "cannot get AMSDU setting"); + if (d < 0) { + d = -d; + amsdu &= ~d; + } else + amsdu |= d; + set80211(s, IEEE80211_IOC_AMSDU, amsdu, 0, NULL); +} + +static +DECL_CMD_FUNC(set80211amsdulimit, val, d) +{ + set80211(s, IEEE80211_IOC_AMSDU_LIMIT, atoi(val), 0, NULL); +} + +static void +set80211puren(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_PUREN, d, 0, NULL); +} + +static void +set80211htcompat(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_HTCOMPAT, d, 0, NULL); +} + +static void +set80211htconf(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_HTCONF, d, 0, NULL); + htconf = d; +} + +static void +set80211inact(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_INACTIVITY, d, 0, NULL); +} + +static void +LINE_INIT(char c) +{ + spacer = c; + if (c == '\t') + col = 8; + else + col = 1; +} + +static void +LINE_BREAK(void) +{ + if (spacer != '\t') { + printf("\n"); + spacer = '\t'; + } + col = 8; /* 8-col tab */ +} + +static void +LINE_CHECK(const char *fmt, ...) +{ + char buf[80]; + va_list ap; + int n; + + va_start(ap, fmt); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 2 18:53:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2E6116A6FC; Fri, 2 Nov 2007 18:53:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5316A16A543 for ; Fri, 2 Nov 2007 18:53:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2000913C4C6 for ; Fri, 2 Nov 2007 18:53:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2FP3VZ043572 for ; Fri, 2 Nov 2007 15:25:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2FOqv4043526 for perforce@freebsd.org; Fri, 2 Nov 2007 15:24:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Nov 2007 15:24:52 GMT Message-Id: <200711021524.lA2FOqv4043526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 18:53:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=128509 Change 128509 by rwatson@rwatson_cinnamon on 2007/11/02 15:24:47 Integrate zero-copy BPF branch. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/FILES#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/INSTALL#2 delete .. //depot/projects/zcopybpf/src/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/README.dag#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/TODO#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/VERSION#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/configure#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/configure.in#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/inet.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/zcopybpf/src/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#9 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-int.h#5 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/pf.h#2 delete .. //depot/projects/zcopybpf/src/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/FILES#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/README#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/af.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/af.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/configure#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/ieee802_11.h#3 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/pf.h#2 delete .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/util.c#2 integrate .. //depot/projects/zcopybpf/src/lib/libpcap/Makefile#4 integrate .. //depot/projects/zcopybpf/src/lib/libpcap/config.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/support.S#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/ohci_atmelarm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/armreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/asm.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/zcopybpf/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/bsm/audit.h#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#12 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.amd64#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.arm#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.i386#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.ia64#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.pc98#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.arm#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ipl.h#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_ps.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptmv/entry.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_ssif.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/md/md.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/miidevs#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/random/harvest.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_fat.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union.h#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_io.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.h#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/PAE#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/msi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/clock.c#6 integrate .. //depot/projects/zcopybpf/src/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/exception.S#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_main.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_acct.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_alq.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_idle.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_jail.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_linker.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_prot.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/link_elf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_socket.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/Makefile#10 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/nvram/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/uchcom/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/net/bpf.c#24 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf.h#13 integrate .. //depot/projects/zcopybpf/src/sys/net/bsd_comp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/ethernet.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net/if.c#8 integrate .. //depot/projects/zcopybpf/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/zcopybpf/src/sys/net/if_disc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/zcopybpf/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_gif.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_lagg.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net/if_loop.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_ppp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net/if_stf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_tun.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/route.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_input.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_options.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_output.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_structs.h#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_var.h#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.h#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/nd6.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_ali.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_ati.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_i810.c#4 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_intel.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_via.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/agppriv.h#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/intpm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit.h#4 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/zcopybpf/src/sys/security/mac/mac_audit.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/zcopybpf/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_ifoff/mac_ifoff.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_none/mac_none.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_stub/mac_stub.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/isa/isa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/apm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/ata.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/gpt.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/kthread.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/linker.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#9 integrate .. //depot/projects/zcopybpf/src/sys/sys/pciio.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/priv.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/proc.h#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysctl.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/systm.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/vnode.h#5 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/phys_pager.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/swap_pager.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_map.c#7 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_param.h#3 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_zeroidle.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/sctp.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate .. //depot/projects/zcopybpf/src/usr.sbin/tcpdump/tcpdump/config.h#2 integrate Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/CHANGES#2 (text+ko) ==== @@ -1,4 +1,88 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.8 2005/09/05 09:17:47 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04 ken Exp $ (LBL) + +Mon. September 10, 2007. ken@xelerance.com. Summary for 0.9.8 libpcap release + Change build process to put public libpcap headers into pcap subir + DLT: Add value for IPMI IPMB packets + DLT: Add value for u10 Networks boards + Require for pf definitions - allows reading of pflog formatted + libpcap files on an OS other than where the file was generated + +Wed. July 23, 2007. mcr@xelerance.com. Summary for 0.9.7 libpcap release + + FIXED version file to be 0.9.7 instead of 0.9.5. + added flags/configuration for cloning bpf device. + added DLT_MTP2_WITH_PHDR support (PPI) + "fix" the "memory leak" in icode_to_fcode() -- documentation bug + Various link-layer types, with a pseudo-header, for SITA http://www.sita.aero/ + introduces support for the DAG ERF type TYPE_COLOR_MC_HDLC_POS. + Basic BPF filtering support for DLT_MTP2_WITH_PHDR is also added. + check for IPv4 and IPv6, even for DLT_RAW + add support for DLT_JUNIPER_ISM + Pick up changes from NetBSD: many from tron, christos, drochner + Allocate DLT_ for 802.15.4 without any header munging, for Mikko Saarnivala. + Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header + +Wed. April 25, 2007. ken@xelerance.com. Summary for 0.9.6 libpcap release + + Put the public libpcap headers into a pcap subdirectory in both the + source directory and the target include directory, and have include + files at the top-level directory to include those headers, for + backwards compatibility. + Add Bluetooth support + Add USB capturing support on Linux + Add support for the binary USB sniffing interface in Linux + Add support for new FreeBSD BIOCSDIRECTION ioctl + Add additional filter operations for 802.11 frame types + Add support for filtering on MTP2 frame types + Propagate some changes from the main branch, so the x.9 branch has + all the DLT_ and LINKTYPE_ values that the main branch does + Reserved a DLT_ and SAVEFILE_ value for PPI (Per Packet Info) + encapsulated packets + Add LINKTYPE_ for IEEE 802.15.4, with address fields padded as done + by Linux drivers + Add LINKTYPE_ value corresponding to DLT_IEEE802_16_MAC_CPS. + Add DLT for IEEE 802.16 (WiMAX) MAC Common Part Sublayer + Add DLT for Bluetooth HCI UART transport layer + When building a shared library, build with "-fPIC" on Linux to support x86_64 + Link with "$(CC) -shared" rather than "ld -shared" when building a + ".so" shared library + Add support for autoconf 2.60 + Fixes to discard unread packets when changing filters + Changes to handle name changes in the DAG library resulting from + switching to libtool. + Add support for new DAG ERF types. + Add an explicit "-ldag" when building the shared library, so the DAG + library dependency is explicit. + Mac OSX fixes for dealing with "wlt" devices + Fixes in add_or_find_if() & pcap_findalldevs() to optimize generating + device lists + Fixed a bug in pcap_open_live(). The return value of PacketSetHwFilter + was not checked. + +Tue. September 19, 2006. ken@xelerance.com. Summary for 0.9.5 libpcap release + + Support for LAPD frames with vISDN + Support for ERF on channelized T1/E1 cards via DAG API + Fix capitalization that caused issues crossc compiling on Linux + Better failure detection on PacketGetAdapterNames() + Fixes for MPLS packet generation (link layer) + OP_PACKET now matches the beginning of the packet, instead of + beginning+link-layer + Add DLT/LINKTYPE for carrying FRF.16 Multi-link Frame Relay + Fix allocation of buffer for list of link-layer types + Added a new DLT and LINKTYPE value for ARINC 653 Interpartition Communcation Messages + Fixed a typo in a DLT value: it should start with DLT_ and not LINKTYPE_ + Redefined DLT_CAN20B and LINKTYPE_CAN20B as #190 (as this is the right value for CAN). + Added definition for DLT_A429 and LINKTYPE_A429 as #184. + Added a new DLT and LINKTYPE value for CAN v2.0B frames. + Add support for DLT_JUNIPER_VP. + Don't double-count received packets on Linux systems that + support the PACKET_STATISTICS getsockopt() argument on + PF_PACKET sockets. + Add support for DLT_IEEE802_11 and DLT_IEEE802_11_RADIO link + layers in Windows + Add support to build libpcap.lib and wpcap.dll under Cygnus and + MingW32. Mon. September 5, 2005. ken@xelerance.com. Summary for 0.9.4 libpcap release ==== //depot/projects/zcopybpf/src/contrib/libpcap/CREDITS#2 (text+ko) ==== @@ -23,6 +23,7 @@ Chris G. Demetriou Chris Lightfoot Chris Pepper + Daniele Orlandi Darren Reed David Kaelbling David Young @@ -31,6 +32,7 @@ Dug Song Eric Anderson Erik de Castro Lopo + Florent Drouin Franz Schaefer Gianluca Varenni Gilbert Hoyek @@ -50,6 +52,7 @@ John Bankier Jon Lindgren Juergen Schoenwaelder + Jung-uk Kim Kazushi Sugyo Klaus Klein Koryn Grant @@ -63,12 +66,14 @@ Mark Pizzolato Martin Husemann Matthew Luckie + Max Laier Mike Kershaw Mike Wiacek Monroe Williams Nicolas Dade Octavian Cerna Olaf Kirch + Ollie Wild Onno van der Linden Patrick Marie Paul Mundt @@ -78,6 +83,7 @@ Peter Jeremy Phil Wood Rafal Maszkowski + Rick Jones Scott Barron Scott Gifford @@ -85,6 +91,7 @@ Shaun Clowes Solomon Peachy Stefan Hudson + Stephen Donnelly Takashi Yamamoto Tanaka Shin-ya Tony Li ==== //depot/projects/zcopybpf/src/contrib/libpcap/FILES#2 (text+ko) ==== @@ -97,7 +97,6 @@ pcap.3 pcap.c pcap.h -pf.h ppp.h savefile.c scanner.l ==== //depot/projects/zcopybpf/src/contrib/libpcap/INSTALL.txt#2 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20 21:30:14 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.2 2007/09/12 19:17:24 guy Exp $ (LBL) To build libpcap, run "./configure" (a shell script). The configure script will determine your system attributes and generate an @@ -373,7 +373,6 @@ pcap.3 - manual entry pcap.c - pcap utility routines pcap.h - public libpcap definitions -pf.h - OpenBSD DLT_PFLOG definitions ppp.h - Point to Point Protocol definitions rawss7.h - information on DLT_ types for SS7 savefile.c - offline support ==== //depot/projects/zcopybpf/src/contrib/libpcap/Makefile.in#2 (text+ko) ==== @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99 2003/12/15 01:35:03 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99.2.2 2007/07/24 02:35:15 mcr Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -46,7 +46,9 @@ INCLS = -I. @V_INCLS@ DEFS = @DEFS@ @V_DEFS@ LIBS = @V_LIBS@ +DAGLIBS = @DAGLIBS@ DYEXT = @DYEXT@ +PROG=libpcap # Standard CFLAGS CFLAGS = $(CCOPT) $(INCLS) $(DEFS) @@ -112,7 +114,7 @@ # libpcap.so: $(OBJ) @rm -f $@ - ld -shared -o $@.`cat VERSION` $(OBJ) + $(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS) # the following rule succeeds, but the result is untested. libpcap.dylib: $(OBJ) @@ -216,19 +218,10 @@ RPMVERSION=`cat VERSION | sed s/-.*//g`; \ sed -e s/@VERSION@/$$RPMVERSION/ -e s/@NAME@/libpcap-`cat VERSION`/ $< > $@ -tar: Makefile packaging/pcap.spec - @cwd=`pwd` ; dir=`basename $$cwd` ; name=libpcap-`cat VERSION` ; \ - list="" ; tar="tar chf" ; \ - for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \ - echo \ - "rm -f ../$$name; ln -s $$dir ../$$name" ; \ - rm -f ../$$name; ln -s $$dir ../$$name ; \ - echo \ - "(cd .. ; $$tar - [lots of files]) | gzip -c > /tmp/$$name.tar.gz" ; \ - (cd .. ; $$tar - $$list) | gzip -c > /tmp/$$name.tar.gz ; \ - echo \ - "rm -f ../$$name" ; \ - rm -f ../$$name +releasetar: + @cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \ + list="" ; make distclean; cd ..; mkdir -p n; cd n; ln -s ../$$dir $$name; \ + tar -c -z -f $$name.tar.gz $$name/. ; depend: $(GENSRC) $(GENHDR) bpf_filter.c ./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) ==== //depot/projects/zcopybpf/src/contrib/libpcap/README.dag#2 (text+ko) ==== @@ -77,11 +77,32 @@ include packets that would have been dropped by the filter). The RX stream buffer size is user configurable outside libpcap, typically 16-512MB. -pcap_get_selectable_fd() is not supported, DAG cards do not support +pcap_get_selectable_fd() is not supported, as DAG cards do not support poll/select methods. pcap_inject() and pcap_sendpacket() are not supported. +Some DAG cards now support capturing to multiple virtual interfaces, called +streams. Capture streams have even numbers. These are available via libpcap +as separate interfaces, e.g. dag0:0, dag0:2, dag0:4 etc. dag0:0 is the same +as dag0. These are visible via pcap_findalldevs(). + +libpcap now does NOT set the card's hardware snaplen (slen). This must now be +set using the appropriate DAG coniguration program, e.g. dagthree, dagfour, +dagsix, dagconfig. This is because the snaplen is currently shared between +all of the streams. In future this may change if per-stream slen is +implemented. + +DAG cards by default capture entire packets including the L2 +CRC/FCS. If the card is not configured to discard the CRC/FCS, this +can confuse applications that use libpcap if they're not prepared for +packets to have an FCS. Libpcap now reads the environment variable +ERF_FCS_BITS to determine how many bits of CRC/FCS to strip from the +end of the captured frame. This defaults to 32 for use with +Ethernet. If the card is configured to strip the CRC/FCS, then set +ERF_FCS_BITS=0. If used with a HDLC/PoS/PPP/Frame Relay link with 16 +bit CRC/FCS, then set ERF_FCS_BITS=16. + ---------------------------------------------------------------------- Please submit bug reports via . ==== //depot/projects/zcopybpf/src/contrib/libpcap/TODO#2 (text+ko) ==== @@ -15,13 +15,6 @@ style (okay, you can guess that by looking at the code) and a guide for what needs to be documented. -Linux kernel interface - -- Currently there is a race condition in that a socket is activated at the - same time it is opened - before applying a filter. This has to - be corrected so that capture starts when pcap_read is called for the - first time. - Less urgent items ----------------- ==== //depot/projects/zcopybpf/src/contrib/libpcap/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -0.9.4 +0.9.8 ==== //depot/projects/zcopybpf/src/contrib/libpcap/bpf_image.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26 2003/11/15 23:23:57 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26.2.1 2007/06/11 09:52:04 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -43,7 +43,7 @@ int n; { int v; - char *fmt, *op; + const char *fmt, *op; static char image[256]; char operand[64]; ==== //depot/projects/zcopybpf/src/contrib/libpcap/config.h.in#2 (text+ko) ==== @@ -10,9 +10,15 @@ /* Enable optimizer debugging */ #undef BDEBUG +/* define if you have a cloning BPF device */ +#undef HAVE_CLONING_BPF + /* define if you have the DAG API */ #undef HAVE_DAG_API +/* define if you have dag_get_erf_types() */ +#undef HAVE_DAG_GET_ERF_TYPES + /* define if you have streams capable DAG API */ #undef HAVE_DAG_STREAMS_API @@ -50,9 +56,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_IF_ETHER_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_PFVAR_H + /* if there's an os_proto.h */ #undef HAVE_OS_PROTO_H +/* Define to 1 if you have the header file. */ +#undef HAVE_PATHS_H + /* define if you have a /proc/net/dev */ #undef HAVE_PROC_NET_DEV ==== //depot/projects/zcopybpf/src/contrib/libpcap/configure#2 (text+ko) ==== @@ -1,37 +1,101 @@ #! /bin/sh -# From configure.in Revision: 1.120.2.7 . +# From configure.in Revision: 1.120.2.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.61. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 2 18:56:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0082E16A421; Fri, 2 Nov 2007 18:56:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 846E716A418 for ; Fri, 2 Nov 2007 18:56:57 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7375313C467 for ; Fri, 2 Nov 2007 18:56:57 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2IuvqC075912 for ; Fri, 2 Nov 2007 18:56:57 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2Iuv5s075909 for perforce@freebsd.org; Fri, 2 Nov 2007 18:56:57 GMT (envelope-from raj@freebsd.org) Date: Fri, 2 Nov 2007 18:56:57 GMT Message-Id: <200711021856.lA2Iuv5s075909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 128526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 18:56:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=128526 Change 128526 by raj@raj_mimi on 2007/11/02 18:56:27 Cleanup after the IFC Affected files ... .. //depot/projects/e500/contrib/gcc/config/rs6000/sysv4.h#3 edit .. //depot/projects/e500/sys/boot/uboot/lib/glue.c#2 edit .. //depot/projects/e500/sys/powerpc/powerpc/swtch.S#4 delete .. //depot/projects/e500/sys/powerpc/powerpc/uma_machdep.c#4 delete .. //depot/projects/e500/sys/powerpc/powerpc/vm_machdep.c#6 delete Differences ... ==== //depot/projects/e500/contrib/gcc/config/rs6000/sysv4.h#3 (text+ko) ==== @@ -1126,7 +1126,9 @@ be stacked, so that invocations of #pragma pack(pop)' will return to the previous value. */ +/* XXX this is already defined in the common contrib/gcc/config/freebsd.h #define HANDLE_PRAGMA_PACK_PUSH_POP 1 +*/ /* Select a format to encode pointers in exception handling data. CODE is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is ==== //depot/projects/e500/sys/boot/uboot/lib/glue.c#2 (text+ko) ==== @@ -1,3 +1,28 @@ +/*- + * Copyright (c) 2007 Semihalf, Rafal Jaworowski + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ #include #include "api_public.h" From owner-p4-projects@FreeBSD.ORG Fri Nov 2 18:56:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88C3E16A52B; Fri, 2 Nov 2007 18:56:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E28CD16A41A for ; Fri, 2 Nov 2007 18:56:57 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF78C13C465 for ; Fri, 2 Nov 2007 18:56:57 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2Iuvpv075919 for ; Fri, 2 Nov 2007 18:56:57 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2IuvFj075915 for perforce@freebsd.org; Fri, 2 Nov 2007 18:56:57 GMT (envelope-from raj@freebsd.org) Date: Fri, 2 Nov 2007 18:56:57 GMT Message-Id: <200711021856.lA2IuvFj075915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 128527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 18:56:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=128527 Change 128527 by raj@raj_mimi on 2007/11/02 18:56:48 Disable SoftFloat library for the PowerPC and use gcc's soft-fp. Previously for the FPU-less PowerPC (e500) we used the SoftFloat library integrated with libc; now switch to the new libgcc fine-grained soft-float emulation. Affected files ... .. //depot/projects/e500/gnu/lib/libgcc/Makefile#4 edit .. //depot/projects/e500/lib/libc/Makefile#5 edit Differences ... ==== //depot/projects/e500/gnu/lib/libgcc/Makefile#4 (text+ko) ==== @@ -122,7 +122,7 @@ .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm -LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c +LIB2FUNCS_EXTRA = tramp.asm LIB2FUNCS_STATIC_EXTRA = eabi.asm .endif ==== //depot/projects/e500/lib/libc/Makefile#5 (text+ko) ==== @@ -63,7 +63,7 @@ .include "${.CURDIR}/rpc/Makefile.inc" .include "${.CURDIR}/uuid/Makefile.inc" .include "${.CURDIR}/xdr/Makefile.inc" -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "arm" .include "${.CURDIR}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" From owner-p4-projects@FreeBSD.ORG Fri Nov 2 18:57:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 968CC16A469; Fri, 2 Nov 2007 18:57:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51A3016A418 for ; Fri, 2 Nov 2007 18:57:59 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AFD713C448 for ; Fri, 2 Nov 2007 18:57:59 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2IvxXM075982 for ; Fri, 2 Nov 2007 18:57:59 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2IvwF2075979 for perforce@freebsd.org; Fri, 2 Nov 2007 18:57:58 GMT (envelope-from raj@freebsd.org) Date: Fri, 2 Nov 2007 18:57:58 GMT Message-Id: <200711021857.lA2IvwF2075979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 128528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 18:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=128528 Change 128528 by raj@raj_mimi on 2007/11/02 18:57:11 Introduce UBOOT build option Using WITH_UBOOT in src.conf now allows to differentiate the underlying firmware we're building against, so only the specific variant of loader(8) is created and installed. When this option is unset (the default) the OF-based version of loader and its helper libs are built. Affected files ... .. //depot/projects/e500/lib/libstand/Makefile#5 edit .. //depot/projects/e500/share/mk/bsd.own.mk#5 edit .. //depot/projects/e500/sys/boot/Makefile#3 edit .. //depot/projects/e500/sys/boot/ficl/Makefile#4 edit .. //depot/projects/e500/sys/boot/powerpc/Makefile#3 edit .. //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#3 edit .. //depot/projects/e500/sys/boot/uboot/lib/Makefile#4 edit Differences ... ==== //depot/projects/e500/lib/libstand/Makefile#5 (text+ko) ==== @@ -6,6 +6,8 @@ # quite large. # +.include + LIB= stand NO_PROFILE= NO_PIC= @@ -26,7 +28,10 @@ CFLAGS+= -Os .endif .if ${MACHINE_ARCH} == "powerpc" -CFLAGS+= -ffixed-r14 -ffixed-r29 -msoft-float -D_STANDALONE +CFLAGS+= -msoft-float -D_STANDALONE +. if ${MK_UBOOT} != "no" +CFLAGS+= -ffixed-r14 -ffixed-r29 +. endif .endif .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -m32 -I. ==== //depot/projects/e500/share/mk/bsd.own.mk#5 (text+ko) ==== @@ -263,6 +263,7 @@ SYSCONS \ TCSH \ TOOLCHAIN \ + UBOOT \ USB \ WPA_SUPPLICANT_EAPOL .if defined(NO_${var}) @@ -382,7 +383,8 @@ .for var in \ BIND_LIBS \ HESIOD \ - IDEA + IDEA \ + UBOOT .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif ==== //depot/projects/e500/sys/boot/Makefile#3 (text+ko) ==== @@ -13,13 +13,18 @@ .endif # Build Open Firmware library. -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "sparc64" SUBDIR+= ofw .endif +.if ${MACHINE_ARCH} == "powerpc" +. if ${MK_UBOOT} != "no" # Build U-Boot library. -.if ${MACHINE_ARCH} == "powerpc" SUBDIR+= uboot +. else +# Build Open Firmware library. +SUBDIR+= ofw +. endif .endif # Pick the machine-dependent subdir based on the target architecture. ==== //depot/projects/e500/sys/boot/ficl/Makefile#4 (text+ko) ==== @@ -1,5 +1,8 @@ # $FreeBSD: src/sys/boot/ficl/Makefile,v 1.45 2007/10/15 14:20:24 nyan Exp $ # + +.include + .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ prefix.c search.c stack.c tools.c vm.c words.c @@ -15,13 +18,16 @@ CFLAGS+= -mno-sse3 .endif .if ${MACHINE_ARCH} == "powerpc" +CFLAGS+= -msoft-float +. if ${MK_UBOOT} != "no" # # Important notice: registers dedicated for U-Boot must NOT be used by the # loader code, as we are going to jump between loader(8) and U-Boot code back # and forth safely. For PowerPC these are r14 and r29, but always make # sure in the U-Boot cpu/{CPU}/config.mk, e.g. cpu/mpc85xx/config.mk # -CFLAGS+= -ffixed-r14 -ffixed-r29 -msoft-float +CFLAGS+= -ffixed-r14 -ffixed-r29 +. endif .endif .if ${MACHINE} == "pc98" CFLAGS+= -Os -DPC98 ==== //depot/projects/e500/sys/boot/powerpc/Makefile#3 (text+ko) ==== @@ -1,5 +1,11 @@ # $FreeBSD: src/sys/boot/powerpc/Makefile,v 1.1 2000/10/16 10:46:10 obrien Exp $ -SUBDIR= ofw uboot +.include + +.if ${MK_UBOOT} != "no" +SUBDIR= uboot +.else +SUBDIR= ofw +.endif .include ==== //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#3 (text+ko) ==== @@ -72,7 +72,7 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc # XXX e500 specific - need to integrate it with the overall build settings... -CFLAGS+= -Wa,-me500 -msoft-float +#CFLAGS+= -Wa,-me500 -msoft-float # Pull in common loader code .PATH: ${.CURDIR}/../../uboot/common ==== //depot/projects/e500/sys/boot/uboot/lib/Makefile#4 (text+ko) ==== @@ -20,7 +20,8 @@ # sure in the U-Boot cpu/{CPU}/config.mk, e.g. cpu/mpc85xx/config.mk # # FIXME this should be integrated with the whole system build settings -CFLAGS+= -msoft-float -Wa,-me500 -ffixed-r14 -ffixed-r29 +#CFLAGS+= -msoft-float -Wa,-me500 -ffixed-r14 -ffixed-r29 +CFLAGS+= -ffixed-r14 -ffixed-r29 .endif .ifdef(BOOT_DISK_DEBUG) From owner-p4-projects@FreeBSD.ORG Fri Nov 2 19:15:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D599416A468; Fri, 2 Nov 2007 19:15:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7464816A41B for ; Fri, 2 Nov 2007 19:15:17 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6450D13C4A5 for ; Fri, 2 Nov 2007 19:15:17 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2JFHuU078303 for ; Fri, 2 Nov 2007 19:15:17 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2JFHLt078300 for perforce@freebsd.org; Fri, 2 Nov 2007 19:15:17 GMT (envelope-from raj@freebsd.org) Date: Fri, 2 Nov 2007 19:15:17 GMT Message-Id: <200711021915.lA2JFHLt078300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 128529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 19:15:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=128529 Change 128529 by raj@raj_mimi on 2007/11/02 19:14:18 Cleanup Affected files ... .. //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#4 edit .. //depot/projects/e500/sys/boot/uboot/lib/Makefile#5 edit Differences ... ==== //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#4 (text+ko) ==== @@ -71,9 +71,6 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc -# XXX e500 specific - need to integrate it with the overall build settings... -#CFLAGS+= -Wa,-me500 -msoft-float - # Pull in common loader code .PATH: ${.CURDIR}/../../uboot/common .include "${.CURDIR}/../../uboot/common/Makefile.inc" ==== //depot/projects/e500/sys/boot/uboot/lib/Makefile#5 (text+ko) ==== @@ -19,8 +19,6 @@ # and forth safely. For PowerPC these are r14 and r29, but always make # sure in the U-Boot cpu/{CPU}/config.mk, e.g. cpu/mpc85xx/config.mk # -# FIXME this should be integrated with the whole system build settings -#CFLAGS+= -msoft-float -Wa,-me500 -ffixed-r14 -ffixed-r29 CFLAGS+= -ffixed-r14 -ffixed-r29 .endif From owner-p4-projects@FreeBSD.ORG Fri Nov 2 22:37:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D7FB16A46B; Fri, 2 Nov 2007 22:37:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C440D16A468 for ; Fri, 2 Nov 2007 22:37:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2FBF13C49D for ; Fri, 2 Nov 2007 22:37:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2Mb78G002383 for ; Fri, 2 Nov 2007 22:37:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2MawdL002374 for perforce@freebsd.org; Fri, 2 Nov 2007 22:36:58 GMT (envelope-from jb@freebsd.org) Date: Fri, 2 Nov 2007 22:36:58 GMT Message-Id: <200711022236.lA2MawdL002374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 22:37:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=128536 Change 128536 by jb@jb_freebsd1 on 2007/11/02 22:36:13 IFC Affected files ... .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/appendix.decl#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/chapter.decl#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/colophon.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/txtfiles.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/books.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/catalog#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/newsgroups.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/teams.ent#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/translators.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/urls.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#49 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#33 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#13 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#44 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#25 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/brix.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#27 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#26 integrate .. //depot/projects/dtrace/ports/MOVED#50 integrate .. //depot/projects/dtrace/ports/Mk/bsd.kde.mk#7 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#8 integrate .. //depot/projects/dtrace/ports/UPDATING#39 integrate .. //depot/projects/dtrace/src/Makefile.inc1#32 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#26 integrate .. //depot/projects/dtrace/src/bin/mv/mv.1#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/HISTORY#8 integrate .. //depot/projects/dtrace/src/contrib/openbsm/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/VERSION#8 integrate .. //depot/projects/dtrace/src/contrib/openbsm/aclocal.m4#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditreduce/auditreduce.c#6 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/praudit/praudit.c#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bsm/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/config/config.h#7 integrate .. //depot/projects/dtrace/src/contrib/openbsm/config/config.h.in#6 integrate .. //depot/projects/dtrace/src/contrib/openbsm/config/ltmain.sh#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/configure#8 integrate .. //depot/projects/dtrace/src/contrib/openbsm/configure.ac#8 integrate .. //depot/projects/dtrace/src/contrib/openbsm/etc/audit_class#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/etc/audit_event#7 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_event.c#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_io.c#7 integrate .. //depot/projects/dtrace/src/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/tools/Makefile.in#4 integrate .. //depot/projects/dtrace/src/etc/Makefile#10 integrate .. //depot/projects/dtrace/src/include/_ctype.h#7 integrate .. //depot/projects/dtrace/src/include/pthread.h#4 integrate .. //depot/projects/dtrace/src/include/pthread_np.h#6 integrate .. //depot/projects/dtrace/src/lib/libc/gen/valloc.3#6 integrate .. //depot/projects/dtrace/src/lib/libc/net/ethers.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/minherit.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/dtrace/src/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/dtrace/src/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_accept_sec_context.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_acquire_cred.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_add_cred.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_add_oid_set_member.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_canonicalize_name.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_compare_name.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_context_time.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_create_empty_oid_set.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_delete_sec_context.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_display_name.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_display_status.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_duplicate_name.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_export_name.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_export_sec_context.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_get_mic.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_import_name.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_import_sec_context.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_indicate_mechs.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_init_sec_context.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_inquire_context.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_inquire_cred.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_inquire_cred_by_mech.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_inquire_mechs_for_name.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_inquire_names_for_mech.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_process_context_token.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_release_buffer.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_release_cred.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_release_name.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_release_oid_set.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_test_oid_set_member.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_unwrap.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_verify_mic.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_wrap.3#4 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_wrap_size_limit.3#4 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex.c#3 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#14 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#15 integrate .. //depot/projects/dtrace/src/libexec/Makefile#5 integrate .. //depot/projects/dtrace/src/sbin/gpt/boot.c#2 integrate .. //depot/projects/dtrace/src/sbin/gpt/gpt.c#6 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#14 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifieee80211.c#9 integrate .. //depot/projects/dtrace/src/sbin/route/route.8#4 integrate .. //depot/projects/dtrace/src/sbin/route/route.c#4 integrate .. //depot/projects/dtrace/src/share/man/man3/queue.3#5 integrate .. //depot/projects/dtrace/src/share/man/man4/mac.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/md.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_car.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_netflow.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/nxge.4#2 integrate .. //depot/projects/dtrace/src/share/man/man5/bluetooth.device.conf.5#5 integrate .. //depot/projects/dtrace/src/share/man/man5/quota.user.5#5 integrate .. //depot/projects/dtrace/src/share/man/man5/xfs.5#2 integrate .. //depot/projects/dtrace/src/share/man/man9/uio.9#5 integrate .. //depot/projects/dtrace/src/share/misc/bsd-family-tree#12 integrate .. //depot/projects/dtrace/src/share/misc/committers-ports.dot#2 integrate .. //depot/projects/dtrace/src/share/misc/pci_vendors#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#20 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/nexus.c#9 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/DEFAULTS#11 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pc/bios.h#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#11 integrate .. //depot/projects/dtrace/src/sys/arm/at91/ohci_atmelarm.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/include/cpuconf.h#9 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosmem.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/biossmap.c#5 integrate .. //depot/projects/dtrace/src/sys/bsm/audit.h#8 integrate .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#16 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/dtrace/src/sys/conf/options.arm#12 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_log.c#7 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_nat.c#7 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_state.c#8 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_cam.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mii/e1000phyreg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/mii/gentbi.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#11 integrate .. //depot/projects/dtrace/src/sys/dev/mii/rgephy.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/mii/rgephyreg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/dtrace/src/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#11 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#13 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/dtrace/src/sys/i386/include/pc/bios.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#15 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#26 integrate .. //depot/projects/dtrace/src/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_input.c#10 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.h#7 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.c#7 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.h#7 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_var.h#8 integrate .. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate .. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.h#6 integrate .. //depot/projects/dtrace/src/sys/pci/agp.c#9 integrate .. //depot/projects/dtrace/src/sys/pci/agp_ali.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/agp_amd.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/agp_amd64.c#6 integrate .. //depot/projects/dtrace/src/sys/pci/agp_ati.c#5 integrate .. //depot/projects/dtrace/src/sys/pci/agp_i810.c#7 integrate .. //depot/projects/dtrace/src/sys/pci/agp_intel.c#5 integrate .. //depot/projects/dtrace/src/sys/pci/agp_nvidia.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/agp_sis.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/agp_via.c#5 integrate .. //depot/projects/dtrace/src/sys/pci/agppriv.h#5 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit.c#11 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#7 integrate .. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#15 integrate .. //depot/projects/dtrace/src/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/dtrace/src/sys/security/mac_ifoff/mac_ifoff.c#7 integrate .. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#13 integrate .. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#14 integrate .. //depot/projects/dtrace/src/sys/security/mac_partition/mac_partition.c#8 integrate .. //depot/projects/dtrace/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 integrate .. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#12 integrate .. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#11 integrate .. //depot/projects/dtrace/src/sys/sparc64/isa/isa.c#6 integrate .. //depot/projects/dtrace/src/sys/vm/phys_pager.c#6 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#15 integrate .. //depot/projects/dtrace/src/tools/tools/nxge/Makefile#2 integrate .. //depot/projects/dtrace/src/tools/tools/nxge/xge_cmn.h#2 integrate .. //depot/projects/dtrace/src/tools/tools/nxge/xge_info.c#2 integrate .. //depot/projects/dtrace/src/tools/tools/nxge/xge_info.h#2 integrate .. //depot/projects/dtrace/src/tools/tools/nxge/xge_log.c#2 integrate .. //depot/projects/dtrace/src/tools/tools/nxge/xge_log.h#2 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#15 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/io.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/file2c/file2c.1#5 integrate .. //depot/projects/dtrace/src/usr.bin/file2c/file2c.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/lockf/lockf.1#6 integrate .. //depot/projects/dtrace/src/usr.bin/make/make.1#7 integrate .. //depot/projects/dtrace/src/usr.bin/msgs/msgs.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/tail/read.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/tail/reverse.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/tail/tail.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/xstr/xstr.1#4 integrate .. //depot/projects/dtrace/src/usr.sbin/fwcontrol/fwcontrol.8#6 integrate .. //depot/projects/dtrace/src/usr.sbin/ifmcstat/ifmcstat.8#5 integrate .. //depot/projects/dtrace/src/usr.sbin/mtree/mtree.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/match.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/rpc.lockd.8#5 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.statd/rpc.statd.8#5 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.statd/statd.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/config.c#8 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/dmenu.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/tcpdrop/tcpdrop.c#4 integrate .. //depot/projects/dtrace/www/en/developers.sgml#23 integrate .. //depot/projects/dtrace/www/en/docs/books.sgml#10 integrate .. //depot/projects/dtrace/www/en/features.sgml#7 integrate .. //depot/projects/dtrace/www/en/java/dists/15.sgml#6 integrate .. //depot/projects/dtrace/www/en/java/newsflash.sgml#6 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#19 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#4 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xsl#2 integrate .. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#4 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#23 integrate .. //depot/projects/dtrace/www/hu/projects/projects.sgml#3 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.consult.xml#8 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.hardware.xml#4 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#25 integrate .. //depot/projects/dtrace/www/share/sgml/press.xml#17 integrate .. //depot/projects/dtrace/www/share/sgml/usergroups.xml#15 integrate Differences ... ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/Makefile#3 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/Makefile,v 1.2 2004/07/24 22:03:20 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/Makefile,v 1.3 2007/11/02 16:14:20 keramida Exp $ # Original version: 1.7 SUBDIR = articles +SUBDIR+= books COMPAT_SYMLINK = el ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/Makefile,v 1.10 2006/07/14 21:28:45 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/Makefile,v 1.11 2007/11/02 16:14:20 keramida Exp $ # Original version: 1.39 SUBDIR = @@ -7,6 +7,7 @@ SUBDIR+= explaining-bsd SUBDIR+= formatting-media SUBDIR+= freebsd-questions +SUBDIR+= greek-language-support SUBDIR+= laptop SUBDIR+= multi-os SUBDIR+= new-users ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/catalog#3 (text+ko) ==== @@ -1,7 +1,7 @@ -- ...................................................................... -- -- FreeBSD SGML Public Identifiers ...................................... -- - -- $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/catalog,v 1.5 2005/01/06 14:19:14 keramida Exp $ + -- $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/catalog,v 1.6 2007/11/02 16:14:25 keramida Exp $ -- -- It doesn't make sense to translate all the entity files of the -- FreeBSD docs to Greek; some of the entities are better left off in @@ -11,20 +11,38 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EL" "articles.ent" +PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EL" + "books.ent" + PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" "freebsd.dsl" +PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN" + "../../../share/sgml/freebsd.ent" + +PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL" + "freebsd.ent" + PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL" "mailing-lists.ent" -PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EL" +PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EL" "bookinfo.ent" +PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL" + "newsgroups.ent" + PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL" "teams.ent" PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL" "trademarks.ent" +PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL" + "translators.ent" + PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN" "l10n.ent" + +PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL" + "urls.ent" ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#3 (text+ko) ==== @@ -2,7 +2,7 @@ Ëåîéêü/ÃëùóóÜñé ôùí ¼ñùí ôçò Ôåêìçñßùóçò ôïõ FreeBSD Ðáñáêáëþ êñáôÞóôå áõôü ôï áñ÷åßï ôáîéíïìçìÝíï áëöáâçôéêÜ. - $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml,v 1.2 2005/09/23 01:07:46 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml,v 1.3 2007/11/02 16:14:25 keramida Exp $ Original version: 1.13 --> @@ -23,7 +23,7 @@ Group (CSRG) óôï ÐáíåðéóôÞìéï ôçò Êáëéöüñíéá óôï Berkeley óôéò âåëôéþóåéò êáé ìåôáâïëÝò - ðïõ Ýêáíå óôï &unix; 32V ôçò A&&smp;T. Ôï &os; åßíáé Ýíáò + ðïõ Ýêáíå óôï &unix; 32V ôçò A&T. Ôï &os; åßíáé Ýíáò áðüãïíïò ôçò äïõëåéÜò ôïõ CSRG. ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#3 (text+ko) ==== @@ -1,4 +1,11 @@ - + + + + + + + + ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#3 (text+ko) ==== @@ -4,7 +4,7 @@ Original version: 1.34 - $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent,v 1.4 2004/07/24 22:32:27 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent,v 1.5 2007/11/02 16:14:25 keramida Exp $ --> @@ -39,6 +39,10 @@ çëåêôñïíéêÞ ëßóôá áíáêïéíþóåùí ôïõ FreeBSD"> freebsd-announce"> + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôï Apache"> +freebsd-apache"> + çëåêôñïíéêÞ ëßóôá áñ÷éôåêôïíéêÞò êáé ó÷åäéáóìïý ôïõ FreeBSD"> freebsd-arch"> @@ -59,6 +63,10 @@ çëåêôñïíéêÞ ëßóôá áíáâÜèìéóçò ôïõ FreeBSD ìå åêôåëÝóéìá áñ÷åßá"> freebsd-binup"> + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá Bluetooth"> +freebsd-bluetooth"> + çëåêôñïíéêÞ ëßóôá ôçò ïìÜäáò bugbusters ôïõ FreeBSD"> freebsd-bugbusters"> @@ -78,13 +86,8 @@ - -çëåêôñïíéêÞ ëßóôá åñãáëåßùí åãêáôÜóôáóçò êáé ñýèìéóçò ôïõ FreeBSD"> -freebsd-config"> - - + çëåêôñïíéêÞ ëßóôá ôçò Ýêäïóçò &os.current;"> @@ -151,10 +154,26 @@ + +çëåêôñïíéêÞ ëßóôá ãéá ôçí áíÜðôõîç ïäçãþí óõóêåõþí ôïõ FreeBSD"> +freebsd-drivers"> + + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôïõò ÷ñÞóôåò ôïõ Eclipse IDE"> +freebsd-eclipse"> + + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôéò embedded ðëáôöüñìåò"> +freebsd-embedded"> + çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá åîïìïßùóç-åîïìïéùôÝò"> freebsd-emulation"> + +çëåêôñïíéêÞ ëßóôá FreeBSD-eol"> +freebsd-eol"> + çëåêôñïíéêÞ ëßóôá óõæçôÞóåùí ãéá FireWire (IEEE 1394) ôïõ FreeBSD"> freebsd-firewire"> @@ -211,6 +230,10 @@ çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôïõò ðáñï÷åßò õðçñåóéþí Internet"> freebsd-isp"> + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôá jails"> +freebsd-jail"> + çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôç ãëþóóá Java"> freebsd-java"> @@ -275,6 +298,10 @@ çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôç ãëþóóá Perl"> freebsd-perl"> + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôï packet filter firewall"> +freebsd-pf"> + çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôéò ìç-Intel ðëáôöüñìåò"> freebsd-platforms"> @@ -301,6 +328,14 @@ çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôçí ðëáôöüñìá PowerPC"> freebsd-ppc"> + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôéò ðëáôöüñìåò åîõðçñåôçôþí HP ProLiant"> +freebsd-proliant"> + + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôç ãëþóóá Python"> +freebsd-python"> + çëåêôñïíéêÞ ëßóôá ÅëÝã÷ïõ êáé ÅîáóöÜëéóçò Ðïéüôçôáò ôïõ FreeBSD"> freebsd-qa"> @@ -309,6 +344,10 @@ çëåêôñïíéêÞ ëßóôá ãåíéêþí åñùôÞóåùí ôïõ FreeBSD"> freebsd-questions"> + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôï óýóôçìá ôùí boot script"> +freebsd-rc"> + çëåêôñïíéêÞ ëßóôá åðåêôÜóåùí ðñáãìáôéêïý-÷ñüíïõ ôïõ FreeBSD"> freebsd-realtime"> @@ -351,6 +390,10 @@ çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôç óõìâáôüôçôá ìå ôá ðñüôõðá C99 êáé POSIX"> freebsd-standards"> + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôçí ðëáôöüñìá sun4v"> +freebsd-sun4v"> + çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá äïêéìáóôéêÜ ìçíýìáôá"> freebsd-test"> @@ -367,6 +410,10 @@ çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôï õðïóýóôçìá tokenring"> freebsd-tokenring"> + +çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôç äéáóýíäåóç ìå óõóêåõÝò USB"> +freebsd-usb"> + çëåêôñïíéêÞ ëßóôá ïñãÜíùóçò ôùí ïìÜäùí ÷ñçóôþí ôïõ FreeBSD"> freebsd-user-groups"> @@ -375,6 +422,10 @@ çëåêôñïíéêÞ ëßóôá ðñïóõííåíüçóçò ôùí ðñïìçèåõôþí ôïõ FreeBSD"> freebsd-vendors"> + +çëåêôñïíéêÞ ëßóôá ãéá ôçí ðëáôöüñìá VuXML"> +freebsd-vuxml"> + çëåêôñïíéêÞ ëßóôá ôïõ Webmaster ôïõ FreeBSD"> freebsd-www"> @@ -383,4 +434,9 @@ çëåêôñïíéêÞ ëßóôá ôïõ FreeBSD ãéá ôï ãñáöéêü ðåñéâÜëëïí X11"> freebsd-x11"> + + +bug-followup@FreeBSD.org"> + + majordomo@FreeBSD.org"> ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/teams.ent#3 (text+ko) ==== @@ -15,15 +15,21 @@ ôùí óôáôéêþí web óåëßäùí óôï www.FreeBSD.org êáé èá âñþ åõêáéñßá íá óáò êÜíù ñüìðá äçìïóßùò. - $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/teams.ent,v 1.2 2004/07/24 22:30:56 keramida Exp $ - Original version: 1.12 + $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/teams.ent,v 1.3 2007/11/02 16:14:25 keramida Exp $ + Original version: 1.18 --> admins@FreeBSD.org"> -core-secretary@FreeBSD.org"> +bugmeister@FreeBSD.org"> + +core-secretary@FreeBSD.org"> + +cvsadm@FreeBSD.org"> + +cvs@FreeBSD.org"> -cvs@FreeBSD.org"> +dcvs@FreeBSD.org"> cvs@FreeBSD.org"> @@ -37,10 +43,18 @@ mirror-admin@FreeBSD.org"> +ncvs@FreeBSD.org"> + +perforce-admin@FreeBSD.org"> + +pcvs@FreeBSD.org"> + portmgr@FreeBSD.org"> +portmgr-secretary@FreeBSD.org"> + +projcvs@FreeBSD.org"> + re@FreeBSD.org"> security-officer@FreeBSD.org"> - -www@FreeBSD.org"> ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#3 (text+ko) ==== @@ -8,9 +8,9 @@ Please keep this file sorted. - Original version: 1.19 + Original version: 1.40 - $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/trademarks.ent,v 1.1 2004/07/24 22:22:00 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/trademarks.ent,v 1.2 2007/11/02 16:14:25 keramida Exp $ --> Ïé ëÝîåéò 3Com êáé HomeConnect åßíáé @@ -46,14 +46,21 @@ AMD Athlon"> AMD Duron"> AMD-K6"> -AMD Operon"> +AMD Opteron"> +AMD Sempron"> +AMD Turion"> +Athlon"> Élan"> +Opteron"> Ïé ëÝîåéò Þ öñÜóåéò Apple, FireWire, Mac, Macintosh, Mac OS, Quicktime, êáé TrueType åßíáé åìðïñéêÜ óýìâïëá ôçò Apple Computer, Inc., êáôï÷õñùìÝíá óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò."> +AirPort"> +Apple"> FireWire"> +iMac"> Mac"> Macintosh"> Mac OS"> @@ -106,9 +113,15 @@ Dell"> PowerEdge"> + +Ïé ëÝîåéò Þ öñÜóåéò EPSON, EPSON Perfection + åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Seiko Epson Corporation."> +EPSON"> +EPSON + Perfection"> + Ôï FreeBSD åßíáé Ýíá êáôï÷õñùìÝíï åìðïñéêü - óýìâïëï ôçò Wind River Systems, Inc. Áõôü åßíáé ðéèáíü íá áëëÜîåé - óýíôïìá."> + óýìâïëï ôïõ FreeBSD Foundation."> Ïé ëÝîåéò Þ öñÜóåéò Heidelberg, @@ -145,6 +158,7 @@ Intel"> Itanium"> Pentium"> +Core"> Xeon"> @@ -163,11 +177,12 @@ åìðïñéêÜ óýìâïëá ôçò Lantronix Corporation."> EasyIO"> + Ôï Linux åßíáé Ýíá êáôï÷õñùìÝíá åìðïñéêü óýìâïëï ôïõ Linus Torvalds óôéò ÇíùìÝíåò Ðïëéôåßåò."> +Linux"> - Ïé ëÝîåéò LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID êáé Mylex åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò LSI Logic Corp."> @@ -186,13 +201,16 @@ Outlook, Windows, Windows Media, êáé Windows NT åßíáé åßôå êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá Þ åìðïñéêÜ óýìâïëá ôçò Microsoft Corporation óôéò ÇíùìÝíåò Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò."> +IntelliMouse"> Microsoft"> MS-DOS"> Outlook"> Windows"> Windows Media"> + Windows NT"> + Ïé ëÝîåéò MIPS êáé R4000 åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò MIPS Technologies, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå @@ -211,6 +229,10 @@ Pioneers, Ltd."> DiskOnChip"> + +Ç ëÝîç NetBSD åßíáé Ýíá êáôï÷õñùìÝíï åìðïñéêü + óýìâïëï ôïõ NetBSD Foundation."> + Ïé ëÝîåéò Netscape êáé Netscape Navigator åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Netscape Communications Corporation óôéò Ç.Ð.Á êáé Üëëåò ÷þñåò."> @@ -241,6 +263,9 @@ åìðïñéêü óýìâïëï ôçò Oracle Corporation."> Oracle"> +Ç ëÝîç Parallels åßíáé Ýíá êáôï÷õñùìÝíï + åìðïñéêü óýìâïëï ôçò Parallels Software International Inc."> + Ïé ëÝîåéò PowerQuest êáé PartitionMagic åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò PowerQuest Corporation óôéò ÇíùìÝíåò @@ -275,6 +300,10 @@ ÇíùìÝíåò Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò óôïí êüóìï."> OpenGL"> + +Ç ëÝîç Slackware åßíáé Ýíá êáôï÷õñùìÝíï + åìðïñéêü óýìâïëï ôïõ Patrick Volkerding êáé ôçò Slackware Linux, Inc."> + Ïé ëÝîåéò Þ öñÜóåéò Sparc, Sparc64, SPARCEngine, êáé UltraSPARC åßíáé åìðïñéêÜ óýìâïëá ôçò SPARC International, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò. Ôá ðñïúüíôá ðïõ öÝñïõí ôá @@ -285,6 +314,8 @@ SPARCEngine"> UltraSPARC"> + + Ïé ëÝîåéò Þ öñÜóåéò Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, êáé Ultra åßíáé @@ -294,6 +325,7 @@ Java Virtual Machine"> JavaServer Pages"> JDK"> +JRE"> JSP"> JVM"> Netra"> @@ -349,6 +381,11 @@ Ç ëÝîç VMware åßíáé åìðïñéêü óýìâïëï ôçò VMware, Inc."> + +Ç ëÝîç Xen åßíáé Ýíá êáôï÷õñùìÝíï åìðïñéêü + óýìâïëï ôçò XenSource, Inc. sôéò ÇÐÁ êáé Üëëåò ÷þñåò."> +Xen"> + Ç ëÝîç XFree86 åßíáé Ýíá åìðïñéêü óýìâïëï ôïõ The XFree86 Project, Inc."> XFree86"> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#49 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -1147,7 +1147,7 @@ orm0: <Option ROM> at iomem 0xc0000-0xc7fff on isa0 fdc0: <NEC 72065B or clone> at port 0x3f0-0x3f5,0x3f7 irq 6 drq2 on isa0 fdc0: FIFO enabled, 8 bytes threshold -fd0: <1440-KB 3.5" drive> on fdc0 drive 0 +fd0: <1440-KB 3.5” drive> on fdc0 drive 0 atkbdc0: <Keyboard controller (i8042)> at port 0x60,0x64 on isa0 atkbd0: <AT Keyboard> flags 0x1 irq1 on atkbdc0 kbd0 at atkbd0 ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -416,7 +416,7 @@ might be interested in. Again, none of these are valid for the Ports Collection since the Ports Collection does not have multiple - revisions. + branches of development. When you specify a branch tag, you normally receive the latest versions of the files on that line of development. If ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#44 (text+ko) ==== @@ -1,7 +1,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 2 23:14:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7895E16A420; Fri, 2 Nov 2007 23:14:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAC5016A417 for ; Fri, 2 Nov 2007 23:14:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B334313C4B3 for ; Fri, 2 Nov 2007 23:14:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2NEm1V005564 for ; Fri, 2 Nov 2007 23:14:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2NEmcY005561 for perforce@freebsd.org; Fri, 2 Nov 2007 23:14:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Nov 2007 23:14:48 GMT Message-Id: <200711022314.lA2NEmcY005561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 23:14:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=128538 Change 128538 by rwatson@rwatson_zoo on 2007/11/02 23:13:55 Trim -g but keep modified sys include. Affected files ... .. //depot/projects/zcopybpf/src/lib/libpcap/Makefile#5 edit Differences ... ==== //depot/projects/zcopybpf/src/lib/libpcap/Makefile#5 (text+ko) ==== @@ -16,7 +16,7 @@ YFLAGS+=-p pcapyy LFLAGS+=-Ppcapyy -CFLAGS+=-I../../sys -g +CFLAGS+=-I../../sys CFLAGS+=-DHAVE_CONFIG_H -Dyylval=pcapyylval -I${.CURDIR} -I. CFLAGS+=-D_U_="__attribute__((unused))" CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF From owner-p4-projects@FreeBSD.ORG Fri Nov 2 23:21:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8A1316A420; Fri, 2 Nov 2007 23:21:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DBA216A41A for ; Fri, 2 Nov 2007 23:21:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 700B413C480 for ; Fri, 2 Nov 2007 23:21:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2NLug4006026 for ; Fri, 2 Nov 2007 23:21:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2NLuwk006023 for perforce@freebsd.org; Fri, 2 Nov 2007 23:21:56 GMT (envelope-from jb@freebsd.org) Date: Fri, 2 Nov 2007 23:21:56 GMT Message-Id: <200711022321.lA2NLuwk006023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 23:21:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=128539 Change 128539 by jb@jb_freebsd1 on 2007/11/02 23:21:46 Move the LBOLT definition outside #ifdef _KERNEL so that it can be used in userspace too. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#4 (text+ko) ==== @@ -38,8 +38,9 @@ typedef longlong_t hrtime_t; +#define LBOLT ((gethrtime() * hz) / NANOSEC) + #ifdef _KERNEL -#define LBOLT ((gethrtime() * hz) / NANOSEC) #define lbolt64 (int64_t)(LBOLT) static __inline hrtime_t From owner-p4-projects@FreeBSD.ORG Fri Nov 2 23:22:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18CEA16A421; Fri, 2 Nov 2007 23:22:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2DBB16A41B for ; Fri, 2 Nov 2007 23:22:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB8D913C4A5 for ; Fri, 2 Nov 2007 23:22:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA2NMvo4006060 for ; Fri, 2 Nov 2007 23:22:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA2NMv6A006057 for perforce@freebsd.org; Fri, 2 Nov 2007 23:22:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Nov 2007 23:22:57 GMT Message-Id: <200711022322.lA2NMv6A006057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 23:22:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=128540 Change 128540 by rwatson@rwatson_zoo on 2007/11/02 23:22:03 Use branch-local sys tree. Affected files ... .. //depot/projects/zcopybpf/src/usr.sbin/netstat/Makefile#3 edit Differences ... ==== //depot/projects/zcopybpf/src/usr.sbin/netstat/Makefile#3 (text+ko) ==== @@ -9,6 +9,7 @@ WARNS?= 3 +CFLAGS+=-I../../sys CFLAGS+=-DIPSEC CFLAGS+=-DSCTP From owner-p4-projects@FreeBSD.ORG Sat Nov 3 04:11:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B432516A421; Sat, 3 Nov 2007 04:11:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E91D16A417 for ; Sat, 3 Nov 2007 04:11:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0AB1413C4A7 for ; Sat, 3 Nov 2007 04:11:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA34B5Tb040660 for ; Sat, 3 Nov 2007 04:11:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA34B5Nc040657 for perforce@freebsd.org; Sat, 3 Nov 2007 04:11:05 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 3 Nov 2007 04:11:05 GMT Message-Id: <200711030411.lA34B5Nc040657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 04:11:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=128542 Change 128542 by kmacy@kmacy:storage:toestack on 2007/11/03 04:10:43 don't return right away in do_hwtid_rpl - that wasn't meant to be checked in Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#15 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#15 (text+ko) ==== @@ -730,9 +730,6 @@ struct toe_tid_entry *toe_tid; printf("do_hwtid_rpl m=%p\n", m); - return (0); - - hwtid = G_TID(ntohl(p->opcode_tid)); toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid); From owner-p4-projects@FreeBSD.ORG Sat Nov 3 04:14:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D16E16A418; Sat, 3 Nov 2007 04:14:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E27EB16A41A for ; Sat, 3 Nov 2007 04:14:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D6A3813C491 for ; Sat, 3 Nov 2007 04:14:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA34E9dq040816 for ; Sat, 3 Nov 2007 04:14:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA34E9Sn040813 for perforce@freebsd.org; Sat, 3 Nov 2007 04:14:09 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 3 Nov 2007 04:14:09 GMT Message-Id: <200711030414.lA34E9Sn040813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 04:14:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=128543 Change 128543 by kmacy@kmacy:storage:toestack on 2007/11/03 04:13:37 use header pointer for storing toepcb address - with luck this is only needed for connect request so won't conflict with storing address of sgl add hack type so that we don't free referenced mbuf in write_imm Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#9 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#9 (text+ko) ==== @@ -72,6 +72,13 @@ #define m_get_sgl(m) ((bus_dma_segment_t *)(m)->m_pkthdr.header) #define m_set_sgllen(m, len) ((m)->m_pkthdr.ether_vtag = len) #define m_get_sgllen(m) ((m)->m_pkthdr.ether_vtag) +/* + * XXX FIXME + */ +#define m_set_toep(m, a) ((m)->m_pkthdr.header = (a)) +#define m_get_toep(m) ((m)->m_pkthdr.header) + +#define MT_DONTFREE 128 #if __FreeBSD_version > 700030 #define INTR_FILTERS From owner-p4-projects@FreeBSD.ORG Sat Nov 3 04:18:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E910616A46E; Sat, 3 Nov 2007 04:18:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D9AC16A417 for ; Sat, 3 Nov 2007 04:18:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 80D4813C49D for ; Sat, 3 Nov 2007 04:18:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA34IEsr040974 for ; Sat, 3 Nov 2007 04:18:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA34IE1x040971 for perforce@freebsd.org; Sat, 3 Nov 2007 04:18:14 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 3 Nov 2007 04:18:14 GMT Message-Id: <200711030418.lA34IE1x040971@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 04:18:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=128544 Change 128544 by kmacy@kmacy:storage:toestack on 2007/11/03 04:17:41 get write_ofld_wr into working order add hack to avoid double free Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#11 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#11 (text+ko) ==== @@ -1097,6 +1097,22 @@ #endif } +#if 0 +static int print_wr = 0; +static __inline void +do_print_wr(struct tx_desc *d, int flits) +{ + int i = 0; + + if (print_wr) + while (flits--) { + printf("flit[%d]: 0x%016lx\n", i, d->flit[i]); + i++; + } +} +#endif + + /** * write_wr_hdr_sgl - write a WR header and, optionally, SGL * @ndesc: number of Tx descriptors spanned by the SGL @@ -1131,6 +1147,7 @@ V_WR_GEN(txqs->gen)) | wr_lo; /* XXX gen? */ wr_gen2(txd, txqs->gen); + } else { unsigned int ogen = txqs->gen; const uint64_t *fp = (const uint64_t *)sgl; @@ -1450,9 +1467,14 @@ to->wr_lo = from->wr_lo | htonl(V_WR_GEN(gen) | V_WR_LEN((len + 7) / 8)); wr_gen2(d, gen); + + /* + * This check is a hack we should really fix the logic so + * that this can't happen + */ + if (m->m_type != MT_DONTFREE) + m_freem(m); - printf("write_imm m_freeing %p\n", m); - m_freem(m); } /** @@ -1551,6 +1573,8 @@ return 0; } + kdb_backtrace(); + wrp->wr_hi |= htonl(F_WR_SOP | F_WR_EOP); wrp->wr_lo = htonl(V_WR_TID(q->token)); @@ -1896,31 +1920,31 @@ struct tx_desc *d = &q->desc[pidx]; struct txq_state txqs; - if (immediate(m)) { - q->sdesc[pidx].mi.mi_base = NULL; + if (immediate(m) && segs == NULL) { write_imm(d, m, m->m_len, gen); return; } /* Only TX_DATA builds SGLs */ - from = mtod(m, struct work_request_hdr *); - memcpy(&d->flit[1], &from[1], - (uint8_t *)m->m_pkthdr.header - mtod(m, uint8_t *) - sizeof(*from)); + memcpy(&d->flit[1], &from[1], m->m_len - sizeof(*from)); - flits = ((uint8_t *)m->m_pkthdr.header - mtod(m, uint8_t *)) / 8; + flits = m->m_len / 8; sgp = (ndesc == 1) ? (struct sg_ent *)&d->flit[flits] : sgl; make_sgl(sgp, segs, nsegs); sgl_flits = sgl_len(nsegs); - txqs.gen = q->gen; - txqs.pidx = q->pidx; - txqs.compl = (q->unacked & 8) << (S_WR_COMPL - 3); + txqs.gen = gen; + txqs.pidx = pidx; + txqs.compl = 0; + write_wr_hdr_sgl(ndesc, d, &txqs, q, sgl, flits, sgl_flits, from->wr_hi, from->wr_lo); } + + /** * calc_tx_descs_ofld - calculate # of Tx descriptors for an offload packet * @m: the packet From owner-p4-projects@FreeBSD.ORG Sat Nov 3 04:18:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA8EE16A4FB; Sat, 3 Nov 2007 04:18:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B088A16A469 for ; Sat, 3 Nov 2007 04:18:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A521413C481 for ; Sat, 3 Nov 2007 04:18:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA34IEYP040980 for ; Sat, 3 Nov 2007 04:18:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA34IEqn040977 for perforce@freebsd.org; Sat, 3 Nov 2007 04:18:14 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 3 Nov 2007 04:18:14 GMT Message-Id: <200711030418.lA34IEqn040977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 04:18:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=128545 Change 128545 by kmacy@kmacy:storage:toestack on 2007/11/03 04:18:12 implement vtop sgl mapping Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#7 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#7 (text+ko) ==== @@ -147,8 +147,13 @@ int busdma_map_sg_vec(struct mbuf **m, struct mbuf **mp, bus_dma_segment_t *segs, int count); static __inline int busdma_map_sgl(bus_dma_segment_t *vsegs, bus_dma_segment_t *segs, int count) { - panic("BEEEWM!!!"); - + while (count--) { + segs->ds_addr = pmap_kextract((vm_offset_t)vsegs->ds_addr); + segs->ds_len = vsegs->ds_len; + segs++; + vsegs++; + } + return (0); } struct mbuf *mi_collapse_mbuf(struct mbuf_iovec *mi, struct mbuf *m); From owner-p4-projects@FreeBSD.ORG Sat Nov 3 04:21:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C80D16A419; Sat, 3 Nov 2007 04:21:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED55816A469 for ; Sat, 3 Nov 2007 04:21:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E085213C48D for ; Sat, 3 Nov 2007 04:21:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA34LIKr041276 for ; Sat, 3 Nov 2007 04:21:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA34LIdQ041270 for perforce@freebsd.org; Sat, 3 Nov 2007 04:21:18 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 3 Nov 2007 04:21:18 GMT Message-Id: <200711030421.lA34LIdQ041270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128546 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 04:21:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=128546 Change 128546 by kmacy@kmacy:storage:toestack on 2007/11/03 04:20:33 handle tx completions and (to some degree) failed connects don't use toe_mbuf as it causes us to write past the end of the current mbuf Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 (text+ko) ==== @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -122,6 +123,9 @@ */ #define MIN_RCV_WND (24 * 1024U) +#define VALIDATE_SEQ 0 +#define VALIDATE_SOCK(so) +#define DEBUG_WR 0 extern int tcp_do_autorcvbuf; extern int tcp_do_autosndbuf; @@ -179,7 +183,7 @@ struct tcpcb *tp = sototcpcb(so); struct toepcb *toep = tp->t_toe; - struct mbuf *tail, *m0; + struct mbuf *tail, *m0, *last; struct t3cdev *cdev; struct tom_data *d; int bytes, count, total_bytes; @@ -194,9 +198,13 @@ d = TOM_DATA(TOE_DEV(so)); cdev = d->cdev; - tail = so->so_snd.sb_sndptr ? so->so_snd.sb_sndptr : so->so_snd.sb_mb; + last = tail = so->so_snd.sb_sndptr ? so->so_snd.sb_sndptr : so->so_snd.sb_mb; total_bytes = 0; - + if (toep->tp_m_last == last) { + KASSERT(tail, ("sbdrop error")); + last = tail = tail->m_next; + } + while (toep->tp_wr_avail && (tail != NULL)) { count = bytes = 0; @@ -206,7 +214,7 @@ while ((mbuf_wrs[count + 1] <= toep->tp_wr_avail) && (tail != NULL) && (count < TX_MAX_SEGS)) { bytes += tail->m_len; count++; - + last = tail; /* * technically an abuse to be using this for a VA * but less gross than defining my own structure @@ -217,8 +225,12 @@ segp++; tail = tail->m_next; } - - so->so_snd.sb_sndptr = tail; + if (tail) { + so->so_snd.sb_sndptr = tail; + toep->tp_m_last = NULL; + } else + toep->tp_m_last = so->so_snd.sb_sndptr = last; + so->so_snd.sb_sndptroff += bytes; total_bytes += bytes; @@ -229,11 +241,15 @@ toep->tp_wr_avail -= mbuf_wrs[count]; toep->tp_wr_unacked += mbuf_wrs[count]; - + make_tx_data_wr(so, m0, bytes, tail); m_set_priority(m0, mkprio(CPL_PRIORITY_DATA, so)); m_set_sgl(m0, segs); m_set_sgllen(m0, count); + /* + * remember credits used + */ + m0->m_pkthdr.csum_data = mbuf_wrs[count]; m0->m_pkthdr.len = bytes; if ((req_completion && toep->tp_wr_unacked == mbuf_wrs[count]) || toep->tp_wr_unacked >= toep->tp_wr_max / 2) { @@ -243,6 +259,11 @@ toep->tp_wr_unacked = 0; } + m0->m_type = MT_DONTFREE; + enqueue_wr(tp, m0); + printf("sending offload tx with %d bytes in %d segments\n", + bytes, count); + l2t_send(cdev, m0, toep->tp_l2t); } @@ -266,7 +287,12 @@ static int cxgb_toe_send(struct tcpcb *tp) { - printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + struct socket *so; + + printf("cxgb_toe_send\n"); + + so = tp->t_inpcb->inp_socket; + t3_push_frames(so, 1); return (0); } @@ -449,7 +475,6 @@ toep->tp_delack_mode = 0; toep->tp_mtu_idx = select_mss(so, dst->rt_ifp->if_mtu); - printf("mss selected\n"); tp->rcv_wnd = select_rcv_wnd(so); toep->tp_ulp_mode = TOM_TUNABLE(dev, ddp) && !(so->so_options & SO_NO_DDP) && @@ -529,6 +554,29 @@ } +/* + * Convert an ACT_OPEN_RPL status to an errno. + */ +static int +act_open_rpl_status_to_errno(int status) +{ + switch (status) { + case CPL_ERR_CONN_RESET: + return (ECONNREFUSED); + case CPL_ERR_ARP_MISS: + return (EHOSTUNREACH); + case CPL_ERR_CONN_TIMEDOUT: + return (ETIMEDOUT); + case CPL_ERR_TCAM_FULL: + return (ENOMEM); + case CPL_ERR_CONN_EXIST: + log(LOG_ERR, "ACTIVE_OPEN_RPL: 4-tuple in use\n"); + return (EADDRINUSE); + default: + return (EIO); + } +} + static void fail_act_open(struct socket *so, int errno) { @@ -544,6 +592,63 @@ } /* + * Handle active open failures. + */ +static void +active_open_failed(struct socket *so, struct mbuf *m) +{ + struct cpl_act_open_rpl *rpl = cplhdr(m); + +/* + * Don't handle connection retry for now + */ +#ifdef notyet + struct inet_connection_sock *icsk = inet_csk(sk); + + if (rpl->status == CPL_ERR_CONN_EXIST && + icsk->icsk_retransmit_timer.function != act_open_retry_timer) { + icsk->icsk_retransmit_timer.function = act_open_retry_timer; + sk_reset_timer(sk, &icsk->icsk_retransmit_timer, + jiffies + HZ / 2); + } else +#endif + fail_act_open(so, act_open_rpl_status_to_errno(rpl->status)); + m_free(m); +} + +/* + * Return whether a failed active open has allocated a TID + */ +static inline int +act_open_has_tid(int status) +{ + return status != CPL_ERR_TCAM_FULL && status != CPL_ERR_CONN_EXIST && + status != CPL_ERR_ARP_MISS; +} + +/* + * Process an ACT_OPEN_RPL CPL message. + */ +static int +do_act_open_rpl(struct t3cdev *cdev, struct mbuf *m, void *ctx) +{ + struct socket *so = (struct socket *)ctx; +#ifdef notyet + struct cpl_act_open_rpl *rpl = cplhdr(m); + + if (cdev->type != T3A && act_open_has_tid(rpl->status)) + cxgb_release_tid(cdev, GET_TID(rpl)); + + cxgb3_queue_tid_release(cdev, GET_TID(rpl)); +#else + printf("%s UNIMPLEMENTED\n", __FUNCTION__); +#endif + + active_open_failed(so, m); + return (0); +} + +/* * Handle an ARP failure for an active open. XXX purge ofo queue * * XXX badly broken for crossed SYNs as the ATID is no longer valid. @@ -553,8 +658,7 @@ */ static void act_open_req_arp_failure(struct t3cdev *dev, struct mbuf *m) { - struct toe_mbuf *tm = (struct toe_mbuf *)m; - struct toepcb *toep = tm->m_toe.mt_toepcb; + struct toepcb *toep = m_get_toep(m); struct tcpcb *tp = toep->tp_tp; struct inpcb *inp = tp->t_inpcb; struct socket *so = toeptoso(toep); @@ -595,22 +699,23 @@ goto free_tid; m = (struct toe_mbuf *)m_gethdr(MT_DATA, M_WAITOK); + m_set_toep(m, tp->t_toe); + +#if 0 m->m_toe.mt_toepcb = tp->t_toe; set_arp_failure_handler((struct mbuf *)m, act_open_req_arp_failure); - +#endif if ((err = init_offload_socket(so, tdev, atid, e, dst))) return (err); install_offload_ops(so); mk_act_open_req(so, m, atid, e); + soisconnecting(so); l2t_send(d->cdev, (struct mbuf *)m, e); toep = tp->t_toe; if (toep->tp_ulp_mode) t3_enable_ddp(so, 0); - - soisconnecting(so); - return (0); free_tid: @@ -796,7 +901,117 @@ return 0; } +/* + * Process an acknowledgment of WR completion. Advance snd_una and send the + * next batch of work requests from the write queue. + */ +static void +wr_ack(struct socket *so, struct mbuf *m) +{ + struct tcpcb *tp = sototcpcb(so); + struct toepcb *toep = tp->t_toe; + struct cpl_wr_ack *hdr = cplhdr(m); + unsigned int credits = ntohs(hdr->credits); + u32 snd_una = ntohl(hdr->snd_una); + int bytes = 0; + + printf("wr_ack: snd_una=%u credits=%d\n", snd_una, credits); + + toep->tp_wr_avail += credits; + if (toep->tp_wr_unacked > toep->tp_wr_max - toep->tp_wr_avail) + toep->tp_wr_unacked = toep->tp_wr_max - toep->tp_wr_avail; + + while (credits) { + struct mbuf *p = peek_wr(tp); + printf("p->credits=%d p->bytes=%d\n", p->m_pkthdr.csum_data, p->m_pkthdr.len) ; + + if (__predict_false(!p)) { + log(LOG_ERR, "%u WR_ACK credits for TID %u with " + "nothing pending, state %u\n", + credits, toep->tp_tid, tp->t_state); + break; + } + if (__predict_false(credits < p->m_pkthdr.csum_data)) { +#if DEBUG_WR > 1 + struct tx_data_wr *w = cplhdr(p); +#ifdef notyet + log(LOG_ERR, + "TID %u got %u WR credits, need %u, len %u, " + "main body %u, frags %u, seq # %u, ACK una %u," + " ACK nxt %u, WR_AVAIL %u, WRs pending %u\n", + toep->tp_tid, credits, p->csum, p->len, + p->len - p->data_len, skb_shinfo(p)->nr_frags, + ntohl(w->sndseq), snd_una, ntohl(hdr->snd_nxt), + WR_AVAIL(tp), count_pending_wrs(tp) - credits); +#endif +#endif + p->m_pkthdr.csum_data -= credits; + break; + } else { + dequeue_wr(tp); + credits -= p->m_pkthdr.csum_data; + bytes += p->m_pkthdr.len; + printf("done with wr of %d bytes\n", p->m_pkthdr.len); + + m_free(p); + } + } + +#if DEBUG_WR + check_wr_invariants(tp); +#endif + + if (__predict_false(SEQ_LT(snd_una, tp->snd_una))) { +#if VALIDATE_SEQ + struct tom_data *d = TOM_DATA(TOE_DEV(so)); + + log(LOG_ERR "%s: unexpected sequence # %u in WR_ACK " + "for TID %u, snd_una %u\n", (&d->tdev)->name, snd_una, + toep->tp_tid, tp->snd_una); +#endif + goto out_free; + } + + if (tp->snd_una != snd_una) { + tp->snd_una = snd_una; + tp->ts_recent_age = ticks; +#ifdef notyet + /* + * Keep ARP entry "minty fresh" + */ + dst_confirm(sk->sk_dst_cache); +#endif + if (tp->snd_una == tp->snd_nxt) + toep->tp_flags &= ~TP_TX_WAIT_IDLE; + } + if (bytes) { + printf("sbdrop(%d)\n", bytes); + + sbdrop(&so->so_snd, bytes); + } + + if (so->so_snd.sb_sndptroff < so->so_snd.sb_cc) + t3_push_frames(so, 0); + +out_free: + m_free(m); +} + +/* + * Handler for TX_DATA_ACK CPL messages. + */ +static int do_wr_ack(struct t3cdev *dev, struct mbuf *m, void *ctx) +{ + struct socket *so = (struct socket *)ctx; + + printf("do_wr_ack\n"); + + VALIDATE_SOCK(so); + wr_ack(so, m); + return 0; +} + void t3_init_wr_tab(unsigned int wr_len) { @@ -832,15 +1047,15 @@ #endif t3tom_register_cpl_handler(CPL_ACT_ESTABLISH, do_act_establish); + t3tom_register_cpl_handler(CPL_ACT_OPEN_RPL, do_act_open_rpl); + t3tom_register_cpl_handler(CPL_TX_DMA_ACK, do_wr_ack); #ifdef notyet t3tom_register_cpl_handler(CPL_PASS_ESTABLISH, do_pass_establish); - t3tom_register_cpl_handler(CPL_ACT_OPEN_RPL, do_act_open_rpl); t3tom_register_cpl_handler(CPL_PASS_ACCEPT_REQ, do_pass_accept_req); t3tom_register_cpl_handler(CPL_RX_URG_NOTIFY, do_rx_urg_notify); t3tom_register_cpl_handler(CPL_RX_DATA, do_rx_data); t3tom_register_cpl_handler(CPL_RX_DATA_DDP, do_rx_data_ddp); t3tom_register_cpl_handler(CPL_RX_DDP_COMPLETE, do_rx_ddp_complete); - t3tom_register_cpl_handler(CPL_TX_DMA_ACK, do_wr_ack); t3tom_register_cpl_handler(CPL_PEER_CLOSE, do_peer_close); t3tom_register_cpl_handler(CPL_ABORT_REQ_RSS, do_abort_req); t3tom_register_cpl_handler(CPL_ABORT_RPL_RSS, do_abort_rpl); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 (text+ko) ==== @@ -78,7 +78,8 @@ #define T3C_DEV(sk) ((TOM_DATA(TOE_DEV(sk)))->cdev) #define TOM_TUNABLE(dev, param) (TOM_DATA(dev)->conf.param) -#define TP_DATASENT (1 << 0) +#define TP_DATASENT (1 << 0) +#define TP_TX_WAIT_IDLE (1 << 1) struct toepcb { struct toedev *tp_toedev; @@ -94,10 +95,13 @@ int tp_mss_clamp; int tp_qset; int tp_flags; + volatile int tp_refcount; struct tcpcb *tp_tp; + struct mbuf *tp_m_last; + struct mbuf_head wr_list; struct mbuf_head out_of_order_queue; }; @@ -109,7 +113,29 @@ mbufq_init(&toep->wr_list); } - +static inline void enqueue_wr(struct tcpcb *tp, struct mbuf *m) +{ + struct toepcb *toep = tp->t_toe; + + mbufq_tail(&toep->wr_list, m); +} + + +static inline struct mbuf *peek_wr(struct tcpcb *tp) +{ + struct toepcb *toep = tp->t_toe; + + return mbufq_peek(&toep->wr_list); +} + +static inline struct mbuf *dequeue_wr(struct tcpcb *tp) +{ + struct toepcb *toep = tp->t_toe; + + return mbufq_dequeue(&toep->wr_list); +} + void t3_init_tunables(struct tom_data *t); + #endif From owner-p4-projects@FreeBSD.ORG Sat Nov 3 13:51:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A164C16A421; Sat, 3 Nov 2007 13:51:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AA5516A41B for ; Sat, 3 Nov 2007 13:51:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36F1113C494 for ; Sat, 3 Nov 2007 13:51:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA3DpWrQ029447 for ; Sat, 3 Nov 2007 13:51:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA3DpWqt029444 for perforce@freebsd.org; Sat, 3 Nov 2007 13:51:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 3 Nov 2007 13:51:32 GMT Message-Id: <200711031351.lA3DpWqt029444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 13:51:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=128553 Change 128553 by rwatson@rwatson_zoo on 2007/11/03 13:51:01 Integrate zero-copy BPF branch. Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/PAE#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#7 integrate .. //depot/projects/zcopybpf/src/sys/vm/swap_pager.c#7 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.591 2007/11/03 05:15:25 alc Exp $"); /* * Manages physical address maps. @@ -1732,7 +1732,10 @@ PV_STAT(pv_entry_allocs++); pv_entry_count++; if (pv_entry_count > pv_entry_high_water) - pagedaemon_wakeup(); + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, consider " + "increasing either the vm.pmap.shpgperproc or the " + "vm.pmap.pv_entry_max sysctl.\n"); pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { for (field = 0; field < _NPCM; field++) { @@ -1767,10 +1770,6 @@ * pages. After that, if a pv chunk entry is still needed, * destroy mappings to active pages. */ - if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, consider " - "increasing sysctl vm.pmap.shpgperproc or " - "vm.pmap.pv_entry_max\n"); PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); m = vm_page_alloc(NULL, colour, ==== //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_cpu.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.67 2007/08/30 21:18:42 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.68 2007/11/02 17:29:36 njl Exp $"); #include "opt_acpi.h" #include @@ -501,12 +501,14 @@ /* Allow children to shutdown first. */ bus_generic_shutdown(dev); - /* Disable any entry to the idle function. */ + /* + * Disable any entry to the idle function. There is a small race where + * an idle thread have passed this check but not gone to sleep. This + * is ok since device_shutdown() does not free the softc, otherwise + * we'd have to be sure all threads were evicted before returning. + */ cpu_disable_idle = TRUE; - /* Signal and wait for all processors to exit acpi_cpu_idle(). */ - smp_rendezvous(NULL, NULL, NULL, NULL); - return_VALUE (0); } ==== //depot/projects/zcopybpf/src/sys/i386/conf/PAE#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # PAE -- Generic kernel configuration file for FreeBSD/i386 PAE # -# $FreeBSD: src/sys/i386/conf/PAE,v 1.26 2007/10/24 03:53:10 jhb Exp $ +# $FreeBSD: src/sys/i386/conf/PAE,v 1.27 2007/11/03 07:11:07 thompsa Exp $ include GENERIC @@ -89,3 +89,4 @@ nodevice awi nodevice ral nodevice wi +nodevice zyd # ZyDAS zb1211/zb1211b wireless NICs ==== //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#8 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.594 2007/08/21 04:59:34 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.595 2007/11/03 05:15:26 alc Exp $"); /* * Manages physical address maps. @@ -1805,7 +1805,10 @@ PV_STAT(pv_entry_allocs++); pv_entry_count++; if (pv_entry_count > pv_entry_high_water) - pagedaemon_wakeup(); + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, consider " + "increasing either the vm.pmap.shpgperproc or the " + "vm.pmap.pv_entry_max tunable.\n"); pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { for (field = 0; field < _NPCM; field++) { @@ -1851,11 +1854,6 @@ * inactive pages. After that, if a pv chunk entry * is still needed, destroy mappings to active pages. */ - if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, " - "consider increasing tunables " - "vm.pmap.shpgperproc or " - "vm.pmap.pv_entry_max\n"); PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); if (m == NULL) ==== //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.285 2007/10/24 19:03:54 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.286 2007/11/02 19:40:36 julian Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -208,7 +208,6 @@ * certain parts of a process from itself. */ if ((flags & RFPROC) == 0) { -#if 0 /* XXX no other OS tries to do this */ if (((p1->p_flag & (P_HADTHREADS|P_SYSTEM)) == P_HADTHREADS) && (flags & (RFCFDG | RFFDG))) { PROC_LOCK(p1); @@ -218,7 +217,6 @@ } PROC_UNLOCK(p1); } -#endif vm_forkproc(td, NULL, NULL, flags); @@ -238,49 +236,21 @@ if (flags & RFFDG) fdunshare(p1, td); -#if 0 /* XXX no other OS tries to do this */ if (((p1->p_flag & (P_HADTHREADS|P_SYSTEM)) == P_HADTHREADS) && (flags & (RFCFDG | RFFDG))) { PROC_LOCK(p1); thread_single_end(); PROC_UNLOCK(p1); } -#endif *procp = NULL; return (0); } -#if 0 /* XXX no other OS tries to do this */ /* - * Note 1:1 allows for forking with one thread coming out on the - * other side with the expectation that the process is about to - * exec. + * XXX + * We did have single-threading code here + * however it proved un-needed and caused problems */ - if ((p1->p_flag & (P_HADTHREADS|P_SYSTEM)) == P_HADTHREADS) { - /* - * Systems processes don't need this. - * Idle the other threads for a second. - * Since the user space is copied, it must remain stable. - * In addition, all threads (from the user perspective) - * need to either be suspended or in the kernel, - * where they will try restart in the parent and will - * be aborted in the child. - * keep threadds at the boundary there. - */ - PROC_LOCK(p1); - if (thread_single(SINGLE_BOUNDARY)) { - /* Abort. Someone else is single threading before us. */ - PROC_UNLOCK(p1); - return (ERESTART); - } - PROC_UNLOCK(p1); - /* - * All other activity in this process - * is now suspended at the user boundary, - * (or other safe places if we think of any). - */ - } -#endif /* Allocate new proc. */ newproc = uma_zalloc(proc_zone, M_WAITOK); @@ -729,18 +699,7 @@ msleep(p1, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); -#if 0 /* XXX no other OS tries to do this */ /* - * If other threads are waiting, let them continue now. - */ - if ((p1->p_flag & (P_HADTHREADS|P_SYSTEM)) == P_HADTHREADS) { - PROC_LOCK(p1); - thread_single_end(); - PROC_UNLOCK(p1); - } - -#endif - /* * Return child proc pointer to parent. */ *procp = p2; @@ -755,11 +714,6 @@ mac_proc_destroy(newproc); #endif uma_zfree(proc_zone, newproc); - if (p1->p_flag & P_HADTHREADS) { - PROC_LOCK(p1); - thread_single_end(); - PROC_UNLOCK(p1); - } pause("fork", hz / 2); return (error); } ==== //depot/projects/zcopybpf/src/sys/vm/swap_pager.c#7 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.296 2007/10/24 19:04:04 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.297 2007/11/02 20:48:10 maxim Exp $"); #include "opt_mac.h" #include "opt_swap.h" @@ -1127,7 +1127,7 @@ int n = 0; if (count && m[0]->object != object) { - panic("swap_pager_getpages: object mismatch %p/%p", + panic("swap_pager_putpages: object mismatch %p/%p", object, m[0]->object ); From owner-p4-projects@FreeBSD.ORG Sat Nov 3 19:01:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 024D916A419; Sat, 3 Nov 2007 19:01:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1B5416A469 for ; Sat, 3 Nov 2007 19:01:47 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8EA2913C4AC for ; Sat, 3 Nov 2007 19:01:47 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA3J1lkl066007 for ; Sat, 3 Nov 2007 19:01:47 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA3J05SR065788 for perforce@freebsd.org; Sat, 3 Nov 2007 19:00:05 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Nov 2007 19:00:05 GMT Message-Id: <200711031900.lA3J05SR065788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 128572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 19:01:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=128572 Change 128572 by piso@piso_newluxor on 2007/11/03 19:00:03 IFC@128559 Affected files ... .. //depot/projects/soc2005/libalias/Makefile#13 integrate .. //depot/projects/soc2005/libalias/Makefile.inc1#14 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#23 integrate .. //depot/projects/soc2005/libalias/UPDATING#21 integrate .. //depot/projects/soc2005/libalias/bin/df/df.c#6 integrate .. //depot/projects/soc2005/libalias/bin/ed/Makefile#2 integrate .. //depot/projects/soc2005/libalias/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/soc2005/libalias/bin/mv/mv.1#3 integrate .. //depot/projects/soc2005/libalias/bin/ps/extern.h#2 integrate .. //depot/projects/soc2005/libalias/bin/ps/keyword.c#2 integrate .. //depot/projects/soc2005/libalias/bin/ps/print.c#2 integrate .. //depot/projects/soc2005/libalias/bin/ps/ps.c#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/eval.c#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/sh.1#6 integrate .. //depot/projects/soc2005/libalias/bin/sh/var.c#3 integrate .. //depot/projects/soc2005/libalias/cddl/lib/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/soc2005/libalias/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/soc2005/libalias/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/soc2005/libalias/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/CHANGES#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/README#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/version#7 integrate .. //depot/projects/soc2005/libalias/contrib/diff/ABOUT-NLS#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/AUTHORS#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/COPYING#2 integrate .. //depot/projects/soc2005/libalias/contrib/diff/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/diff/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/diff/Makefile.in#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/NEWS#2 integrate .. //depot/projects/soc2005/libalias/contrib/diff/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/diff/THANKS#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/TODO#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/analyze.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/cmpbuf.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/cmpbuf.h#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/config.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/diff/config.hin#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/configure#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/configure.in#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/context.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/diagmeet.note#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/diff.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/diff.h#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/diff.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/diff3.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/dir.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/doc/diff.texi#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/doc/fdl.texi#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/doc/stamp-vti#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/doc/version.texi#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/ed.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/ifdef.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/install-sh#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/io.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/lib/basename.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/c-stack.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/c-stack.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/cmpbuf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/cmpbuf.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/dirname.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/error.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/error.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/exclude.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/exclude.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/exit.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/exitfail.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/exitfail.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/file-type.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/file-type.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/getopt.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/gettext.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/gnulib.mk#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/hard-locale.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/hard-locale.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/inttostr.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/posixver.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/posixver.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/prepargs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/prepargs.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/quotesys.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/quotesys.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/setmode.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/strcase.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/strftime.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/strtoimax.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/strtoumax.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/unlocked-io.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/version-etc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/version-etc.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/xalloc.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/xmalloc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/lib/xstrtol.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/man/cmp.1#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/man/diff.1#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/man/diff3.1#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/man/sdiff.1#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/normal.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/prepend_args.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/prepend_args.h#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/sdiff.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/side.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/src/analyze.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/cmp.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/context.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/diff.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/diff.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/diff3.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/dir.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/ed.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/ifdef.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/io.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/normal.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/sdiff.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/side.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/system.h#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/src/util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/diff/stamp-h.in#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/system.h#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/util.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/version.c#2 delete .. //depot/projects/soc2005/libalias/contrib/diff/xmalloc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/gcc/BASE-VER#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/ChangeLog#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/DATESTAMP#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/calls.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/combine.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/arm/arm.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/arm/cirrus.md#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/i386/i386.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/i386/i386.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/i386/i386.md#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/i386/sse.md#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/mips/iris6.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/rs6000/predicates.md#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/rs6000/rs6000.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/double.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/extended.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/floatundidf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/floatundisf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/floatunsidf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/floatunsisf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/op-2.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/op-4.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/op-common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/soft-fp/quad.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/config/sparc/sparc.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/ChangeLog#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/call.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/class.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/cp-tree.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/decl.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/decl2.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/init.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/parser.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/pt.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/semantics.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/typeck.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/cp/typeck2.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/doc/cpp.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/doc/gcc.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/doc/gcov.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/dwarf2out.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/except.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/fold-const.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/function.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/gimplify.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/gthr-posix.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/gthr-posix.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/loop-iv.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/objc/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/omp-low.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/opts.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/pointer-set.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/pointer-set.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/reload.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/tree-if-conv.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/tree-ssa-loop-niter.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/tree-ssa-operands.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/tree-ssa-structalias.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/tree-vrp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/version.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/include/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/libcpp/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/libdecnumber/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/libgomp/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/libgomp/config/posix/lock.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/libgomp/sections.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/libiberty/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/libmudflap/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/gcclibs/libssp/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/soc2005/libalias/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/soc2005/libalias/contrib/groff/tmac/groff_mdoc.man#3 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/COPYING#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/accounting.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/aes.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/aes.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ap_list.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/ap_list.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/beacon.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/beacon.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/build_config.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/config.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/config.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/config_types.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ctrl_iface.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/defconfig#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/defs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/des.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/doxygen.full#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/driver.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_aka.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk_common.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk_common.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gtc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_methods.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_methods.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_mschapv2.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax_common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk_common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake_common.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake_common.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_db.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tlv.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_vendor_test.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eapol_version.patch#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/eloop_none.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/eloop_win.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/hlr_auc_gw.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.vlan#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd_cli.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/hw_features.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/hw_features.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/iapp.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11_auth.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11h.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11h.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/includes.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/l2_packet_none.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/md4.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/md5.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/md5.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/milenage.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/milenage.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/mlme.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/mlme.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/os.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/os_internal.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/os_none.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/os_unix.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/pmksa_cache.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/pmksa_cache.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/preauth.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/preauth.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/radius.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/radius.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/reconfig.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/sha256.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/sha256.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/state_machine.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/tls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/tls_gnutls.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/version.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/vlan_init.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/vlan_init.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/wme.c#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/wme.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_common.h#1 branch .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_ctrl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_ctrl.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/BSD/Makefile#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/HISTORY#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/Makefile#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/iptests.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/sock.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/l4check/l4check.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/Makefile#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/ipft_tx.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/printnat.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/printpacket.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/printstate.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/radix_ipf.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/Makefile#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/in1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/f11#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/in1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/test.format#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipf_y.y#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipfstat.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipmon.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipnat.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipnat_y.y#4 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/lexer.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/NEWS#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/README#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/ch.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/charset.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/cmdbuf.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/command.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/configure#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/configure.ac#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/filename.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/forwback.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/funcs.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/jump.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.man#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.nro#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/lessecho.man#3 integrate .. //depot/projects/soc2005/libalias/contrib/less/lessecho.nro#3 integrate .. //depot/projects/soc2005/libalias/contrib/less/lesskey.man#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/lesskey.nro#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/line.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/main.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/optfunc.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/screen.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/search.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/signal.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/version.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libobjc/ChangeLog#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/CHANGES#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/CREDITS#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/FILES#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/INSTALL#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/README.dag#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/TODO#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/VERSION#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/config.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/configure#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/configure.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/gencode.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/gencode.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/grammar.y#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/inet.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dlpi.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-linux.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.3#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pf.h#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/savefile.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/scanner.l#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/ChangeLog#4 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/acinclude.m4#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/config.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/configure#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/include/Makefile.am#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/include/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/include/bits/ostream.tcc#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/include/bits/ostream_insert.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/include/ext/throw_allocator.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/include/std/std_fstream.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/libsupc++/exception#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/libsupc++/new#3 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/libsupc++/typeinfo#3 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/netcat.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/one-true-awk/FIXES#3 integrate .. //depot/projects/soc2005/libalias/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/soc2005/libalias/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/HISTORY#7 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/README#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/VERSION#6 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/config/config.h#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/config/ltmain.sh#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/configure#7 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/configure.ac#7 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/etc/audit_event#6 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_control.3#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_event.3#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_token.c#8 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/pf/authpf/authpf.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/authpf/authpf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/ftp-proxy/filter.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/ftp-proxy/filter.h#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/ftp-proxy/ftp-proxy.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/ftp-proxy/ftp-proxy.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/ftp-proxy/getline.c#2 delete .. //depot/projects/soc2005/libalias/contrib/pf/ftp-proxy/util.c#2 delete .. //depot/projects/soc2005/libalias/contrib/pf/ftp-proxy/util.h#2 delete .. //depot/projects/soc2005/libalias/contrib/pf/libevent/buffer.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/evbuffer.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/event-internal.h#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/event.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/event.h#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/evsignal.h#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/kqueue.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/log.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/log.h#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/poll.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/select.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/libevent/signal.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/man/pf.4#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/man/pf.conf.5#4 integrate .. //depot/projects/soc2005/libalias/contrib/pf/man/pf.os.5#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/man/pflog.4#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pf_print_state.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_altq.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_optimize.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_osfp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_parser.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_radix.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_table.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pflogd/pflogd.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pflogd/pflogd.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pflogd/privsep.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pf/tftp-proxy/filter.c#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/tftp-proxy/filter.h#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/tftp-proxy/tftp-proxy.8#1 branch .. //depot/projects/soc2005/libalias/contrib/pf/tftp-proxy/tftp-proxy.c#1 branch .. //depot/projects/soc2005/libalias/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/FILES#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/INSTALL#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/VERSION#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/af.c#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/af.h#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/configure#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/interface.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/llc.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/pf.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-atm.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-bgp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-chdlc.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-fr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ip6.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-llc.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ospf.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-sctp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/util.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.proc.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/COPYING#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/aes.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/asn1.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/asn1.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/asn1_test.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/base64.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/base64.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/bignum.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/bignum.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/build_config.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config_file.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config_none.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config_types.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config_winreg.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/crypto_cryptoapi.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/crypto_gnutls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/crypto_internal.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/crypto_libtomcrypt.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/crypto_none.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/des.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/code_structure.doxygen#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/doxygen.fast#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/doxygen.full#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/eap.doxygen#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/mainpage.doxygen#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/porting.doxygen#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/driver_hostap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/driver_ndis_.c#2 delete .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/driver_wired.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_gpsk.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_gpsk_common.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_gpsk_common.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_methods.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_methods.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_pax.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_pax_common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_pax_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_psk_common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_psk_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_sake.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_sake_common.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_sake_common.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_vendor_test.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eloop_none.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eloop_win.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/events.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/hostapd.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/includes.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/libtommath.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/main.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/md4.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/mlme.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/mlme.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/nmake.mak#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/os.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/os_internal.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/os_none.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/os_unix.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/pmksa_cache.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/pmksa_cache.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/preauth.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/preauth.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/rsa.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/rsa.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/sha256.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/sha256.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/state_machine.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tls_gnutls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tls_internal.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tls_schannel.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tlsv1_client.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tlsv1_client.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tlsv1_common.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tlsv1_common.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_common.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#2 delete .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#2 delete .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#2 delete .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#2 delete .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#2 delete .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_i.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/x509v3.c#1 branch .. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/x509v3.h#1 branch .. //depot/projects/soc2005/libalias/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl.h#5 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_err.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_lib.c#5 integrate .. //depot/projects/soc2005/libalias/etc/Makefile#5 integrate .. //depot/projects/soc2005/libalias/etc/cached.conf#2 delete .. //depot/projects/soc2005/libalias/etc/defaults/devfs.rules#2 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#16 integrate .. //depot/projects/soc2005/libalias/etc/devd.conf#4 integrate .. //depot/projects/soc2005/libalias/etc/etc.arm/ttys#3 integrate .. //depot/projects/soc2005/libalias/etc/group#2 integrate .. //depot/projects/soc2005/libalias/etc/inetd.conf#3 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.include.dist#9 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.local.dist#5 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/soc2005/libalias/etc/mtree/README#2 integrate .. //depot/projects/soc2005/libalias/etc/namedb/Makefile#2 integrate .. //depot/projects/soc2005/libalias/etc/namedb/PROTO.localhost-v6.rev#2 delete .. //depot/projects/soc2005/libalias/etc/namedb/PROTO.localhost.rev#2 delete .. //depot/projects/soc2005/libalias/etc/namedb/make-localhost#2 delete .. //depot/projects/soc2005/libalias/etc/namedb/master/Makefile#1 branch .. //depot/projects/soc2005/libalias/etc/namedb/master/empty.db#1 branch .. //depot/projects/soc2005/libalias/etc/namedb/master/localhost-forward.db#1 branch .. //depot/projects/soc2005/libalias/etc/namedb/master/localhost-reverse.db#1 branch .. //depot/projects/soc2005/libalias/etc/namedb/named.conf#2 integrate .. //depot/projects/soc2005/libalias/etc/namedb/named.root#2 integrate .. //depot/projects/soc2005/libalias/etc/nscd.conf#1 branch .. //depot/projects/soc2005/libalias/etc/pam.d/Makefile#2 integrate .. //depot/projects/soc2005/libalias/etc/pam.d/atrun#1 branch .. //depot/projects/soc2005/libalias/etc/pam.d/cron#1 branch .. //depot/projects/soc2005/libalias/etc/pam.d/imap#3 integrate .. //depot/projects/soc2005/libalias/etc/pam.d/pop3#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#9 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/amd#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/cached#2 delete .. //depot/projects/soc2005/libalias/etc/rc.d/early.sh#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/kerberos#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/lockd#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mdconfig#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/named#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/netif#5 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/nfslocking#4 delete .. //depot/projects/soc2005/libalias/etc/rc.d/nscd#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/ppp#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/sendmail#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/statd#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.resume#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.subr#10 integrate .. //depot/projects/soc2005/libalias/etc/rc.suspend#2 integrate .. //depot/projects/soc2005/libalias/etc/services#4 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/soc2005/libalias/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libdialog/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libdialog/dialog.h#2 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libgcc/Makefile#4 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libreadline/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libregex/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libstdc++/Makefile#5 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/genscripts.sh#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_int/Makefile#6 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_tools/auto-host.h#4 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/diff/context.c.diff#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/diff/diff.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/diff/diff.c.diff#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/diff/doc/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/diff3/diff3.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/diff3/diff3.c.diff#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/sdiff/sdiff.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/sdiff/sdiff.c.diff#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/texinfo/info/Makefile#2 integrate .. //depot/projects/soc2005/libalias/include/Makefile#9 integrate .. //depot/projects/soc2005/libalias/include/_ctype.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 3 20:08:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 692AD16A46B; Sat, 3 Nov 2007 20:08:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 251AC16A419 for ; Sat, 3 Nov 2007 20:08:00 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1401213C4BC for ; Sat, 3 Nov 2007 20:08:00 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA3K7x8m072998 for ; Sat, 3 Nov 2007 20:07:59 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA3K7xYn072995 for perforce@freebsd.org; Sat, 3 Nov 2007 20:07:59 GMT (envelope-from andrew@freebsd.org) Date: Sat, 3 Nov 2007 20:07:59 GMT Message-Id: <200711032007.lA3K7xYn072995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 128579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 20:08:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=128579 Change 128579 by andrew@andrew_hermies on 2007/11/03 20:07:24 Implement the bus_setup_intr and bus_alloc_resource functions Add the timer to the children to probe for in the s3c2410 bus driver Probe and attach the children of the s3c2410 bus Fix the s3c24x0_timer driver to use the updated bus_setup_intr Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#6 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#3 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#6 (text+ko) ==== @@ -55,7 +55,7 @@ /* prototypes */ static int s3c2410_probe(device_t); -static void s3c2410_attach(device_t); +static int s3c2410_attach(device_t); static void s3c2410_identify(driver_t *, device_t); static struct resource *s3c2410_alloc_resource(device_t, device_t, int, int *, @@ -64,7 +64,7 @@ static int s3c2410_activate_resource(device_t, device_t, int, int, struct resource *); static int s3c2410_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); + driver_filter_t *, driver_intr_t *, void *, void **); static device_method_t s3c2410_methods[] = { DEVMETHOD(device_probe, s3c2410_probe), @@ -85,11 +85,28 @@ DRIVER_MODULE(s3c2410, nexus, s3c2410_driver, s3c2410_devclass, 0, 0); +struct s3c2xx0_softc *s3c2xx0_softc = NULL; + static int s3c2410_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filt, + driver_intr_t *intr, void *arg, void **cookiep) { + int saved_cpsr; + + if (flags & INTR_TYPE_TTY) + rman_set_start(ires, 15); + else if (flags & INTR_TYPE_CLK) { + if (rman_get_start(ires) == 0) + rman_set_start(ires, 26); + else + rman_set_start(ires, 27); + } + saved_cpsr = SetCPSR(I32_bit, I32_bit); + + SetCPSR(I32_bit, saved_cpsr & I32_bit); + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, + intr, arg, cookiep); return (0); } @@ -97,7 +114,14 @@ s3c2410_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - return (NULL); + struct resource *res; + + res = rman_reserve_resource(&s3c2xx0_softc->s3c2xx0_rman, *rid, *rid, + count, flags, child); + if (res != NULL) + rman_set_rid(res, *rid); + + return (res); } void @@ -120,9 +144,7 @@ return 0; } -struct s3c2xx0_softc *s3c2xx0_softc = NULL; - -void +int s3c2410_attach(device_t dev) { struct s3c24x0_softc *sc = device_get_softc(dev); @@ -169,7 +191,19 @@ printf("\n"); #endif - /* get busdma tag for the platform */ + /* + * Attach children devices + */ + s3c2xx0_softc->s3c2xx0_rman.rm_type = RMAN_ARRAY; + s3c2xx0_softc->s3c2xx0_rman.rm_descr = "S3C2410 IRQs"; + if (rman_init(&s3c2xx0_softc->s3c2xx0_rman) != 0 || + rman_manage_region(&s3c2xx0_softc->s3c2xx0_rman, 0, 32) != 0) + panic("s3c2410_attach: failed to set up rman"); + device_add_child(dev, "timer", 0); + bus_generic_probe(dev); + bus_generic_attach(dev); + + return (0); } /* ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#3 (text+ko) ==== @@ -194,7 +194,7 @@ panic("Unable to setup the clock irq handler.\n"); else bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, - hardintr, NULL, &ihl); + hardintr, NULL, NULL, &ihl); /* set prescaler1 */ reg = bus_space_read_4(iot, ioh, TIMER_TCFG0); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#3 (text+ko) ==== @@ -36,6 +36,7 @@ #define _ARM_S3C2XX0VAR_H_ #include +#include struct s3c2xx0_softc { device_t sc_dev; @@ -54,6 +55,8 @@ int sc_fclk; /* CPU clock */ int sc_hclk; /* AHB bus clock */ int sc_pclk; /* peripheral clock */ + + struct rman s3c2xx0_rman; }; typedef void *s3c2xx0_chipset_tag_t; From owner-p4-projects@FreeBSD.ORG Sat Nov 3 20:31:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FA4416A4DC; Sat, 3 Nov 2007 20:31:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A62B16A4C7 for ; Sat, 3 Nov 2007 20:31:35 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 25AE713C4B3 for ; Sat, 3 Nov 2007 20:31:35 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA3KVZFw074856 for ; Sat, 3 Nov 2007 20:31:35 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA3KVYrn074853 for perforce@freebsd.org; Sat, 3 Nov 2007 20:31:34 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Nov 2007 20:31:34 GMT Message-Id: <200711032031.lA3KVYrn074853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 128581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 20:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=128581 Change 128581 by piso@piso_newluxor on 2007/11/03 20:30:44 IFC some more Affected files ... .. //depot/projects/soc2005/libalias/contrib/pf/pflogd/pidfile.c#2 edit .. //depot/projects/soc2005/libalias/contrib/pf/pflogd/pidfile.h#2 edit .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt.c#9 edit .. //depot/projects/soc2005/libalias/sys/dev/safe/safe.c#3 edit .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#12 edit .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/main.c#2 edit .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/statfoo.c#2 edit .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/wlanstats.c#4 edit Differences ... ==== //depot/projects/soc2005/libalias/contrib/pf/pflogd/pidfile.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.4 2005/05/03 16:55:20 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6 2007/07/03 14:08:49 mlaier Exp $ */ /* $OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $ */ /* $NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $ */ ==== //depot/projects/soc2005/libalias/contrib/pf/pflogd/pidfile.h#2 (text+ko) ==== @@ -1,1 +1,3 @@ +/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3 2007/07/03 14:08:49 mlaier Exp $ */ + int pidfile(const char *); ==== //depot/projects/soc2005/libalias/sys/dev/mpt/mpt.c#9 (text+ko) ==== @@ -96,7 +96,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.45 2007/10/12 06:03:43 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.46 2007/11/03 17:33:41 scottl Exp $"); #include #include /* XXX For static handler registration */ @@ -562,7 +562,8 @@ "Event %#x (ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); } else if (handled == 0) { - mpt_lprt(mpt, MPT_PRT_WARN, + mpt_lprt(mpt, + msg->AckRequired? MPT_PRT_WARN : MPT_PRT_INFO, "Unhandled Event Notify Frame. Event %#x " "(ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); ==== //depot/projects/soc2005/libalias/sys/dev/safe/safe.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.19 2007/11/03 19:10:14 sam Exp $"); /* * SafeNet SafeXcel-1141 hardware crypto accelerator @@ -307,7 +307,7 @@ goto bad4; } if (bus_dma_tag_create(NULL, /* parent */ - sizeof(u_int32_t), /* alignment */ + 1, /* alignment */ SAFE_MAX_DSIZE, /* boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ ==== //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.331 2007/10/22 08:28:24 mav Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.332 2007/11/03 19:11:35 sam Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -2279,7 +2279,7 @@ product WISTRONNEWEB UR055G 0x0711 UR055G product WISTRONNEWEB AR5523_1 0x0826 AR5523 product WISTRONNEWEB AR5523_1_NF 0x0827 AR5523 (no firmware) -product WISTRONNEWEB AR5523_2 0x0828 AR5523 +product WISTRONNEWEB AR5523_2 0x082a AR5523 product WISTRONNEWEB AR5523_2_NF 0x0829 AR5523 (no firmware) /* Xerox products */ ==== //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/main.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/net80211/wlanstats/main.c,v 1.1 2006/08/10 18:59:49 sam Exp $ + * $FreeBSD: src/tools/tools/net80211/wlanstats/main.c,v 1.2 2007/11/03 18:12:25 sam Exp $ */ /* @@ -54,7 +54,9 @@ #include "wlanstats.h" #define S_DEFAULT \ - "input,output,rx_ucast,rx_mcast,tx_ucast,tx_mcast,signal,noise,rate" + "input,output,rx_ucast,rx_mcast,tx_ucast,tx_mcast,rssi,rate" +#define S_AMPDU \ + "input,output,ampdu_reorder,ampdu_oor,rx_dup,ampdu_flush,ampdu_move,ampdu_drop,ampdu_bar,ampdu_baroow,ampdu_barmove,rssi,rate" static int signalled; @@ -163,7 +165,10 @@ mac = ea->octet; break; case 'o': - wf->setfmt(wf, optarg); + if (strcasecmp(optarg, "ampdu") == 0) + wf->setfmt(wf, S_AMPDU); + else + wf->setfmt(wf, optarg); break; default: errx(-1, "usage: %s [-a] [-i ifname] [-l] [-o fmt] [interval]\n", argv[0]); ==== //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/statfoo.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/net80211/wlanstats/statfoo.c,v 1.1 2006/08/10 18:59:49 sam Exp $ + * $FreeBSD: src/tools/tools/net80211/wlanstats/statfoo.c,v 1.2 2007/11/03 18:13:05 sam Exp $ */ #include @@ -144,12 +144,20 @@ static void statfoo_print_verbose(struct statfoo *sf, FILE *fd) { + const struct fmt *f; char s[32]; - int i; + int i, width; + width = 0; + for (i = 0; i < sf->nstats; i++) { + f = &sf->stats[i]; + if (f->width > width) + width = f->width; + } for (i = 0; i < sf->nstats; i++) { + f = &sf->stats[i]; if (sf->get_totstat(sf, i, s, sizeof(s)) && strcmp(s, "0")) - fprintf(fd, "%s %s\n", s, sf->stats[i].desc); + fprintf(fd, "%-*s %s\n", width, s, f->desc); } } ==== //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/wlanstats.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/net80211/wlanstats/wlanstats.c,v 1.4 2007/06/11 04:05:49 sam Exp $ + * $FreeBSD: src/tools/tools/net80211/wlanstats/wlanstats.c,v 1.5 2007/11/03 18:14:12 sam Exp $ */ /* @@ -66,238 +66,276 @@ #define IEEE80211_ADDR_EQ(a1,a2) (memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0) #endif +#define AFTER(prev) ((prev)+1) + static const struct fmt wlanstats[] = { -#define S_RX_BADVERSION 0 - { 5, "rx_badversion", "badversion", "rx frame with bad version" }, -#define S_RX_TOOSHORT 1 - { 5, "rx_tooshort", "tooshort", "rx frame too short" }, -#define S_RX_WRONGBSS 2 - { 5, "rx_wrongbss", "wrongbss", "rx from wrong bssid" }, -#define S_RX_DUP 3 - { 5, "rx_dup", "rx_dup", "rx discard 'cuz dup" }, -#define S_RX_WRONGDIR 4 - { 5, "rx_wrongdir", "wrongdir", "rx w/ wrong direction" }, -#define S_RX_MCASTECHO 5 - { 5, "rx_mcastecho", "mcastecho", "rx discard 'cuz mcast echo" }, -#define S_RX_NOTASSOC 6 - { 5, "rx_notassoc", "notassoc", "rx discard 'cuz sta !assoc" }, -#define S_RX_NOPRIVACY 7 - { 5, "rx_noprivacy", "noprivacy", "rx w/ wep but privacy off" }, -#define S_RX_UNENCRYPTED 8 - { 5, "rx_unencrypted", "unencrypted", "rx w/o wep and privacy on" }, -#define S_RX_WEPFAIL 9 - { 5, "rx_wepfail", "wepfail", "rx wep processing failed" }, -#define S_RX_DECAP 10 +#define S_RX_BADVERSION 0 + { 5, "rx_badversion", "bvers", "rx frame with bad version" }, +#define S_RX_TOOSHORT AFTER(S_RX_BADVERSION) + { 5, "rx_tooshort", "2short", "rx frame too short" }, +#define S_RX_WRONGBSS AFTER(S_RX_TOOSHORT) + { 5, "rx_wrongbss", "wrbss", "rx from wrong bssid" }, +#define S_RX_DUP AFTER(S_RX_WRONGBSS) + { 5, "rx_dup", "rxdup", "rx discard 'cuz dup" }, +#define S_RX_WRONGDIR AFTER(S_RX_DUP) + { 5, "rx_wrongdir", "wrdir", "rx w/ wrong direction" }, +#define S_RX_MCASTECHO AFTER(S_RX_WRONGDIR) + { 5, "rx_mcastecho", "mecho", "rx discard 'cuz mcast echo" }, +#define S_RX_NOTASSOC AFTER(S_RX_MCASTECHO) + { 6, "rx_notassoc", "!assoc", "rx discard 'cuz sta !assoc" }, +#define S_RX_NOPRIVACY AFTER(S_RX_NOTASSOC) + { 6, "rx_noprivacy", "nopriv", "rx w/ wep but privacy off" }, +#define S_RX_UNENCRYPTED AFTER(S_RX_NOPRIVACY) + { 6, "rx_unencrypted", "unencr", "rx w/o wep and privacy on" }, +#define S_RX_WEPFAIL AFTER(S_RX_UNENCRYPTED) + { 7, "rx_wepfail", "wepfail", "rx wep processing failed" }, +#define S_RX_DECAP AFTER(S_RX_WEPFAIL) { 5, "rx_decap", "decap", "rx decapsulation failed" }, -#define S_RX_MGTDISCARD 11 - { 5, "rx_mgtdiscard", "mgtdiscard", "rx discard mgt frames" }, -#define S_RX_CTL 12 +#define S_RX_MGTDISCARD AFTER(S_RX_DECAP) + { 8, "rx_mgtdiscard", "mgtdiscard", "rx discard mgt frames" }, +#define S_RX_CTL AFTER(S_RX_MGTDISCARD) { 5, "rx_ctl", "ctl", "rx ctrl frames" }, -#define S_RX_BEACON 13 - { 5, "rx_beacon", "beacon", "rx beacon frames" }, -#define S_RX_RSTOOBIG 14 - { 5, "rx_rstoobig", "rstoobig", "rx rate set truncated" }, -#define S_RX_ELEM_MISSING 15 - { 5, "rx_elem_missing","elem_missing", "rx required element missing" }, -#define S_RX_ELEM_TOOBIG 16 - { 5, "rx_elem_toobig", "elem_toobig", "rx element too big" }, -#define S_RX_ELEM_TOOSMALL 17 - { 5, "rx_elem_toosmall","elem_toosmall","rx element too small" }, -#define S_RX_ELEM_UNKNOWN 18 - { 5, "rx_elem_unknown","elem_unknown", "rx element unknown" }, -#define S_RX_BADCHAN 19 - { 5, "rx_badchan", "badchan", "rx frame w/ invalid chan" }, -#define S_RX_CHANMISMATCH 20 +#define S_RX_BEACON AFTER(S_RX_CTL) + { 6, "rx_beacon", "beacon", "rx beacon frames" }, +#define S_RX_RSTOOBIG AFTER(S_RX_BEACON) + { 6, "rx_rstoobig", "rs2big", "rx rate set truncated" }, +#define S_RX_ELEM_MISSING AFTER(S_RX_RSTOOBIG) + { 6, "rx_elem_missing","iemiss", "rx required element missing" }, +#define S_RX_ELEM_TOOBIG AFTER(S_RX_ELEM_MISSING) + { 6, "rx_elem_toobig", "ie2big", "rx element too big" }, +#define S_RX_ELEM_TOOSMALL AFTER(S_RX_ELEM_TOOBIG) + { 7, "rx_elem_toosmall","ie2small","rx element too small" }, +#define S_RX_ELEM_UNKNOWN AFTER(S_RX_ELEM_TOOSMALL) + { 5, "rx_elem_unknown","ieunk", "rx element unknown" }, +#define S_RX_BADCHAN AFTER(S_RX_ELEM_UNKNOWN) + { 6, "rx_badchan", "badchan", "rx frame w/ invalid chan" }, +#define S_RX_CHANMISMATCH AFTER(S_RX_BADCHAN) { 5, "rx_chanmismatch","chanmismatch", "rx frame chan mismatch" }, -#define S_RX_NODEALLOC 21 +#define S_RX_NODEALLOC AFTER(S_RX_CHANMISMATCH) { 5, "rx_nodealloc", "nodealloc", "nodes allocated (rx)" }, -#define S_RX_SSIDMISMATCH 22 +#define S_RX_SSIDMISMATCH AFTER(S_RX_NODEALLOC) { 5, "rx_ssidmismatch","ssidmismatch", "rx frame ssid mismatch" }, -#define S_RX_AUTH_UNSUPPORTED 23 +#define S_RX_AUTH_UNSUPPORTED AFTER(S_RX_SSIDMISMATCH) { 5, "rx_auth_unsupported","auth_unsupported", "rx w/ unsupported auth alg" }, -#define S_RX_AUTH_FAIL 24 +#define S_RX_AUTH_FAIL AFTER(S_RX_AUTH_UNSUPPORTED) { 5, "rx_auth_fail", "auth_fail", "rx sta auth failure" }, -#define S_RX_AUTH_COUNTERMEASURES 25 +#define S_RX_AUTH_COUNTERMEASURES AFTER(S_RX_AUTH_FAIL) { 5, "rx_auth_countermeasures", "auth_countermeasures", "rx sta auth failure 'cuz of TKIP countermeasures" }, -#define S_RX_ASSOC_BSS 26 +#define S_RX_ASSOC_BSS AFTER(S_RX_AUTH_COUNTERMEASURES) { 5, "rx_assoc_bss", "assoc_bss", "rx assoc from wrong bssid" }, -#define S_RX_ASSOC_NOTAUTH 27 +#define S_RX_ASSOC_NOTAUTH AFTER(S_RX_ASSOC_BSS) { 5, "rx_assoc_notauth","assoc_notauth", "rx assoc w/o auth" }, -#define S_RX_ASSOC_CAPMISMATCH 28 +#define S_RX_ASSOC_CAPMISMATCH AFTER(S_RX_ASSOC_NOTAUTH) { 5, "rx_assoc_capmismatch","assoc_capmismatch", "rx assoc w/ cap mismatch" }, -#define S_RX_ASSOC_NORATE 29 +#define S_RX_ASSOC_NORATE AFTER(S_RX_ASSOC_CAPMISMATCH) { 5, "rx_assoc_norate","assoc_norate", "rx assoc w/ no rate match" }, -#define S_RX_ASSOC_BADWPAIE 30 +#define S_RX_ASSOC_BADWPAIE AFTER(S_RX_ASSOC_NORATE) { 5, "rx_assoc_badwpaie","assoc_badwpaie", "rx assoc w/ bad WPA IE" }, -#define S_RX_DEAUTH 31 +#define S_RX_DEAUTH AFTER(S_RX_ASSOC_BADWPAIE) { 5, "rx_deauth", "deauth", "rx deauthentication" }, -#define S_RX_DISASSOC 32 +#define S_RX_DISASSOC AFTER(S_RX_DEAUTH) { 5, "rx_disassoc", "disassoc", "rx disassociation" }, -#define S_RX_BADSUBTYPE 33 +#define S_RX_BADSUBTYPE AFTER(S_RX_DISASSOC) { 5, "rx_badsubtype", "badsubtype", "rx frame w/ unknown subtype" }, -#define S_RX_NOBUF 34 +#define S_RX_NOBUF AFTER(S_RX_BADSUBTYPE) { 5, "rx_nobuf", "nobuf", "rx failed for lack of mbuf" }, -#define S_RX_DECRYPTCRC 35 +#define S_RX_DECRYPTCRC AFTER(S_RX_NOBUF) { 5, "rx_decryptcrc", "decryptcrc", "rx decrypt failed on crc" }, -#define S_RX_AHDEMO_MGT 36 +#define S_RX_AHDEMO_MGT AFTER(S_RX_DECRYPTCRC) { 5, "rx_ahdemo_mgt", "ahdemo_mgt", "rx discard mgmt frame received in ahdoc demo mode" }, -#define S_RX_BAD_AUTH 37 +#define S_RX_BAD_AUTH AFTER(S_RX_AHDEMO_MGT) { 5, "rx_bad_auth", "bad_auth", "rx bad authentication request" }, -#define S_RX_UNAUTH 38 +#define S_RX_UNAUTH AFTER(S_RX_BAD_AUTH) { 5, "rx_unauth", "unauth", "rx discard 'cuz port unauthorized" }, -#define S_RX_BADKEYID 39 +#define S_RX_BADKEYID AFTER(S_RX_UNAUTH) { 5, "rx_badkeyid", "badkeyid", "rx w/ incorrect keyid" }, -#define S_RX_CCMPREPLAY 40 +#define S_RX_CCMPREPLAY AFTER(S_RX_BADKEYID) { 5, "rx_ccmpreplay", "ccmpreplay", "rx seq# violation (CCMP)" }, -#define S_RX_CCMPFORMAT 41 +#define S_RX_CCMPFORMAT AFTER(S_RX_CCMPREPLAY) { 5, "rx_ccmpformat", "ccmpformat", "rx format bad (CCMP)" }, -#define S_RX_CCMPMIC 42 +#define S_RX_CCMPMIC AFTER(S_RX_CCMPFORMAT) { 5, "rx_ccmpmic", "ccmpmic", "rx MIC check failed (CCMP)" }, -#define S_RX_TKIPREPLAY 43 +#define S_RX_TKIPREPLAY AFTER(S_RX_CCMPMIC) { 5, "rx_tkipreplay", "tkipreplay", "rx seq# violation (TKIP)" }, -#define S_RX_TKIPFORMAT 44 +#define S_RX_TKIPFORMAT AFTER(S_RX_TKIPREPLAY) { 5, "rx_tkipformat", "tkipformat", "rx format bad (TKIP)" }, -#define S_RX_TKIPMIC 45 +#define S_RX_TKIPMIC AFTER(S_RX_TKIPFORMAT) { 5, "rx_tkipmic", "tkipmic", "rx MIC check failed (TKIP)" }, -#define S_RX_TKIPICV 46 +#define S_RX_TKIPICV AFTER(S_RX_TKIPMIC) { 5, "rx_tkipicv", "tkipicv", "rx ICV check failed (TKIP)" }, -#define S_RX_BADCIPHER 47 +#define S_RX_BADCIPHER AFTER(S_RX_TKIPICV) { 5, "rx_badcipher", "badcipher", "rx failed 'cuz bad cipher/key type" }, -#define S_RX_NOCIPHERCTX 48 +#define S_RX_NOCIPHERCTX AFTER(S_RX_BADCIPHER) { 5, "rx_nocipherctx", "nocipherctx", "rx failed 'cuz key/cipher ctx not setup" }, -#define S_RX_ACL 49 +#define S_RX_ACL AFTER(S_RX_NOCIPHERCTX) { 5, "rx_acl", "acl", "rx discard 'cuz acl policy" }, -#define S_TX_NOBUF 50 +#define S_TX_NOBUF AFTER(S_RX_ACL) { 5, "tx_nobuf", "nobuf", "tx failed for lack of mbuf" }, -#define S_TX_NONODE 51 +#define S_TX_NONODE AFTER(S_TX_NOBUF) { 5, "tx_nonode", "nonode", "tx failed for no node" }, -#define S_TX_UNKNOWNMGT 52 +#define S_TX_UNKNOWNMGT AFTER(S_TX_NONODE) { 5, "tx_unknownmgt", "unknownmgt", "tx of unknown mgt frame" }, -#define S_TX_BADCIPHER 53 +#define S_TX_BADCIPHER AFTER(S_TX_UNKNOWNMGT) { 5, "tx_badcipher", "badcipher", "tx failed 'cuz bad ciper/key type" }, -#define S_TX_NODEFKEY 54 +#define S_TX_NODEFKEY AFTER(S_TX_BADCIPHER) { 5, "tx_nodefkey", "nodefkey", "tx failed 'cuz no defkey" }, -#define S_TX_NOHEADROOM 55 +#define S_TX_NOHEADROOM AFTER(S_TX_NODEFKEY) { 5, "tx_noheadroom", "noheadroom", "tx failed 'cuz no space for crypto hdrs" }, -#define S_TX_FRAGFRAMES 56 +#define S_TX_FRAGFRAMES AFTER(S_TX_NOHEADROOM) { 5, "tx_fragframes", "fragframes", "tx frames fragmented" }, -#define S_TX_FRAGS 57 +#define S_TX_FRAGS AFTER(S_TX_FRAGFRAMES) { 5, "tx_frags", "frags", "tx frags generated" }, -#define S_SCAN_ACTIVE 58 +#define S_SCAN_ACTIVE AFTER(S_TX_FRAGS) { 5, "scan_active", "scan_active", "active scans started" }, -#define S_SCAN_PASSIVE 59 +#define S_SCAN_PASSIVE AFTER(S_SCAN_ACTIVE) { 5, "scan_passive", "scan_passive", "passive scans started" }, -#define S_NODE_TIMEOUT 60 - { 5, "node_timeout", "node_timeout", "nodes timed out inactivity" }, -#define S_CRYPTO_NOMEM 61 +#define S_NODE_TIMEOUT AFTER(S_SCAN_PASSIVE) + { 5, "node_timeout", "node_timeout", "nodes timed out for inactivity" }, +#define S_CRYPTO_NOMEM AFTER(S_NODE_TIMEOUT) { 5, "crypto_nomem", "crypto_nomem", "cipher context malloc failed" }, -#define S_CRYPTO_TKIP 62 +#define S_CRYPTO_TKIP AFTER(S_CRYPTO_NOMEM) { 5, "crypto_tkip", "crypto_tkip", "tkip crypto done in s/w" }, -#define S_CRYPTO_TKIPENMIC 63 +#define S_CRYPTO_TKIPENMIC AFTER(S_CRYPTO_TKIP) { 5, "crypto_tkipenmic","crypto_tkipenmic", "tkip tx MIC done in s/w" }, -#define S_CRYPTO_TKIPDEMIC 64 +#define S_CRYPTO_TKIPDEMIC AFTER(S_CRYPTO_TKIPENMIC) { 5, "crypto_tkipdemic","crypto_tkipdemic", "tkip rx MIC done in s/w" }, -#define S_CRYPTO_TKIPCM 65 +#define S_CRYPTO_TKIPCM AFTER(S_CRYPTO_TKIPDEMIC) { 5, "crypto_tkipcm", "crypto_tkipcm", "tkip dropped frames 'cuz of countermeasures" }, -#define S_CRYPTO_CCMP 66 +#define S_CRYPTO_CCMP AFTER(S_CRYPTO_TKIPCM) { 5, "crypto_ccmp", "crypto_ccmp", "ccmp crypto done in s/w" }, -#define S_CRYPTO_WEP 67 +#define S_CRYPTO_WEP AFTER(S_CRYPTO_CCMP) { 5, "crypto_wep", "crypto_wep", "wep crypto done in s/w" }, -#define S_CRYPTO_SETKEY_CIPHER 68 +#define S_CRYPTO_SETKEY_CIPHER AFTER(S_CRYPTO_WEP) { 5, "crypto_setkey_cipher", "crypto_setkey_cipher","setkey failed 'cuz cipher rejected data" }, -#define S_CRYPTO_SETKEY_NOKEY 69 +#define S_CRYPTO_SETKEY_NOKEY AFTER(S_CRYPTO_SETKEY_CIPHER) { 5, "crypto_setkey_nokey", "crypto_setkey_nokey","setkey failed 'cuz no key index" }, -#define S_CRYPTO_DELKEY 70 +#define S_CRYPTO_DELKEY AFTER(S_CRYPTO_SETKEY_NOKEY) { 5, "crypto_delkey", "crypto_delkey", "driver key delete failed" }, -#define S_CRYPTO_BADCIPHER 71 +#define S_CRYPTO_BADCIPHER AFTER(S_CRYPTO_DELKEY) { 5, "crypto_badcipher","crypto_badcipher", "setkey failed 'cuz unknown cipher" }, -#define S_CRYPTO_NOCIPHER 72 +#define S_CRYPTO_NOCIPHER AFTER(S_CRYPTO_BADCIPHER) { 5, "crypto_nocipher","crypto_nocipher", "setkey failed 'cuz cipher module unavailable" }, -#define S_CRYPTO_ATTACHFAIL 73 +#define S_CRYPTO_ATTACHFAIL AFTER(S_CRYPTO_NOCIPHER) { 5, "crypto_attachfail","crypto_attachfail", "setkey failed 'cuz cipher attach failed" }, -#define S_CRYPTO_SWFALLBACK 74 +#define S_CRYPTO_SWFALLBACK AFTER(S_CRYPTO_ATTACHFAIL) { 5, "crypto_swfallback","crypto_swfallback", "crypto fell back to s/w implementation" }, -#define S_CRYPTO_KEYFAIL 75 +#define S_CRYPTO_KEYFAIL AFTER(S_CRYPTO_SWFALLBACK) { 5, "crypto_keyfail", "crypto_keyfail", "setkey failed 'cuz driver key alloc failed" }, -#define S_CRYPTO_ENMICFAIL 76 +#define S_CRYPTO_ENMICFAIL AFTER(S_CRYPTO_KEYFAIL) { 5, "crypto_enmicfail","crypto_enmicfail", "enmic failed (may be mbuf exhaustion)" }, -#define S_IBSS_CAPMISMATCH 77 +#define S_IBSS_CAPMISMATCH AFTER(S_CRYPTO_ENMICFAIL) { 5, "ibss_capmismatch","ibss_capmismatch", "ibss merge faied 'cuz capabilities mismatch" }, -#define S_IBSS_NORATE 78 +#define S_IBSS_NORATE AFTER(S_IBSS_CAPMISMATCH) { 5, "ibss_norate", "ibss_norate", "ibss merge faied 'cuz rate set mismatch" }, -#define S_PS_UNASSOC 79 +#define S_PS_UNASSOC AFTER(S_IBSS_NORATE) { 5, "ps_unassoc", "ps_unassoc", "ps-poll received for unassociated station" }, -#define S_PS_BADAID 80 +#define S_PS_BADAID AFTER(S_PS_UNASSOC) { 5, "ps_badaid", "ps_badaid", "ps-poll received with invalid association id" }, -#define S_PS_QEMPTY 81 +#define S_PS_QEMPTY AFTER(S_PS_BADAID) { 5, "ps_qempty", "ps_qempty", "ps-poll received with nothing to send" }, -#define S_FF_BADHDR 82 +#define S_FF_BADHDR AFTER(S_PS_QEMPTY) { 5, "ff_badhdr", "ff_badhdr", "fast frame rx'd w/ bad hdr" }, -#define S_FF_TOOSHORT 83 +#define S_FF_TOOSHORT AFTER(S_FF_BADHDR) { 5, "ff_tooshort", "ff_tooshort", "fast frame rx decap error" }, -#define S_FF_SPLIT 84 +#define S_FF_SPLIT AFTER(S_FF_TOOSHORT) { 5, "ff_split", "ff_split", "fast frame rx split error" }, -#define S_FF_DECAP 85 +#define S_FF_DECAP AFTER(S_FF_SPLIT) { 5, "ff_decap", "ff_decap", "fast frames decap'd" }, -#define S_FF_ENCAP 86 +#define S_FF_ENCAP AFTER(S_FF_DECAP) { 5, "ff_encap", "ff_encap", "fast frames encap'd for tx" }, -#define S_FF_ENCAPFAIL 87 +#define S_FF_ENCAPFAIL AFTER(S_FF_ENCAP) { 5, "ff_encapfail", "ff_encapfail", "fast frames encap failed" }, -#define S_RX_BADBINTVAL 88 +#define S_RX_BADBINTVAL AFTER(S_FF_ENCAPFAIL) { 5, "rx_badbintval", "rx_badbintval","rx frame with bogus beacon interval" }, -#define S_RX_MGMT 89 +#define S_RX_MGMT AFTER(S_RX_BADBINTVAL) { 5, "rx_mgmt", "rx_mgmt", "rx management frames" }, -#define S_RX_DEMICFAIL 90 +#define S_RX_DEMICFAIL AFTER(S_RX_MGMT) { 5, "rx_demicfail", "rx_demicfail", "rx demic failed" }, -#define S_RX_DEFRAG 91 +#define S_RX_DEFRAG AFTER(S_RX_DEMICFAIL) { 5, "rx_defrag", "rx_defrag", "rx defragmentation failed" }, -#define S_RX_ACTION 92 +#define S_RX_ACTION AFTER(S_RX_DEFRAG) { 5, "rx_action", "rx_action", "rx action frames" }, -#define S_AMSDU_TOOSHORT 93 - { 8, "amsdu_tooshort", "amsdu_tooshort","A-MSDU rx decap error" }, -#define S_AMSDU_SPLIT 94 - { 8, "amsdu_split", "amsdu_split", "A-MSDU rx failed on frame split" }, -#define S_AMSDU_DECAP 95 - { 8, "amsdu_decap", "amsdu_decap", "A-MSDU frames received" }, -#define S_AMSDU_ENCAP 96 - { 8, "amsdu_encap", "amsdu_encap", "A-MSDU frames transmitted" }, -#define S_AMPDU_FLUSH 97 - { 8, "ampdu_flush", "ampdu_flush", "A-MPDU frames flushed" }, -#define S_AMPDU_BARBAD 98 - { 8, "ampdu_barbad", "ampdu_barbad", "A-MPDU BAR rx before ADDBA exchange" }, -#define S_AMPDU_BAROOW 99 - { 8, "ampdu_baroow", "ampdu_baroow", "A-MPDU BAR rx out of BA window" }, -#define S_AMPDU_BAR 100 - { 8, "ampdu_bar", "ampdu_bar", "A-MPDU BAR rx successful" }, -#define S_AMPDU_OOR 101 - { 8, "ampdu_oor", "ampdu_oor", "A-MPDU frames received out-of-order" }, -#define S_AMPDU_COPY 102 - { 8, "ampdu_copy", "ampdu_copy", "A-MPDU rx window slots copied" }, -#define S_INPUT 103 - { 8, "input", "input", "data frames received" }, -#define S_OUTPUT 104 - { 8, "output", "output", "data frames transmit" }, -#define S_RATE 105 - { 4, "rate", "rate", "current transmit rate" }, -#define S_RSSI 106 - { 4, "rssi", "rssi", "current rssi" }, -#define S_NOISE 107 - { 4, "noise", "noise", "current noise floor (dBm)" }, -#define S_RX_UCAST 108 +#define S_AMSDU_TOOSHORT AFTER(S_RX_ACTION) + { 8, "amsdu_tooshort", "tooshort","A-MSDU rx decap error" }, +#define S_AMSDU_SPLIT AFTER(S_AMSDU_TOOSHORT) + { 8, "amsdu_split", "split", "A-MSDU rx failed on frame split" }, +#define S_AMSDU_DECAP AFTER(S_AMSDU_SPLIT) + { 8, "amsdu_decap", "decap", "A-MSDU frames received" }, +#define S_AMSDU_ENCAP AFTER(S_AMSDU_DECAP) + { 8, "amsdu_encap", "encap", "A-MSDU frames transmitted" }, +#define S_AMPDU_REORDER AFTER(S_AMSDU_ENCAP) + { 8, "ampdu_reorder", "reorder","A-MPDU frames held in reorder q" }, +#define S_AMPDU_FLUSH AFTER(S_AMPDU_REORDER) + { 8, "ampdu_flush", "flush", "A-MPDU frames sent up from reorder q" }, +#define S_AMPDU_BARBAD AFTER(S_AMPDU_FLUSH) + { 6, "ampdu_barbad", "barbad", "A-MPDU BAR rx before ADDBA exchange (or disabled with net.link.ieee80211)" }, +#define S_AMPDU_BAROOW AFTER(S_AMPDU_BARBAD) + { 6, "ampdu_baroow", "baroow", "A-MPDU BAR rx out of BA window" }, +#define S_AMPDU_BARMOVE AFTER(S_AMPDU_BAROOW) + { 8, "ampdu_barmove", "barmove","A-MPDU BAR rx moved BA window" }, +#define S_AMPDU_BAR AFTER(S_AMPDU_BARMOVE) + { 8, "ampdu_bar", "rxbar", "A-MPDU BAR rx successful" }, +#define S_AMPDU_MOVE AFTER(S_AMPDU_BAR) + { 5, "ampdu_move", "move", "A-MPDU frame moved BA window" }, +#define S_AMPDU_OOR AFTER(S_AMPDU_MOVE) + { 8, "ampdu_oor", "oorx", "A-MPDU frames rx out-of-order" }, +#define S_AMPDU_COPY AFTER(S_AMPDU_OOR) + { 8, "ampdu_copy", "copy", "A-MPDU rx window slots copied" }, +#define S_AMPDU_DROP AFTER(S_AMPDU_COPY) + { 5, "ampdu_drop", "drop", "A-MPDU frames discarded for out of range seqno" }, +#define S_AMPDU_AGE AFTER(S_AMPDU_DROP) + { 5, "ampdu_age", "age", "A-MPDU frames sent up due to old age" }, +#define S_AMPDU_STOP AFTER(S_AMPDU_AGE) + { 5, "ampdu_stop", "stop", "A-MPDU streams stopped" }, +#define S_AMPDU_STOP_FAILED AFTER(S_AMPDU_STOP) + { 5, "ampdu_stop_failed","!stop", "A-MPDU stop requests failed 'cuz stream not running" }, +#define S_ADDBA_REJECT AFTER(S_AMPDU_STOP_FAILED) + { 5, "addba_reject", "reject", "ADDBA requests rejected 'cuz A-MPDU rx is disabled" }, +#define S_ADDBA_NOREQUEST AFTER(S_ADDBA_REJECT) + { 5, "addba_norequest","norequest","ADDBA response frames discarded because no ADDBA request was pending" }, +#define S_ADDBA_BADTOKEN AFTER(S_ADDBA_NOREQUEST) + { 5, "addba_badtoken", "badtoken","ADDBA response frames discarded 'cuz rx'd dialog token is wrong" }, +#define S_TX_BADSTATE AFTER(S_ADDBA_BADTOKEN) + { 4, "tx_badstate", "badstate", "tx failed 'cuz vap not in RUN state" }, +#define S_TX_NOTASSOC AFTER(S_TX_BADSTATE) + { 4, "tx_notassoc", "notassoc", "tx failed 'cuz dest sta not associated" }, +#define S_TX_CLASSIFY AFTER(S_TX_NOTASSOC) + { 4, "tx_classify", "classify", "tx packet classification failed" }, +#define S_DWDS_MCAST AFTER(S_TX_CLASSIFY) + { 8, "dwds_mcast", "dwds_mcast", "mcast frame transmitted on dwds vap discarded" }, +#define S_DWDS_QDROP AFTER(S_DWDS_MCAST) + { 8, "dwds_qdrop", "dwds_qdrop", "4-address frame discarded because dwds pending queue is full" }, +#define S_HT_ASSOC_NOHTCAP AFTER(S_DWDS_QDROP) + { 4, "ht_nohtcap", "ht_nohtcap", "non-HT station rejected in HT-only BSS" }, +#define S_HT_ASSOC_DOWNGRADE AFTER(S_HT_ASSOC_NOHTCAP) + { 4, "ht_downgrade", "ht_downgrade", "HT station downgraded to legacy operation" }, +#define S_HT_ASSOC_NORATE AFTER(S_HT_ASSOC_DOWNGRADE) + { 4, "ht_norate", "ht_norate", "HT station rejected because of HT rate set" }, +#define S_INPUT AFTER(S_HT_ASSOC_NORATE) + { 8, "input", "input", "total data frames received" }, +#define S_RX_UCAST AFTER(S_INPUT) { 8, "rx_ucast", "rx_ucast", "unicast data frames received" }, -#define S_RX_MCAST 109 +#define S_RX_MCAST AFTER(S_RX_UCAST) { 8, "rx_mcast", "rx_mcast", "multicast data frames received" }, -#define S_TX_UCAST 110 +#define S_OUTPUT AFTER(S_RX_MCAST) + { 8, "output", "output", "total data frames transmit" }, +#define S_TX_UCAST AFTER(S_OUTPUT) { 8, "tx_ucast", "tx_ucast", "unicast data frames sent" }, -#define S_TX_MCAST 111 +#define S_TX_MCAST AFTER(S_TX_UCAST) { 8, "tx_mcast", "tx_mcast", "multicast data frames sent" }, -#define S_SIGNAL 112 +#define S_RATE AFTER(S_TX_MCAST) + { 4, "rate", "rate", "current transmit rate" }, +#define S_RSSI AFTER(S_RATE) + { 4, "rssi", "rssi", "current rssi" }, +#define S_NOISE AFTER(S_RSSI) + { 4, "noise", "noise", "current noise floor (dBm)" }, +#define S_SIGNAL AFTER(S_NOISE) { 4, "signal", "sig", "current signal (dBm)" }, }; @@ -587,12 +625,28 @@ case S_AMSDU_SPLIT: STAT(amsdu_split); case S_AMSDU_DECAP: STAT(amsdu_decap); case S_AMSDU_ENCAP: STAT(amsdu_encap); + case S_AMPDU_REORDER: STAT(ampdu_rx_reorder); case S_AMPDU_FLUSH: STAT(ampdu_rx_flush); case S_AMPDU_BARBAD: STAT(ampdu_bar_bad); case S_AMPDU_BAROOW: STAT(ampdu_bar_oow); + case S_AMPDU_BARMOVE: STAT(ampdu_bar_move); case S_AMPDU_BAR: STAT(ampdu_bar_rx); + case S_AMPDU_MOVE: STAT(ampdu_rx_move); case S_AMPDU_OOR: STAT(ampdu_rx_oor); case S_AMPDU_COPY: STAT(ampdu_rx_copy); + case S_AMPDU_DROP: STAT(ampdu_rx_drop); + case S_AMPDU_AGE: STAT(ampdu_rx_age); + case S_AMPDU_STOP: STAT(ampdu_stop); + case S_AMPDU_STOP_FAILED:STAT(ampdu_stop_failed); + case S_ADDBA_REJECT: STAT(addba_reject); + case S_ADDBA_NOREQUEST: STAT(addba_norequest); + case S_ADDBA_BADTOKEN: STAT(addba_badtoken); + case S_TX_BADSTATE: STAT(tx_badstate); + case S_TX_NOTASSOC: STAT(tx_notassoc); + case S_TX_CLASSIFY: STAT(tx_classify); + case S_HT_ASSOC_NOHTCAP:STAT(ht_assoc_nohtcap); + case S_HT_ASSOC_DOWNGRADE:STAT(ht_assoc_downgrade); + case S_HT_ASSOC_NORATE: STAT(ht_assoc_norate); case S_INPUT: NSTAT(rx_data); case S_OUTPUT: NSTAT(tx_data); case S_RX_UCAST: NSTAT(rx_ucast); @@ -711,12 +765,28 @@ case S_AMSDU_SPLIT: STAT(amsdu_split); case S_AMSDU_DECAP: STAT(amsdu_decap); case S_AMSDU_ENCAP: STAT(amsdu_encap); + case S_AMPDU_REORDER: STAT(ampdu_rx_reorder); case S_AMPDU_FLUSH: STAT(ampdu_rx_flush); case S_AMPDU_BARBAD: STAT(ampdu_bar_bad); case S_AMPDU_BAROOW: STAT(ampdu_bar_oow); + case S_AMPDU_BARMOVE: STAT(ampdu_bar_move); case S_AMPDU_BAR: STAT(ampdu_bar_rx); + case S_AMPDU_MOVE: STAT(ampdu_rx_move); case S_AMPDU_OOR: STAT(ampdu_rx_oor); case S_AMPDU_COPY: STAT(ampdu_rx_copy); + case S_AMPDU_DROP: STAT(ampdu_rx_drop); + case S_AMPDU_AGE: STAT(ampdu_rx_age); + case S_AMPDU_STOP: STAT(ampdu_stop); + case S_AMPDU_STOP_FAILED:STAT(ampdu_stop_failed); + case S_ADDBA_REJECT: STAT(addba_reject); + case S_ADDBA_NOREQUEST: STAT(addba_norequest); + case S_ADDBA_BADTOKEN: STAT(addba_badtoken); + case S_TX_BADSTATE: STAT(tx_badstate); + case S_TX_NOTASSOC: STAT(tx_notassoc); + case S_TX_CLASSIFY: STAT(tx_classify); + case S_HT_ASSOC_NOHTCAP:STAT(ht_assoc_nohtcap); + case S_HT_ASSOC_DOWNGRADE:STAT(ht_assoc_downgrade); + case S_HT_ASSOC_NORATE: STAT(ht_assoc_norate); case S_INPUT: NSTAT(rx_data); case S_OUTPUT: NSTAT(tx_data); case S_RX_UCAST: NSTAT(rx_ucast); From owner-p4-projects@FreeBSD.ORG Sat Nov 3 21:59:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEB4B16A469; Sat, 3 Nov 2007 21:59:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C7A416A421 for ; Sat, 3 Nov 2007 21:59:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D2CA13C4C3 for ; Sat, 3 Nov 2007 21:59:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA3Lx8Ta092181 for ; Sat, 3 Nov 2007 21:59:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA3Lx8ja092178 for perforce@freebsd.org; Sat, 3 Nov 2007 21:59:08 GMT (envelope-from jb@freebsd.org) Date: Sat, 3 Nov 2007 21:59:08 GMT Message-Id: <200711032159.lA3Lx8ja092178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2007 21:59:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=128582 Change 128582 by jb@jb_freebsd1 on 2007/11/03 21:58:41 Add the DTrace system initialisation levels back again. Affected files ... .. //depot/projects/dtrace/src/sys/sys/kernel.h#13 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/kernel.h#13 (text+ko) ==== @@ -120,6 +120,11 @@ SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits*/ SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue*/ SI_SUB_KTRACE = 0x2480000, /* ktrace */ + SI_SUB_CYCLIC = 0x2490000, /* Cyclic timers */ + SI_SUB_KDTRACE = 0x24A0000, /* Kernel dtrace hooks */ + SI_SUB_DTRACE = 0x24B0000, /* DTrace subsystem */ + SI_SUB_DTRACE_PROVIDER = 0x24B8000, /* DTrace providers */ + SI_SUB_DTRACE_ANON = 0x24BC000, /* DTrace anon enabling */ SI_SUB_AUDIT = 0x24C0000, /* audit */ SI_SUB_CREATE_INIT = 0x2500000, /* create init process*/ SI_SUB_SCHED_IDLE = 0x2600000, /* required idle procs */