From owner-p4-projects@FreeBSD.ORG Sun Dec 19 00:56:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF6CC16A4D0; Sun, 19 Dec 2004 00:56:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88C6416A4CF for ; Sun, 19 Dec 2004 00:56:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D52AC43D2F for ; Sun, 19 Dec 2004 00:55:59 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBJ0txPc002650 for ; Sun, 19 Dec 2004 00:55:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBJ0txnq002647 for perforce@freebsd.org; Sun, 19 Dec 2004 00:55:59 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Dec 2004 00:55:59 GMT Message-Id: <200412190055.iBJ0txnq002647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2004 00:56:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=67320 Change 67320 by sam@sam_ebb on 2004/12/19 00:55:52 IFC @ 67319 Affected files ... .. //depot/projects/wifi/Makefile#5 integrate .. //depot/projects/wifi/Makefile.inc1#7 integrate .. //depot/projects/wifi/UPDATING.64BTT#2 delete .. //depot/projects/wifi/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/wifi/etc/rc.d/named#2 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/wifi/installworld_newk#2 delete .. //depot/projects/wifi/installworld_oldk#2 delete .. //depot/projects/wifi/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/wifi/lib/libpthread/pthread.map#2 integrate .. //depot/projects/wifi/lib/libpthread/sys/thr_error.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_cancel.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_clean.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_concurrency.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_cond.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_create.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_fork.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_init.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_mutex.c#3 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_once.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_sem.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_sig.c#3 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/wifi/lib/libutil/_secure_path.c#2 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/b_tgamma.c#2 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/mathimpl.h#2 integrate .. //depot/projects/wifi/libexec/ftpd/ftpd.c#8 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#5 integrate .. //depot/projects/wifi/sbin/mknod/mknod.8#2 integrate .. //depot/projects/wifi/share/examples/etc/make.conf#6 integrate .. //depot/projects/wifi/share/man/man4/altq.4#5 integrate .. //depot/projects/wifi/share/man/man4/ath.4#4 integrate .. //depot/projects/wifi/share/man/man4/atkbd.4#2 integrate .. //depot/projects/wifi/share/man/man4/bge.4#2 integrate .. //depot/projects/wifi/share/man/man4/divert.4#2 integrate .. //depot/projects/wifi/share/man/man4/fwohci.4#3 integrate .. //depot/projects/wifi/share/man/man4/mpt.4#2 integrate .. //depot/projects/wifi/share/man/man4/netgraph.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_bt3c.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/wifi/share/man/man4/smp.4#3 integrate .. //depot/projects/wifi/share/man/man4/ti.4#2 integrate .. //depot/projects/wifi/share/man/man4/ubser.4#2 integrate .. //depot/projects/wifi/share/man/man4/umass.4#2 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/wifi/share/man/man7/hier.7#2 integrate .. //depot/projects/wifi/share/man/man7/ports.7#3 integrate .. //depot/projects/wifi/share/man/man7/release.7#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/wifi/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/wifi/sys/arm/include/atomic.h#3 integrate .. //depot/projects/wifi/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/wifi/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/wifi/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/wifi/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/wifi/sys/dev/kbd/atkbdreg.h#2 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/twe/twe.c#2 integrate .. //depot/projects/wifi/sys/dev/twe/tweio.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi.c#9 edit .. //depot/projects/wifi/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/wifi/sys/kern/init_sysent.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/wifi/sys/kern/syscalls.c#4 integrate .. //depot/projects/wifi/sys/kern/syscalls.master#4 integrate .. //depot/projects/wifi/sys/modules/wlan_ccmp/Makefile#5 integrate .. //depot/projects/wifi/sys/net/bpf.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/wifi/sys/nfsclient/nfsnode.h#6 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/wifi/sys/sys/proc.h#4 integrate .. //depot/projects/wifi/sys/sys/syscall.h#3 integrate .. //depot/projects/wifi/sys/sys/syscall.mk#3 integrate .. //depot/projects/wifi/sys/sys/sysproto.h#3 integrate .. //depot/projects/wifi/sys/sys/umtx.h#2 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_map.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_meter.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#4 integrate .. //depot/projects/wifi/tools/tools/nanobsd/Customize/comconsole#2 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.music#2 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik#2 integrate .. //depot/projects/wifi/usr.bin/make/Makefile#5 integrate .. //depot/projects/wifi/usr.bin/make/arch.c#6 integrate .. //depot/projects/wifi/usr.bin/make/compat.c#6 integrate .. //depot/projects/wifi/usr.bin/make/cond.c#5 integrate .. //depot/projects/wifi/usr.bin/make/dir.c#6 integrate .. //depot/projects/wifi/usr.bin/make/dir.h#4 integrate .. //depot/projects/wifi/usr.bin/make/for.c#5 integrate .. //depot/projects/wifi/usr.bin/make/job.c#10 integrate .. //depot/projects/wifi/usr.bin/make/lst.h#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstConcat.c#6 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#7 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDupl.c#6 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInit.c#6 delete .. //depot/projects/wifi/usr.bin/make/main.c#10 integrate .. //depot/projects/wifi/usr.bin/make/make.c#7 integrate .. //depot/projects/wifi/usr.bin/make/make.h#4 integrate .. //depot/projects/wifi/usr.bin/make/nonints.h#5 integrate .. //depot/projects/wifi/usr.bin/make/parse.c#7 integrate .. //depot/projects/wifi/usr.bin/make/str.c#5 integrate .. //depot/projects/wifi/usr.bin/make/suff.c#6 integrate .. //depot/projects/wifi/usr.bin/make/targ.c#7 integrate .. //depot/projects/wifi/usr.bin/make/var.c#7 integrate .. //depot/projects/wifi/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/wifi/usr.sbin/burncd/burncd.c#2 integrate .. //depot/projects/wifi/usr.sbin/config/config.8#2 integrate .. //depot/projects/wifi/usr.sbin/lpr/lpd/printjob.c#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/ppp.8.m4#5 integrate Differences ... ==== //depot/projects/wifi/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.312 2004/12/13 00:49:52 marcel Exp $ +# $FreeBSD: src/Makefile,v 1.313 2004/12/16 19:55:57 ru Exp $ # # The user-driven targets are: # @@ -86,8 +86,9 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} ${.MAKEFLAGS} \ - -f /dev/null -V MAKEOBJDIRPREFIX dummy +_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ (in /etc/make.conf) or command-line variable. ==== //depot/projects/wifi/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.459 2004/12/01 23:23:14 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.460 2004/12/17 10:11:33 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -27,7 +27,7 @@ # The intended user-driven targets are: # buildworld - rebuild *everything*, including glue to help do upgrades # installworld- install everything built by "buildworld" -# update - convenient way to update your source tree (eg: sup/cvs) +# update - convenient way to update your source tree (eg: cvsup/cvs) # # Standard targets (not defined here) are documented in the makefiles in # /usr/share/mk. These include: @@ -739,7 +739,7 @@ # # update # -# Update the source tree, by running sup and/or running cvs to update to the +# Update the source tree, by running cvsup and/or running cvs to update to the # latest copy. # update: @@ -765,7 +765,7 @@ .endif .if defined(CVS_UPDATE) @echo "--------------------------------------------------------------" - @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT} + @echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS} .endif ==== //depot/projects/wifi/contrib/groff/tmac/doc-common#2 (text+ko) ==== ==== //depot/projects/wifi/etc/rc.d/named#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/named,v 1.16 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.17 2004/12/18 15:19:36 phk Exp $ # # PROVIDE: named @@ -48,6 +48,10 @@ else ln -s ${named_chrootdir}/etc/namedb /etc/namedb fi + else + # Make sure it points to the right place. + ln -sf ${named_chrootdir}/etc/namedb /etc/namedb + fi # Mount a devfs in the chroot directory if needed ==== //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#2 (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.42 2004/08/19 10:41:54 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.44 2004/12/18 07:20:33 ru Exp $ .\" .\" %beginstrip% . @@ -60,9 +60,9 @@ .ds doc-default-operating-system FreeBSD\~6.0 . .\" FreeBSD releases not found in doc-common -.\" .ds doc-operating-system-FreeBSD-4.11 4.11 -.\" .ds doc-operating-system-FreeBSD-5.4 5.4 -.\" .ds doc-operating-system-FreeBSD-6.0 6.0 +.ds doc-operating-system-FreeBSD-4.11 4.11 +.ds doc-operating-system-FreeBSD-5.4 5.4 +.ds doc-operating-system-FreeBSD-6.0 6.0 . .ec . ==== //depot/projects/wifi/lib/libc/gen/sigsetops.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigsetops.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.8 2003/06/24 15:27:31 yar Exp $ +.\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.9 2004/12/16 20:27:55 maxim Exp $ .\" -.Dd June 4, 1993 +.Dd December 16, 2004 .Dt SIGSETOPS 3 .Os .Sh NAME @@ -92,21 +92,24 @@ function returns whether a specified signal .Fa signo is contained in the signal set. -.Pp -These functions -are provided as macros in the include file . -Actual functions are available -if their names are undefined (with -.Ic #undef Ar name ) . .Sh RETURN VALUES The .Fn sigismember function returns 1 if the signal is a member of the set, 0 otherwise. -The other functions return 0. +The other functions return 0 upon success. +A \-1 return value +indicates an error occurred and the global variable +.Va errno +is set to indicate the reason. .Sh ERRORS -Currently no errors are detected. +These functions could fail if one of the following occurs: +.Bl -tag -width Er +.It Bq Er EINVAL +.Fa signo +has an invalid value. +.El .Sh SEE ALSO .Xr kill 2 , .Xr sigaction 2 , ==== //depot/projects/wifi/lib/libpthread/pthread.map#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.13 2004/09/26 06:50:14 deischen Exp $ +# $FreeBSD: src/lib/libpthread/pthread.map,v 1.14 2004/12/18 18:07:36 deischen Exp $ LIBTHREAD_1_0 { global: ___creat; @@ -14,6 +14,7 @@ __poll; __pthread_cond_timedwait; __pthread_cond_wait; + __pthread_mutex_init; __pthread_mutex_lock; __pthread_mutex_trylock; __pthread_mutex_timedlock; ==== //depot/projects/wifi/lib/libpthread/sys/thr_error.c#2 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/sys/thr_error.c,v 1.7 2003/04/23 21:46:50 deischen Exp $ + * $FreeBSD: src/lib/libpthread/sys/thr_error.c,v 1.8 2004/12/18 18:07:37 deischen Exp $ */ #include #include "libc_private.h" #include "thr_private.h" +#undef errno extern int errno; int * ==== //depot/projects/wifi/lib/libpthread/thread/thr_cancel.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.31 2003/12/09 02:20:56 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.32 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -14,18 +14,26 @@ static inline int checkcancel(struct pthread *curthread) { - if (((curthread->cancelflags & PTHREAD_CANCEL_DISABLE) == 0) && - ((curthread->cancelflags & THR_CANCELLING) != 0)) { + if ((curthread->cancelflags & THR_CANCELLING) != 0) { /* * It is possible for this thread to be swapped out * while performing cancellation; do not allow it * to be cancelled again. */ - curthread->cancelflags &= ~THR_CANCELLING; - return (1); + if ((curthread->flags & THR_FLAGS_EXITING) != 0) { + /* + * This may happen once, but after this, it + * shouldn't happen again. + */ + curthread->cancelflags &= ~THR_CANCELLING; + return (0); + } + if ((curthread->cancelflags & PTHREAD_CANCEL_DISABLE) == 0) { + curthread->cancelflags &= ~THR_CANCELLING; + return (1); + } } - else - return (0); + return (0); } static inline void ==== //depot/projects/wifi/lib/libpthread/thread/thr_clean.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_clean.c,v 1.8 2003/04/18 05:04:15 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_clean.c,v 1.9 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -50,6 +50,7 @@ malloc(sizeof(struct pthread_cleanup))) != NULL) { new->routine = routine; new->routine_arg = routine_arg; + new->onstack = 0; new->next = curthread->cleanup; curthread->cleanup = new; @@ -67,6 +68,7 @@ if (execute) { old->routine(old->routine_arg); } - free(old); + if (old->onstack == 0) + free(old); } } ==== //depot/projects/wifi/lib/libpthread/thread/thr_concurrency.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/lib/libpthread/thread/thr_concurrency.c,v 1.8 2004/03/14 05:24:27 bde Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.9 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -84,6 +84,13 @@ int i; int ret; + /* + * Turn on threaded mode, if failed, it is unnecessary to + * do further work. + */ + if (_kse_isthreaded() == 0 && _kse_setthreaded(1)) + return (EAGAIN); + ret = 0; curthread = _get_curthread(); /* Race condition, but so what. */ ==== //depot/projects/wifi/lib/libpthread/thread/thr_cond.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.51 2003/12/09 02:20:56 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.52 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -47,6 +47,9 @@ static inline struct pthread *cond_queue_deq(pthread_cond_t); static inline void cond_queue_remove(pthread_cond_t, pthread_t); static inline void cond_queue_enq(pthread_cond_t, pthread_t); +static void cond_wait_backout(void *); +static inline void check_continuation(struct pthread *, + struct pthread_cond *, pthread_mutex_t *); /* * Double underscore versions are cancellation points. Single underscore @@ -171,8 +174,7 @@ struct pthread *curthread = _get_curthread(); int rval = 0; int done = 0; - int interrupted = 0; - int unlock_mutex = 1; + int mutex_locked = 1; int seqno; if (cond == NULL) @@ -198,10 +200,11 @@ * and backed out of the waiting queue prior to executing the * signal handler. */ + + /* Lock the condition variable structure: */ + THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); + seqno = (*cond)->c_seqno; do { - /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); - /* * If the condvar was statically allocated, properly * initialize the tail queue. @@ -217,9 +220,6 @@ case COND_TYPE_FAST: if ((mutex == NULL) || (((*cond)->c_mutex != NULL) && ((*cond)->c_mutex != *mutex))) { - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - /* Return invalid argument error: */ rval = EINVAL; } else { @@ -233,15 +233,11 @@ */ cond_queue_enq(*cond, curthread); - /* Remember the mutex and sequence number: */ - (*cond)->c_mutex = *mutex; - seqno = (*cond)->c_seqno; - /* Wait forever: */ curthread->wakeup_time.tv_sec = -1; /* Unlock the mutex: */ - if ((unlock_mutex != 0) && + if (mutex_locked && ((rval = _mutex_cv_unlock(mutex)) != 0)) { /* * Cannot unlock the mutex, so remove @@ -249,22 +245,18 @@ * variable queue: */ cond_queue_remove(*cond, curthread); - - /* Check for no more waiters: */ - if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) - (*cond)->c_mutex = NULL; - - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); } else { + /* Remember the mutex: */ + (*cond)->c_mutex = *mutex; + /* * Don't unlock the mutex the next * time through the loop (if the * thread has to be requeued after * handling a signal). */ - unlock_mutex = 0; + mutex_locked = 0; /* * This thread is active and is in a @@ -277,6 +269,7 @@ /* Remember the CV: */ curthread->data.cond = *cond; + curthread->sigbackout = cond_wait_backout; THR_SCHED_UNLOCK(curthread, curthread); /* Unlock the CV structure: */ @@ -286,8 +279,6 @@ /* Schedule the next thread: */ _thr_sched_switch(curthread); - curthread->data.cond = NULL; - /* * XXX - This really isn't a good check * since there can be more than one @@ -299,60 +290,61 @@ * should be sent "as soon as possible". */ done = (seqno != (*cond)->c_seqno); - - if (THR_IN_SYNCQ(curthread)) { + if (done && !THR_IN_CONDQ(curthread)) { /* - * Lock the condition variable - * while removing the thread. + * The thread is dequeued, so + * it is safe to clear these. */ - THR_LOCK_ACQUIRE(curthread, - &(*cond)->c_lock); + curthread->data.cond = NULL; + curthread->sigbackout = NULL; + check_continuation(curthread, + NULL, mutex); + return (_mutex_cv_lock(mutex)); + } + + /* Relock the CV structure: */ + THR_LOCK_ACQUIRE(curthread, + &(*cond)->c_lock); + + /* + * Clear these after taking the lock to + * prevent a race condition where a + * signal can arrive before dequeueing + * the thread. + */ + curthread->data.cond = NULL; + curthread->sigbackout = NULL; + done = (seqno != (*cond)->c_seqno); + if (THR_IN_CONDQ(curthread)) { cond_queue_remove(*cond, curthread); /* Check for no more waiters: */ if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) (*cond)->c_mutex = NULL; - - THR_LOCK_RELEASE(curthread, - &(*cond)->c_lock); } - - /* - * Save the interrupted flag; locking - * the mutex may destroy it. - */ - interrupted = curthread->interrupted; - - /* - * Note that even though this thread may - * have been canceled, POSIX requires - * that the mutex be reaquired prior to - * cancellation. - */ - if (done || interrupted) { - rval = _mutex_cv_lock(mutex); - unlock_mutex = 1; - } } } break; /* Trap invalid condition variable types: */ default: - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - /* Return an invalid argument error: */ rval = EINVAL; break; } - if ((interrupted != 0) && (curthread->continuation != NULL)) - curthread->continuation((void *) curthread); + check_continuation(curthread, *cond, + mutex_locked ? NULL : mutex); } while ((done == 0) && (rval == 0)); + /* Unlock the condition variable structure: */ + THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); + + if (mutex_locked == 0) + _mutex_cv_lock(mutex); + /* Return the completion status: */ return (rval); } @@ -378,8 +370,7 @@ struct pthread *curthread = _get_curthread(); int rval = 0; int done = 0; - int interrupted = 0; - int unlock_mutex = 1; + int mutex_locked = 1; int seqno; THR_ASSERT(curthread->locklevel == 0, @@ -407,10 +398,11 @@ * and backed out of the waiting queue prior to executing the * signal handler. */ + + /* Lock the condition variable structure: */ + THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); + seqno = (*cond)->c_seqno; do { - /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); - /* * If the condvar was statically allocated, properly * initialize the tail queue. @@ -428,9 +420,6 @@ ((*cond)->c_mutex != *mutex))) { /* Return invalid argument error: */ rval = EINVAL; - - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); } else { /* Set the wakeup time: */ curthread->wakeup_time.tv_sec = abstime->tv_sec; @@ -447,12 +436,8 @@ */ cond_queue_enq(*cond, curthread); - /* Remember the mutex and sequence number: */ - (*cond)->c_mutex = *mutex; - seqno = (*cond)->c_seqno; - /* Unlock the mutex: */ - if ((unlock_mutex != 0) && + if (mutex_locked && ((rval = _mutex_cv_unlock(mutex)) != 0)) { /* * Cannot unlock the mutex; remove the @@ -460,21 +445,17 @@ * variable queue: */ cond_queue_remove(*cond, curthread); - - /* Check for no more waiters: */ - if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) - (*cond)->c_mutex = NULL; + } else { + /* Remember the mutex: */ + (*cond)->c_mutex = *mutex; - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - } else { /* * Don't unlock the mutex the next * time through the loop (if the * thread has to be requeued after * handling a signal). */ - unlock_mutex = 0; + mutex_locked = 0; /* * This thread is active and is in a @@ -487,6 +468,7 @@ /* Remember the CV: */ curthread->data.cond = *cond; + curthread->sigbackout = cond_wait_backout; THR_SCHED_UNLOCK(curthread, curthread); /* Unlock the CV structure: */ @@ -496,8 +478,6 @@ /* Schedule the next thread: */ _thr_sched_switch(curthread); - curthread->data.cond = NULL; - /* * XXX - This really isn't a good check * since there can be more than one @@ -509,38 +489,45 @@ * should be sent "as soon as possible". */ done = (seqno != (*cond)->c_seqno); - - if (THR_IN_CONDQ(curthread)) { + if (done && !THR_IN_CONDQ(curthread)) { /* - * Lock the condition variable - * while removing the thread. + * The thread is dequeued, so + * it is safe to clear these. */ - THR_LOCK_ACQUIRE(curthread, - &(*cond)->c_lock); + curthread->data.cond = NULL; + curthread->sigbackout = NULL; + check_continuation(curthread, + NULL, mutex); + return (_mutex_cv_lock(mutex)); + } + + /* Relock the CV structure: */ + THR_LOCK_ACQUIRE(curthread, + &(*cond)->c_lock); + + /* + * Clear these after taking the lock to + * prevent a race condition where a + * signal can arrive before dequeueing + * the thread. + */ + curthread->data.cond = NULL; + curthread->sigbackout = NULL; + + done = (seqno != (*cond)->c_seqno); + if (THR_IN_CONDQ(curthread)) { cond_queue_remove(*cond, curthread); /* Check for no more waiters: */ if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) (*cond)->c_mutex = NULL; - - THR_LOCK_RELEASE(curthread, - &(*cond)->c_lock); } - /* - * Save the interrupted flag; locking - * the mutex may destroy it. - */ - interrupted = curthread->interrupted; if (curthread->timeout != 0) { /* The wait timedout. */ rval = ETIMEDOUT; - (void)_mutex_cv_lock(mutex); - } else if (interrupted || done) { - rval = _mutex_cv_lock(mutex); - unlock_mutex = 1; } } } @@ -548,18 +535,21 @@ /* Trap invalid condition variable types: */ default: - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - /* Return an invalid argument error: */ rval = EINVAL; break; } - if ((interrupted != 0) && (curthread->continuation != NULL)) - curthread->continuation((void *)curthread); + check_continuation(curthread, *cond, + mutex_locked ? NULL : mutex); } while ((done == 0) && (rval == 0)); + /* Unlock the condition variable structure: */ + THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); + + if (mutex_locked == 0) + _mutex_cv_lock(mutex); + /* Return the completion status: */ return (rval); } @@ -615,6 +605,7 @@ != NULL) { THR_SCHED_LOCK(curthread, pthread); cond_queue_remove(*cond, pthread); + pthread->sigbackout = NULL; if ((pthread->kseg == curthread->kseg) && (pthread->active_priority > curthread->active_priority)) @@ -681,6 +672,7 @@ != NULL) { THR_SCHED_LOCK(curthread, pthread); cond_queue_remove(*cond, pthread); + pthread->sigbackout = NULL; if ((pthread->kseg == curthread->kseg) && (pthread->active_priority > curthread->active_priority)) @@ -712,9 +704,31 @@ __strong_reference(_pthread_cond_broadcast, _thr_cond_broadcast); -void -_cond_wait_backout(struct pthread *curthread) +static inline void +check_continuation(struct pthread *curthread, struct pthread_cond *cond, + pthread_mutex_t *mutex) +{ + if ((curthread->interrupted != 0) && + (curthread->continuation != NULL)) { + if (cond != NULL) + /* Unlock the condition variable structure: */ + THR_LOCK_RELEASE(curthread, &cond->c_lock); + /* + * Note that even though this thread may have been + * canceled, POSIX requires that the mutex be + * reaquired prior to cancellation. + */ + if (mutex != NULL) + _mutex_cv_lock(mutex); + curthread->continuation((void *) curthread); + PANIC("continuation returned in pthread_cond_wait.\n"); + } +} + +static void +cond_wait_backout(void *arg) { + struct pthread *curthread = (struct pthread *)arg; pthread_cond_t cond; cond = curthread->data.cond; @@ -740,6 +754,8 @@ /* Unlock the condition variable structure: */ THR_LOCK_RELEASE(curthread, &cond->c_lock); } + /* No need to call this again. */ + curthread->sigbackout = NULL; } /* ==== //depot/projects/wifi/lib/libpthread/thread/thr_create.c#2 (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/libpthread/thread/thr_create.c,v 1.58 2004/10/23 23:28:36 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.59 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -171,9 +171,6 @@ /* No thread is wanting to join to this one: */ new_thread->joiner = NULL; - /* Initialize the signal frame: */ - new_thread->curframe = NULL; - /* * Initialize the machine context. * Enter a critical region to get consistent context. @@ -235,6 +232,7 @@ new_thread->cleanup = NULL; new_thread->flags = 0; new_thread->tlflags = 0; + new_thread->sigbackout = NULL; new_thread->continuation = NULL; new_thread->wakeup_time.tv_sec = -1; new_thread->lock_switch = 0; ==== //depot/projects/wifi/lib/libpthread/thread/thr_fork.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_fork.c,v 1.34 2003/11/05 18:18:45 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_fork.c,v 1.35 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -43,12 +43,6 @@ #include "libc_private.h" #include "thr_private.h" -/* - * For a while, allow libpthread to work with a libc that doesn't - * export the malloc lock. - */ -#pragma weak __malloc_lock - __weak_reference(_fork, fork); pid_t @@ -60,10 +54,20 @@ pid_t ret; int errsave; - if (!_kse_isthreaded()) - return (__sys_fork()); + curthread = _get_curthread(); - curthread = _get_curthread(); + if (!_kse_isthreaded()) { + SIGFILLSET(sigset); + __sys_sigprocmask(SIG_SETMASK, &sigset, &oldset); + ret = __sys_fork(); + if (ret == 0) + /* Child */ + __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, + NULL); + else + __sys_sigprocmask(SIG_SETMASK, &oldset, NULL); + return (ret); + } /* * Masks all signals until we reach a safe point in @@ -86,7 +90,7 @@ } /* Fork a new process: */ - if ((_kse_isthreaded() != 0) && (__malloc_lock != NULL)) { + if (_kse_isthreaded() != 0) { _spinlock(__malloc_lock); } if ((ret = __sys_fork()) == 0) { ==== //depot/projects/wifi/lib/libpthread/thread/thr_init.c#2 (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/libpthread/thread/thr_init.c,v 1.66 2004/08/21 11:49:19 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.67 2004/12/18 18:07:37 deischen Exp $ */ /* Allocate space for global thread variables here: */ @@ -391,6 +391,7 @@ thread->specific = NULL; thread->cleanup = NULL; thread->flags = 0; + thread->sigbackout = NULL; thread->continuation = NULL; thread->state = PS_RUNNING; ==== //depot/projects/wifi/lib/libpthread/thread/thr_kern.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 19 02:01:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3733216A4D0; Sun, 19 Dec 2004 02:01:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCAB916A4CE for ; Sun, 19 Dec 2004 02:01:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EC0343D39 for ; Sun, 19 Dec 2004 02:01:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBJ21J5w005931 for ; Sun, 19 Dec 2004 02:01:19 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBJ21J4l005928 for perforce@freebsd.org; Sun, 19 Dec 2004 02:01:19 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 19 Dec 2004 02:01:19 GMT Message-Id: <200412190201.iBJ21J4l005928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 67324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2004 02:01:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=67324 Change 67324 by davidxu@davidxu_tiger on 2004/12/19 02:00:34 IPC Affected files ... .. //depot/projects/davidxu_thread/src/etc/devd.conf#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/sys/proc.h#5 integrate Differences ... ==== //depot/projects/davidxu_thread/src/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.19 2004/11/28 23:16:00 iedowse Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.20 2004/12/19 00:50:07 brueffer Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -19,12 +19,13 @@ # Setup some shorthand for regex that we use later in the file. set ethernet-nic-regex "(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\ - ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ - rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\ - xl)[0-9]+"; + ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\ + sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|udav|vge|vr|vx|wb|wi|xe|xl)\ + [0-9]+"; set scsi-controller-regex - "(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\ - stg|sym|wds)[0-9]+"; + "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\ + ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\ + [0-9]+"; }; # Note that the attach/detach with the highest value wins, so that one can ==== //depot/projects/davidxu_thread/src/sys/kern/kern_umtx.c#6 (text+ko) ==== @@ -1,4 +1,5 @@ /* + * Copyright (c) 2004, David Xu * Copyright (c) 2002, Jeffrey Roberson * All rights reserved. * @@ -25,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.18 2004/11/30 12:18:53 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.20 2004/12/18 13:43:16 davidxu Exp $"); #include #include @@ -47,15 +48,35 @@ #include #include +#define UMTX_PRIVATE 0 +#define UMTX_SHARED 1 + +#define UMTX_STATIC_SHARED + struct umtx_key { - vm_object_t uk_object; - vm_ooffset_t uk_offset; + int type; + union { + struct { + vm_object_t object; + long offset; + } shared; + struct { + struct umtx *umtx; + long pid; + } private; + struct { + void *ptr; + long word; + } both; + } info; }; struct umtx_q { LIST_ENTRY(umtx_q) uq_next; /* Linked list for the hash. */ - struct umtx_key uq_key; - struct thread *uq_thread; + struct umtx_key uq_key; /* Umtx key. */ + struct thread *uq_thread; /* The thread waits on */ + LIST_ENTRY(umtx_q) uq_rqnext; /* Linked list for requeuing. */ + vm_offset_t uq_addr; /* Umtx's virtual address. */ }; LIST_HEAD(umtx_head, umtx_q); @@ -73,21 +94,31 @@ #define UMTX_CONTESTED LONG_MIN -static void umtx_init_chains(void *); -static int umtxq_hash(struct umtx_key *); +static void umtxq_init_chains(void *); +static int umtxq_hash(struct umtx_key *key); static struct mtx *umtxq_mtx(int chain); -static void umtxq_lock(int chain); -static void umtxq_unlock(int chain); -static void umtxq_insert(int chain, struct umtx_q *); -static int umtxq_count(struct umtx_key *); -static void umtxq_signal(struct umtx_key *); +static void umtxq_lock(struct umtx_key *key); +static void umtxq_unlock(struct umtx_key *key); +static void umtxq_insert(struct umtx_q *uq); +static void umtxq_remove(struct umtx_q *uq); +static int umtxq_sleep(struct thread *td, struct umtx_key *key, + int prio, const char *wmesg, int timo); +static int umtxq_count(struct umtx_key *key); +static void umtxq_signal(struct umtx_key *key); +static void umtxq_broadcast(struct umtx_key *key); +#ifdef UMTX_DYNAMIC_SHARED static void fork_handler(void *arg, struct proc *p1, struct proc *p2, - int flags); + int flags); +#endif +static int umtx_key_match(const struct umtx_key *k1, const struct umtx_key *k2); +static int umtx_key_get(struct thread *td, struct umtx *umtx, + struct umtx_key *key); +static void umtx_key_release(struct umtx_key *key); -SYSINIT(umtx, SI_SUB_EVENTHANDLER+1, SI_ORDER_MIDDLE, umtx_init_chains, NULL); +SYSINIT(umtx, SI_SUB_EVENTHANDLER+1, SI_ORDER_MIDDLE, umtxq_init_chains, NULL); static void -umtx_init_chains(void *arg __unused) +umtxq_init_chains(void *arg __unused) { int i; @@ -96,27 +127,24 @@ MTX_DEF | MTX_DUPOK); LIST_INIT(&umtxq_chains[i].uc_queue); } +#ifdef UMTX_DYNAMIC_SHARED EVENTHANDLER_REGISTER(process_fork, fork_handler, 0, 10000); +#endif } -static void -fork_handler(void *arg, struct proc *p1, struct proc *p2, int flags) +static inline int +umtxq_hash(struct umtx_key *key) { - struct thread *td; - - PROC_LOCK(p1); - FOREACH_THREAD_IN_PROC(p1, td) { - if (td->td_flags & TDF_UMTXQ) - wakeup(td); - } - PROC_UNLOCK(p1); + unsigned n = (uintptr_t)key->info.both.ptr + key->info.both.word; + return (((n * GOLDEN_RATIO_PRIME) >> UMTX_SHIFTS) % UMTX_CHAINS); } static inline int -umtxq_hash(struct umtx_key *key) +umtx_key_match(const struct umtx_key *k1, const struct umtx_key *k2) { - unsigned n = (uintptr_t)key->uk_object + key->uk_offset; - return (((n * GOLDEN_RATIO_PRIME) >> UMTX_SHIFTS) % UMTX_CHAINS); + return (k1->type == k2->type && + k1->info.both.ptr == k2->info.both.ptr && + k1->info.both.word == k2->info.both.word); } static inline struct mtx * @@ -126,14 +154,16 @@ } static inline void -umtxq_lock(int chain) +umtxq_lock(struct umtx_key *key) { + int chain = umtxq_hash(key); mtx_lock(umtxq_mtx(chain)); } static inline void -umtxq_unlock(int chain) +umtxq_unlock(struct umtx_key *key) { + int chain = umtxq_hash(key); mtx_unlock(umtxq_mtx(chain)); } @@ -141,25 +171,29 @@ * Insert a thread onto the umtx queue. */ static inline void -umtxq_insert(int chain, struct umtx_q *uq) +umtxq_insert(struct umtx_q *uq) { struct umtx_head *head; + int chain = umtxq_hash(&uq->uq_key); head = &umtxq_chains[chain].uc_queue; LIST_INSERT_HEAD(head, uq, uq_next); + uq->uq_thread->td_umtxq = uq; mtx_lock_spin(&sched_lock); uq->uq_thread->td_flags |= TDF_UMTXQ; mtx_unlock_spin(&sched_lock); } /* - * Remove thread from umtx queue released. + * Remove thread from the umtx queue. */ static inline void umtxq_remove(struct umtx_q *uq) { if (uq->uq_thread->td_flags & TDF_UMTXQ) { LIST_REMOVE(uq, uq_next); + uq->uq_thread->td_umtxq = NULL; + /* turning off TDF_UMTXQ should be the last thing. */ mtx_lock_spin(&sched_lock); uq->uq_thread->td_flags &= ~TDF_UMTXQ; mtx_unlock_spin(&sched_lock); @@ -174,16 +208,15 @@ int chain, count = 0; chain = umtxq_hash(key); - umtxq_lock(chain); + umtxq_lock(key); head = &umtxq_chains[chain].uc_queue; LIST_FOREACH(uq, head, uq_next) { - if (uq->uq_key.uk_object == key->uk_object && - uq->uq_key.uk_offset == key->uk_offset) { + if (umtx_key_match(&uq->uq_key, key)) { if (++count > 1) break; } } - umtxq_unlock(chain); + umtxq_unlock(key); return (count); } @@ -196,55 +229,209 @@ int chain; chain = umtxq_hash(key); - umtxq_lock(chain); + umtxq_lock(key); head = &umtxq_chains[chain].uc_queue; LIST_FOREACH(uq, head, uq_next) { - if (uq->uq_key.uk_object == key->uk_object && - uq->uq_key.uk_offset == key->uk_offset) { + if (umtx_key_match(&uq->uq_key, key)) { blocked = uq->uq_thread; umtxq_remove(uq); break; } } - umtxq_unlock(chain); + umtxq_unlock(key); if (blocked != NULL) wakeup(blocked); } -int -_umtx_lock(struct thread *td, struct _umtx_lock_args *uap) - /* struct umtx *umtx */ +static void +umtxq_broadcast(struct umtx_key *key) +{ + struct umtx_q *uq, *next; + struct umtx_head *head; + struct thread *blocked; + int chain; + + chain = umtxq_hash(key); + umtxq_lock(key); + head = &umtxq_chains[chain].uc_queue; + for (uq = LIST_FIRST(head); uq != NULL; uq = next) { + next = LIST_NEXT(uq, uq_next); + if (umtx_key_match(&uq->uq_key, key)) { + blocked = uq->uq_thread; + umtxq_remove(uq); + wakeup(blocked); + } + uq = next; + } + umtxq_unlock(key); +} + +static inline int +umtxq_sleep(struct thread *td, struct umtx_key *key, int priority, + const char *wmesg, int timo) +{ + int error; + int chain = umtxq_hash(key); + + error = msleep(td, umtxq_mtx(chain), priority, wmesg, timo); + return (error); +} + +static int +umtx_key_get(struct thread *td, struct umtx *umtx, struct umtx_key *key) +{ +#if defined(UMTX_DYNAMIC_SHARED) || defined(UMTX_STATIC_SHARED) + vm_map_t map; + vm_map_entry_t entry; + vm_pindex_t pindex; + vm_prot_t prot; + boolean_t wired; + + map = &td->td_proc->p_vmspace->vm_map; + if (vm_map_lookup(&map, (vm_offset_t)umtx, VM_PROT_WRITE, + &entry, &key->info.shared.object, &pindex, &prot, + &wired) != KERN_SUCCESS) { + return EFAULT; + } +#endif + +#if defined(UMTX_DYNAMIC_SHARED) + key->type = UMTX_SHARED; + key->info.shared.offset = entry->offset + entry->start - + (vm_offset_t)umtx; + /* + * Add object reference, if we don't do this, a buggy application + * deallocates the object, the object will be reused by other + * applications, then unlock will wake wrong thread. + */ + vm_object_reference(key->info.shared.object); + vm_map_lookup_done(map, entry); +#elif defined(UMTX_STATIC_SHARED) + if (VM_INHERIT_SHARE == entry->inheritance) { + key->type = UMTX_SHARED; + key->info.shared.offset = entry->offset + entry->start - + (vm_offset_t)umtx; + vm_object_reference(key->info.shared.object); + } else { + key->type = UMTX_PRIVATE; + key->info.private.umtx = umtx; + key->info.private.pid = td->td_proc->p_pid; + } + vm_map_lookup_done(map, entry); +#else + key->type = UMTX_PRIVATE; + key->info.private.umtx = umtx; + key->info.private.pid = td->td_proc->p_pid; +#endif + return (0); +} + +static inline void +umtx_key_release(struct umtx_key *key) +{ + if (key->type == UMTX_SHARED) + vm_object_deallocate(key->info.shared.object); +} + +static inline int +umtxq_queue_me(struct thread *td, struct umtx *umtx, struct umtx_q *uq) +{ + int error; + + if ((error = umtx_key_get(td, umtx, &uq->uq_key)) != 0) + return (error); + + uq->uq_addr = (vm_offset_t)umtx; + uq->uq_thread = td; + umtxq_lock(&uq->uq_key); + umtxq_insert(uq); + umtxq_unlock(&uq->uq_key); + return (0); +} + +#if defined(UMTX_DYNAMIC_SHARED) +static void +fork_handler(void *arg, struct proc *p1, struct proc *p2, int flags) { - struct umtx_q uq; - struct umtx *umtx; vm_map_t map; vm_map_entry_t entry; vm_object_t object; vm_pindex_t pindex; vm_prot_t prot; boolean_t wired; + struct umtx_key key; + LIST_HEAD(, umtx_q) workq; + struct umtx_q *uq; + struct thread *td; + int onq; + + LIST_INIT(&workq); + + /* Collect threads waiting on umtxq */ + PROC_LOCK(p1); + FOREACH_THREAD_IN_PROC(p1, td) { + if (td->td_flags & TDF_UMTXQ) { + uq = td->td_umtxq; + if (uq) + LIST_INSERT_HEAD(&workq, uq, uq_rqnext); + } + } + PROC_UNLOCK(p1); + + LIST_FOREACH(uq, &workq, uq_rqnext) { + map = &p1->p_vmspace->vm_map; + if (vm_map_lookup(&map, uq->uq_addr, VM_PROT_WRITE, + &entry, &object, &pindex, &prot, &wired) != KERN_SUCCESS) { + continue; + } + key.type = UMTX_SHARED; + key.info.shared.object = object; + key.info.shared.offset = entry->offset + entry->start - + uq->uq_addr; + if (umtx_key_match(&key, &uq->uq_key)) { + vm_map_lookup_done(map, entry); + continue; + } + + umtxq_lock(&uq->uq_key); + if (uq->uq_thread->td_flags & TDF_UMTXQ) { + umtxq_remove(uq); + onq = 1; + } else + onq = 0; + umtxq_unlock(&uq->uq_key); + if (onq) { + vm_object_deallocate(uq->uq_key.info.shared.object); + uq->uq_key = key; + umtxq_lock(&uq->uq_key); + umtxq_insert(uq); + umtxq_unlock(&uq->uq_key); + vm_object_reference(uq->uq_key.info.shared.object); + } + vm_map_lookup_done(map, entry); + } +} +#endif + +static int +_do_lock(struct thread *td, struct umtx *umtx, long id, int timo) +{ + struct umtx_q uq; intptr_t owner; intptr_t old; - int chain, page_off; int error = 0; /* - * Care must be exercised when dealing with this structure. It + * Care must be exercised when dealing with umtx structure. It * can fault on any access. */ - umtx = uap->umtx; - page_off = ((unsigned long)umtx) % PAGE_SIZE; - /* Must not on page boundary. */ - if (page_off + sizeof(void *) > PAGE_SIZE) - return (EINVAL); - for (;;) { /* * Try the uncontested case. This should be done in userland. */ owner = casuptr((intptr_t *)&umtx->u_owner, - UMTX_UNOWNED, td->td_tid); + UMTX_UNOWNED, id); /* The acquire succeeded. */ if (owner == UMTX_UNOWNED) @@ -257,7 +444,7 @@ /* If no one owns it but it is contested try to acquire it. */ if (owner == UMTX_CONTESTED) { owner = casuptr((intptr_t *)&umtx->u_owner, - UMTX_CONTESTED, td->td_tid | UMTX_CONTESTED); + UMTX_CONTESTED, id | UMTX_CONTESTED); if (owner == UMTX_CONTESTED) return (0); @@ -274,26 +461,9 @@ * If we caught a signal, we have retried and now * exit immediately. */ - if (error) + if (error || (error = umtxq_queue_me(td, umtx, &uq)) != 0) return (error); - map = &td->td_proc->p_vmspace->vm_map; - if (vm_map_lookup(&map, (vm_offset_t)umtx, VM_PROT_WRITE, - &entry, &object, &pindex, &prot, &wired) != KERN_SUCCESS) { - vm_map_lookup_done(map, entry); - return EFAULT; - } - vm_object_reference(object); - uq.uq_key.uk_object = object; - uq.uq_key.uk_offset = entry->offset + entry->start - - (vm_offset_t)umtx; - uq.uq_thread = td; - chain = umtxq_hash(&uq.uq_key); - umtxq_lock(chain); - umtxq_insert(chain, &uq); - umtxq_unlock(chain); - vm_map_lookup_done(map, entry); - /* * Set the contested bit so that a release in user space * knows to use the system call for unlock. If this fails @@ -305,10 +475,10 @@ /* The address was invalid. */ if (old == -1) { - umtxq_lock(chain); + umtxq_lock(&uq.uq_key); umtxq_remove(&uq); - umtxq_unlock(chain); - vm_object_deallocate(uq.uq_key.uk_object); + umtxq_unlock(&uq.uq_key); + umtx_key_release(&uq.uq_key); return (EFAULT); } @@ -317,45 +487,67 @@ * and we need to retry or we lost a race to the thread * unlocking the umtx. */ - umtxq_lock(chain); + umtxq_lock(&uq.uq_key); if (old == owner && (td->td_flags & TDF_UMTXQ)) { - error = msleep(td, umtxq_mtx(chain), + error = umtxq_sleep(td, &uq.uq_key, td->td_priority | PCATCH | PDROP, - "umtx", 0); + "umtx", timo); if (td->td_flags & TDF_UMTXQ) { - umtxq_lock(chain); + umtxq_lock(&uq.uq_key); umtxq_remove(&uq); - umtxq_unlock(chain); + umtxq_unlock(&uq.uq_key); } } else { + umtxq_remove(&uq); + umtxq_unlock(&uq.uq_key); error = 0; - umtxq_remove(&uq); - umtxq_unlock(chain); } - vm_object_deallocate(uq.uq_key.uk_object); + umtx_key_release(&uq.uq_key); } return (0); } -int -_umtx_unlock(struct thread *td, struct _umtx_unlock_args *uap) - /* struct umtx *umtx */ +static int +do_lock(struct thread *td, struct umtx *umtx, long id, + struct timespec *abstime) +{ + struct timespec ts1, ts2; + struct timeval tv; + int timo, error; + + if (abstime == NULL) { + error = _do_lock(td, umtx, id, 0); + } else { + for (;;) { + ts1 = *abstime; + getnanotime(&ts2); + timespecsub(&ts1, &ts2); + TIMESPEC_TO_TIMEVAL(&tv, &ts1); + if (tv.tv_sec < 0) { + error = EWOULDBLOCK; + break; + } + timo = tvtohz(&tv); + error = _do_lock(td, umtx, id, timo); + if (error != EWOULDBLOCK) { + if (error == ERESTART) + error = EINTR; + break; + } + } + } + return (error); +} + +static int +do_unlock(struct thread *td, struct umtx *umtx, long id) { - struct umtx_q uq; - struct umtx *umtx; - vm_map_t map; - vm_map_entry_t entry; - vm_object_t object; - vm_pindex_t pindex; - vm_prot_t prot; - boolean_t wired; + struct umtx_key key; intptr_t owner; intptr_t old; - int count; + int count, error; - umtx = uap->umtx; - /* * Make sure we own this mtx. * @@ -365,7 +557,7 @@ if ((owner = fuword(&umtx->u_owner)) == -1) return (EFAULT); - if ((owner & ~UMTX_CONTESTED) != td->td_tid) + if ((owner & ~UMTX_CONTESTED) != id) return (EPERM); /* We should only ever be in here for contested locks */ @@ -383,16 +575,8 @@ if (old != owner) return (EINVAL); - map = &td->td_proc->p_vmspace->vm_map; - if (vm_map_lookup(&map, (vm_offset_t)umtx, VM_PROT_WRITE, - &entry, &object, &pindex, &prot, &wired) != KERN_SUCCESS) { - vm_map_lookup_done(map, entry); - return EFAULT; - } - vm_object_reference(object); - uq.uq_key.uk_object = object; - uq.uq_key.uk_offset = entry->offset + entry->start - (vm_offset_t)umtx; - vm_map_lookup_done(map, entry); + if ((error = umtx_key_get(td, umtx, &key)) != 0) + return (error); /* * At the point, a new thread can lock the umtx before we @@ -400,9 +584,9 @@ * are two or more threads on wait queue, we should set * contensted bit for them. */ - count = umtxq_count(&uq.uq_key); + count = umtxq_count(&key); if (count <= 0) { - vm_object_deallocate(object); + umtx_key_release(&key); return (0); } @@ -419,7 +603,7 @@ if (old == owner) break; if (old == -1) { - vm_object_deallocate(object); + umtx_key_release(&key); return (EFAULT); } owner = old; @@ -430,14 +614,187 @@ * the umtx. */ if ((owner & ~UMTX_CONTESTED) != 0) { - vm_object_deallocate(object); + umtx_key_release(&key); return (0); } } /* Wake blocked thread. */ - umtxq_signal(&uq.uq_key); - vm_object_deallocate(object); + umtxq_signal(&key); + umtx_key_release(&key); + + return (0); +} + +static int +do_unlock_and_wait(struct thread *td, struct umtx *umtx, long id, void *uaddr, + struct timespec *abstime) +{ + struct umtx_q uq; + intptr_t owner; + intptr_t old; + struct timespec ts1, ts2; + struct timeval tv; + int timo, error = 0; + + if (umtx == uaddr) + return (EINVAL); + + /* + * Make sure we own this mtx. + * + * XXX Need a {fu,su}ptr this is not correct on arch where + * sizeof(intptr_t) != sizeof(long). + */ + if ((owner = fuword(&umtx->u_owner)) == -1) + return (EFAULT); + + if ((owner & ~UMTX_CONTESTED) != id) + return (EPERM); + + if ((error = umtxq_queue_me(td, uaddr, &uq)) != 0) + return (error); + + old = casuptr((intptr_t *)&umtx->u_owner, id, UMTX_UNOWNED); + if (old == -1) { + umtxq_lock(&uq.uq_key); + umtxq_remove(&uq); + umtxq_unlock(&uq.uq_key); + umtx_key_release(&uq.uq_key); + return (EFAULT); + } + if (old != id) { + error = do_unlock(td, umtx, id); + if (error) { + umtxq_lock(&uq.uq_key); + umtxq_remove(&uq); + umtxq_unlock(&uq.uq_key); + umtx_key_release(&uq.uq_key); + return (error); + } + } + if (abstime == NULL) { + umtxq_lock(&uq.uq_key); + if (td->td_flags & TDF_UMTXQ) + error = umtxq_sleep(td, &uq.uq_key, + td->td_priority | PCATCH, "ucond", 0); + umtxq_remove(&uq); + umtxq_unlock(&uq.uq_key); + if (error == ERESTART) + error = EINTR; + } else { + for (;;) { + ts1 = *abstime; + getnanotime(&ts2); + timespecsub(&ts1, &ts2); + TIMESPEC_TO_TIMEVAL(&tv, &ts1); + if (tv.tv_sec < 0) { + error = EWOULDBLOCK; + break; + } + timo = tvtohz(&tv); + umtxq_lock(&uq.uq_key); + if (td->td_flags & TDF_UMTXQ) { + error = umtxq_sleep(td, &uq.uq_key, + td->td_priority | PCATCH | PDROP, + "ucond", timo); + if (!(td->td_flags & TDF_UMTXQ)) { + error = 0; + break; + } + if (error != 0 && error != EWOULDBLOCK) { + if (error == ERESTART) + error = EINTR; + break; + } + } else { + umtxq_unlock(&uq.uq_key); + error = 0; + break; + } + } + if (td->td_flags & TDF_UMTXQ) { + umtxq_lock(&uq.uq_key); + umtxq_remove(&uq); + umtxq_unlock(&uq.uq_key); + } + } + umtx_key_release(&uq.uq_key); + return (error); +} +static int +do_wake(struct thread *td, void *uaddr, int broadcast) +{ + struct umtx_key key; + int error; + + if ((error = umtx_key_get(td, uaddr, &key)) != 0) + return (error); + if (!broadcast) + umtxq_signal(&key); + else + umtxq_broadcast(&key); + umtx_key_release(&key); return (0); } + +int +_umtx_lock(struct thread *td, struct _umtx_lock_args *uap) + /* struct umtx *umtx */ +{ + return _do_lock(td, uap->umtx, td->td_tid, 0); +} + +int +_umtx_unlock(struct thread *td, struct _umtx_unlock_args *uap) + /* struct umtx *umtx */ +{ + return do_unlock(td, uap->umtx, td->td_tid); +} + +int +_umtx_op(struct thread *td, struct _umtx_op_args *uap) +{ + struct timespec abstime; + struct timespec *ts; + int error; + + switch(uap->op) { + case UMTX_OP_LOCK: + /* Allow a null timespec (wait forever). */ + if (uap->abstime == NULL) + ts = NULL; + else { + error = copyin(uap->abstime, &abstime, sizeof(abstime)); + if (error != 0) + return (error); + if (abstime.tv_nsec >= 1000000000 || + abstime.tv_nsec < 0) + return (EINVAL); + ts = &abstime; + } + return do_lock(td, uap->umtx, uap->id, ts); + case UMTX_OP_UNLOCK: + return do_unlock(td, uap->umtx, uap->id); + case UMTX_OP_UNLOCK_AND_WAIT: + /* Allow a null timespec (wait forever). */ + if (uap->abstime == NULL) + ts = NULL; + else { + error = copyin(uap->abstime, &abstime, sizeof(abstime)); + if (error != 0) + return (error); + if (abstime.tv_nsec >= 1000000000 || + abstime.tv_nsec < 0) + return (EINVAL); + ts = &abstime; + } + return do_unlock_and_wait(td, uap->umtx, uap->id, + uap->uaddr, ts); + case UMTX_OP_WAKE: + return do_wake(td, uap->uaddr, uap->id); + default: + return (EINVAL); + } +} ==== //depot/projects/davidxu_thread/src/sys/sys/proc.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.412 2004/11/20 02:32:50 das Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.414 2004/12/18 12:52:44 davidxu Exp $ */ #ifndef _SYS_PROC_H_ @@ -281,9 +281,8 @@ sigset_t td_oldsigmask; /* (k) Saved mask from pre sigpause. */ sigset_t td_sigmask; /* (c) Current signal mask. */ sigset_t td_siglist; /* (c) Sigs arrived, not delivered. */ - sigset_t td_sigproc; /* (c) Signals targets proc. */ sigset_t *td_waitset; /* (c) Wait set for sigwait. */ - TAILQ_ENTRY(thread) td_umtx; /* (c?) Link for when we're blocked. */ + struct umtx_q *td_umtxq; /* (c?) Link for when we're blocked. */ volatile u_int td_generation; /* (k) For detection of preemption */ stack_t td_sigstk; /* (k) Stack ptr and on-stack flag. */ int td_kflags; /* (c) Flags for KSE threading. */ @@ -346,7 +345,7 @@ #define TDF_NEEDRESCHED 0x00010000 /* Thread needs to yield. */ #define TDF_NEEDSIGCHK 0x00020000 /* Thread may need signal delivery. */ #define TDF_XSIG 0x00040000 /* Thread is exchanging signal under trace */ -#define TDF_UMTXQ 0x00080000 /* Libthr thread is on a umtx. */ +#define TDF_UMTXQ 0x00080000 /* Thread is sleeping on a umtx. */ #define TDF_THRWAKEUP 0x00100000 /* Libthr thread must not suspend itself. */ #define TDF_DBSUSPEND 0x00200000 /* Thread is suspended by debugger */ #define TDF_UNUSED22 0x00400000 /* --available -- */ @@ -466,13 +465,11 @@ TAILQ_ENTRY(ksegrp) kg_ksegrp; /* (*) Queue of KSEGs in kg_proc. */ TAILQ_HEAD(, thread) kg_threads;/* (td_kglist) All threads. */ TAILQ_HEAD(, thread) kg_runq; /* (td_runq) waiting RUNNABLE threads */ - TAILQ_HEAD(, thread) kg_slpq; /* (td_runq) NONRUNNABLE threads. */ TAILQ_HEAD(, kse_upcall) kg_upcalls; /* All upcalls in the group. */ #define kg_startzero kg_estcpu u_int kg_estcpu; /* (j) Sum of the same field in KSEs. */ u_int kg_slptime; /* (j) How long completely blocked. */ - int kg_runnable; /* (j) Num runnable threads on queue. */ int kg_numupcalls; /* (j) Num upcalls. */ int kg_upsleeps; /* (c) Num threads in kse_release(). */ struct kse_thr_mailbox *kg_completed; /* (c) Completed thread mboxes. */ From owner-p4-projects@FreeBSD.ORG Sun Dec 19 02:01:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6320816A4D2; Sun, 19 Dec 2004 02:01:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A18316A4EB for ; Sun, 19 Dec 2004 02:01:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F71243D3F for ; Sun, 19 Dec 2004 02:01:20 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBJ21KgM005938 for ; Sun, 19 Dec 2004 02:01:20 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBJ21JJj005934 for perforce@freebsd.org; Sun, 19 Dec 2004 02:01:19 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 19 Dec 2004 02:01:19 GMT Message-Id: <200412190201.iBJ21JJj005934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 67325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2004 02:01:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=67325 Change 67325 by davidxu@davidxu_tiger on 2004/12/19 02:01:14 IPC Affected files ... .. //depot/projects/davidxu_thread/src/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/Makefile.inc1#4 integrate .. //depot/projects/davidxu_thread/src/UPDATING#3 integrate .. //depot/projects/davidxu_thread/src/UPDATING.64BTT#2 delete .. //depot/projects/davidxu_thread/src/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/davidxu_thread/src/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/jail#3 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/named#2 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/ppp-user#2 integrate .. //depot/projects/davidxu_thread/src/etc/rc.shutdown#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/davidxu_thread/src/installworld_newk#2 delete .. //depot/projects/davidxu_thread/src/installworld_oldk#2 delete .. //depot/projects/davidxu_thread/src/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/pthread.map#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/sys/thr_error.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_cancel.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_clean.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_concurrency.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_cond.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_create.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_fork.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_init.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_mutex.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_once.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_sem.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthread/Makefile#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/sys/lock.h#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libutil/_secure_path.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/bsdsrc/b_tgamma.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/bsdsrc/mathimpl.h#2 integrate .. //depot/projects/davidxu_thread/src/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/davidxu_thread/src/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/davidxu_thread/src/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/davidxu_thread/src/rescue/rescue/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mknod/mknod.8#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/etc/make.conf#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/ppp/ppp.conf.isdn#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/ppp/ppp.conf.sample#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/ppp/ppp.conf.span-isp#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/ppp/ppp.conf.span-isp.working#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/aac.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/acpi.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/altq.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ath.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/atkbd.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/bge.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/divert.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/firewire.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/fwe.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/fwip.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/fwohci.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/man4.sparc64/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/man4.sparc64/snd_audiocs.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/mpt.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/netgraph.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ng_bt3c.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/polling.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/pst.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/smp.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/snd_maestro.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/snd_maestro3.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ti.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/txp.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ubser.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/umass.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/vpo.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man5/make.conf.5#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man7/hier.7#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man7/ports.7#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man7/release.7#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/kernel_mount.9#1 branch .. //depot/projects/davidxu_thread/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/davidxu_thread/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.amd64#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.i386#4 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.pc98#3 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpi_support/acpi_toshiba.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_sysctl.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ida/ida.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ida/idavar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/kbd/atkbdreg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mse/mse_cbus.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/mse/mse_isa.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/mse/msevar.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/twe/twe.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/twe/tweio.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/urio.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/gnu/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/isa/mse.c#2 delete .. //depot/projects/davidxu_thread/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_subr.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/modules/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/acpi/acpi_ibm/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/mse/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/net/bpf.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_sppp.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/pc98/mse.c#2 delete .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/bio.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/filedesc.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/mouse.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/param.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/syscall.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/umtx.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_fault.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_meter.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/davidxu_thread/src/tools/tools/kttcp/kttcp.c#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/kttcp/sys/kttcp.c#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/Customize/comconsole#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.music#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/arch.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/compat.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/cond.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/dir.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/dir.h#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/for.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/job.c#4 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.h#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstConcat.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstDestroy.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstDupl.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstInit.c#3 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/main.c#4 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/make.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/make.h#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/nonints.h#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/parse.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/str.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/suff.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/targ.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/var.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/rev/rev.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/burncd/burncd.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/config/config.8#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/lpr/lpd/printjob.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/command.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/lcp.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/lcp.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/lqr.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/ppp.8.m4#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pppctl/pppctl.c#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.311 2004/12/07 14:41:16 harti Exp $ +# $FreeBSD: src/Makefile,v 1.313 2004/12/16 19:55:57 ru Exp $ # # The user-driven targets are: # @@ -86,9 +86,9 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= /usr/bin/env -i \ - PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ - -f /dev/null -V MAKEOBJDIRPREFIX dummy +_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ (in /etc/make.conf) or command-line variable. ==== //depot/projects/davidxu_thread/src/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.459 2004/12/01 23:23:14 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.460 2004/12/17 10:11:33 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -27,7 +27,7 @@ # The intended user-driven targets are: # buildworld - rebuild *everything*, including glue to help do upgrades # installworld- install everything built by "buildworld" -# update - convenient way to update your source tree (eg: sup/cvs) +# update - convenient way to update your source tree (eg: cvsup/cvs) # # Standard targets (not defined here) are documented in the makefiles in # /usr/share/mk. These include: @@ -739,7 +739,7 @@ # # update # -# Update the source tree, by running sup and/or running cvs to update to the +# Update the source tree, by running cvsup and/or running cvs to update to the # latest copy. # update: @@ -765,7 +765,7 @@ .endif .if defined(CVS_UPDATE) @echo "--------------------------------------------------------------" - @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT} + @echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS} .endif ==== //depot/projects/davidxu_thread/src/UPDATING#3 (text+ko) ==== @@ -23,6 +23,13 @@ developers choose to disable these features on build machines to maximize performance. +20041213: + The behaviour of ppp(8) has changed slightly. If lqr is enabled + (``enable lqr''), older versions would revert to LCP ECHO mode on + negotiation failure. Now, ``enable echo'' is required for this + behaviour. The ppp version number has been bumped to 3.4.2 to + reflect the change. + 20041201: The wlan support has been updated to split the crypto support into separate modules. For static WEP you must configure the @@ -1977,4 +1984,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.382 2004/12/12 07:22:16 obrien Exp $ +$FreeBSD: src/UPDATING,v 1.383 2004/12/13 17:52:10 brian Exp $ ==== //depot/projects/davidxu_thread/src/contrib/groff/tmac/doc-common#2 (text+ko) ==== ==== //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#4 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.233 2004/12/01 22:05:50 rees Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.235 2004/12/15 12:39:28 brian Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -146,6 +146,7 @@ # User ppp configuration. ppp_enable="NO" # Start user-ppp (or NO). +ppp_program="/usr/sbin/ppp" # Path to user-ppp program. ppp_mode="auto" # Choice of "auto", "ddial", "direct" or "dedicated". # For details see man page for ppp(8). Default is auto. ppp_nat="YES" # Use PPP's internal network address translation or NO. @@ -493,7 +494,8 @@ #jail_example_rootdir="/usr/jail/default" # Jail's root directory #jail_example_hostname="default.domain.com" # Jail's hostname #jail_example_ip="192.168.0.10" # Jail's IP number -#jail_example_exec="/bin/sh /etc/rc" # command to execute in jail +#jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting +#jail_example_exec_stop="/bin/sh /etc/rc.shutdown" # command to execute in jail for stopping #jail_example_devfs_enable="NO" # mount devfs in the jail #jail_example_fdescfs_enable="NO" # mount fdescfs in the jail #jail_example_procfs_enable="NO" # mount procfs in jail ==== //depot/projects/davidxu_thread/src/etc/mtree/BSD.include.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.93 2004/09/27 08:18:43 dougb Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.94 2004/12/15 13:58:28 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -54,8 +54,6 @@ .. .. fs - autofs - .. devfs .. fdescfs ==== //depot/projects/davidxu_thread/src/etc/rc.d/jail#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.19 2004/11/24 10:44:39 mux Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.20 2004/12/14 14:36:35 rse Exp $ # # PROVIDE: jail @@ -34,7 +34,21 @@ eval jail_hostname=\"\$jail_${_j}_hostname\" eval jail_ip=\"\$jail_${_j}_ip\" eval jail_exec=\"\$jail_${_j}_exec\" - [ -z "${jail_exec}" ] && jail_exec="/bin/sh /etc/rc" + eval jail_exec_start=\"\$jail_${_j}_exec_start\" + eval jail_exec_stop=\"\$jail_${_j}_exec_stop\" + if [ -n "${jail_exec}" ]; then + # simple/backward-compatible execution + jail_exec_start="${jail_exec}" + jail_exec_stop="" + else + # flexible execution + if [ -z "${jail_exec_start}" ]; then + jail_exec_start="/bin/sh /etc/rc" + if [ -z "${jail_exec_stop}" ]; then + jail_exec_stop="/bin/sh /etc/rc.shutdown" + fi + fi + fi # The default jail ruleset will be used by rc.subr if none is specified. eval jail_ruleset=\"\$jail_${_j}_devfs_ruleset\" @@ -65,6 +79,8 @@ debug "$_j procdir: $jail_procdir" debug "$_j ruleset: $jail_ruleset" debug "$_j fstab: $jail_fstab" + debug "$_j exec start: $jail_exec_start" + debug "$_j exec stop: $jail_exec_stop" } # set_sysctl rc_knob mib msg @@ -177,8 +193,8 @@ fi fi _tmp_jail=${_tmp_dir}/jail.$$ - jail -i ${jail_rootdir} ${jail_hostname} \ - ${jail_ip} ${jail_exec} > ${_tmp_jail} 2>&1 + eval jail -l -U root -i ${jail_rootdir} ${jail_hostname} \ + ${jail_ip} ${jail_exec_start} > ${_tmp_jail} 2>&1 [ "$?" -eq 0 ] && echo -n " $jail_hostname" _jail_id=$(head -1 ${_tmp_jail}) tail +2 ${_tmp_jail} >${jail_rootdir}/var/log/console.log @@ -198,7 +214,13 @@ _jail_id=$(cat /var/run/jail_${_jail}.id) if [ ! -z "${_jail_id}" ]; then init_variables $_jail + if [ -n "${jail_exec_stop}" ]; then + eval env -i /usr/sbin/jexec ${_jail_id} ${jail_exec_stop} \ + >> ${jail_rootdir}/var/log/console.log 2>&1 + fi killall -j ${_jail_id} -TERM > /dev/null 2>&1 + sleep 1 + killall -j ${_jail_id} -KILL > /dev/null 2>&1 jail_umount_fs echo -n " $jail_hostname" fi ==== //depot/projects/davidxu_thread/src/etc/rc.d/named#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/named,v 1.16 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.17 2004/12/18 15:19:36 phk Exp $ # # PROVIDE: named @@ -48,6 +48,10 @@ else ln -s ${named_chrootdir}/etc/namedb /etc/namedb fi + else + # Make sure it points to the right place. + ln -sf ${named_chrootdir}/etc/namedb /etc/namedb + fi # Mount a devfs in the chroot directory if needed ==== //depot/projects/davidxu_thread/src/etc/rc.d/ppp-user#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp-user,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ppp-user,v 1.7 2004/12/15 12:39:28 brian Exp $ # # PROVIDE: ppp-user @@ -10,11 +10,11 @@ . /etc/rc.subr name="ppp" -rcvar="ppp_enable" -start_cmd="ppp_start" -stop_cmd=":" +rcvar=`set_rcvar` +start_precmd="ppp_precmd" +start_postcmd="ppp_postcmd" -ppp_start() +ppp_precmd() { # Establish ppp mode. # @@ -24,21 +24,21 @@ ppp_mode="auto" fi - ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}" + rc_flags="$rc_flags -quiet -${ppp_mode}" # Switch on NAT mode? # case ${ppp_nat} in [Yy][Ee][Ss]) - ppp_command="${ppp_command} -nat" + rc_flags="$rc_flags -nat" ;; esac - ppp_command="${ppp_command} ${ppp_profile}" + rc_flags="$rc_flags ${ppp_profile}" +} - echo "Starting ppp as \"${ppp_user}\"" - su -m ${ppp_user} -c "exec ${ppp_command}" - +ppp_postcmd() +{ # Re-Sync ipfilter so it picks up any new network interfaces # /etc/rc.d/ipfilter resync ==== //depot/projects/davidxu_thread/src/etc/rc.shutdown#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/etc/rc.shutdown,v 1.29 2004/10/17 13:39:42 schweikh Exp $ +# $FreeBSD: src/etc/rc.shutdown,v 1.30 2004/12/14 14:36:35 rse Exp $ # # Site-specific closing actions for daemons run by init on shutdown, @@ -80,7 +80,9 @@ # Determine the shutdown order of the /etc/rc.d scripts, # and perform the operation # -files=`rcorder -k shutdown /etc/rc.d/* 2>/dev/null` +rcorder_opts="-k shutdown" +[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && rcorder_opts="$rcorder_opts -s nojail" +files=`rcorder ${rcorder_opts} /etc/rc.d/* 2>/dev/null` for _rc_elem in `reverse_list $files`; do debug "run_rc_script $_rc_elem faststop" ==== //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/tmac/mdoc.local#2 (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.42 2004/08/19 10:41:54 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.44 2004/12/18 07:20:33 ru Exp $ .\" .\" %beginstrip% . @@ -60,9 +60,9 @@ .ds doc-default-operating-system FreeBSD\~6.0 . .\" FreeBSD releases not found in doc-common -.\" .ds doc-operating-system-FreeBSD-4.11 4.11 -.\" .ds doc-operating-system-FreeBSD-5.4 5.4 -.\" .ds doc-operating-system-FreeBSD-6.0 6.0 +.ds doc-operating-system-FreeBSD-4.11 4.11 +.ds doc-operating-system-FreeBSD-5.4 5.4 +.ds doc-operating-system-FreeBSD-6.0 6.0 . .ec . ==== //depot/projects/davidxu_thread/src/lib/libc/gen/sigsetops.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigsetops.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.8 2003/06/24 15:27:31 yar Exp $ +.\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.9 2004/12/16 20:27:55 maxim Exp $ .\" -.Dd June 4, 1993 +.Dd December 16, 2004 .Dt SIGSETOPS 3 .Os .Sh NAME @@ -92,21 +92,24 @@ function returns whether a specified signal .Fa signo is contained in the signal set. -.Pp -These functions -are provided as macros in the include file . -Actual functions are available -if their names are undefined (with -.Ic #undef Ar name ) . .Sh RETURN VALUES The .Fn sigismember function returns 1 if the signal is a member of the set, 0 otherwise. -The other functions return 0. +The other functions return 0 upon success. +A \-1 return value +indicates an error occurred and the global variable +.Va errno +is set to indicate the reason. .Sh ERRORS -Currently no errors are detected. +These functions could fail if one of the following occurs: +.Bl -tag -width Er +.It Bq Er EINVAL +.Fa signo +has an invalid value. +.El .Sh SEE ALSO .Xr kill 2 , .Xr sigaction 2 , ==== //depot/projects/davidxu_thread/src/lib/libpthread/pthread.map#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.13 2004/09/26 06:50:14 deischen Exp $ +# $FreeBSD: src/lib/libpthread/pthread.map,v 1.14 2004/12/18 18:07:36 deischen Exp $ LIBTHREAD_1_0 { global: ___creat; @@ -14,6 +14,7 @@ __poll; __pthread_cond_timedwait; __pthread_cond_wait; + __pthread_mutex_init; __pthread_mutex_lock; __pthread_mutex_trylock; __pthread_mutex_timedlock; ==== //depot/projects/davidxu_thread/src/lib/libpthread/sys/thr_error.c#2 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/sys/thr_error.c,v 1.7 2003/04/23 21:46:50 deischen Exp $ + * $FreeBSD: src/lib/libpthread/sys/thr_error.c,v 1.8 2004/12/18 18:07:37 deischen Exp $ */ #include #include "libc_private.h" #include "thr_private.h" +#undef errno extern int errno; int * ==== //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_cancel.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.31 2003/12/09 02:20:56 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.32 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -14,18 +14,26 @@ static inline int checkcancel(struct pthread *curthread) { - if (((curthread->cancelflags & PTHREAD_CANCEL_DISABLE) == 0) && - ((curthread->cancelflags & THR_CANCELLING) != 0)) { + if ((curthread->cancelflags & THR_CANCELLING) != 0) { /* * It is possible for this thread to be swapped out * while performing cancellation; do not allow it * to be cancelled again. */ - curthread->cancelflags &= ~THR_CANCELLING; - return (1); + if ((curthread->flags & THR_FLAGS_EXITING) != 0) { + /* + * This may happen once, but after this, it + * shouldn't happen again. + */ + curthread->cancelflags &= ~THR_CANCELLING; + return (0); + } + if ((curthread->cancelflags & PTHREAD_CANCEL_DISABLE) == 0) { + curthread->cancelflags &= ~THR_CANCELLING; + return (1); + } } - else - return (0); + return (0); } static inline void ==== //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_clean.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_clean.c,v 1.8 2003/04/18 05:04:15 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_clean.c,v 1.9 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -50,6 +50,7 @@ malloc(sizeof(struct pthread_cleanup))) != NULL) { new->routine = routine; new->routine_arg = routine_arg; + new->onstack = 0; new->next = curthread->cleanup; curthread->cleanup = new; @@ -67,6 +68,7 @@ if (execute) { old->routine(old->routine_arg); } - free(old); + if (old->onstack == 0) + free(old); } } ==== //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_concurrency.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/lib/libpthread/thread/thr_concurrency.c,v 1.8 2004/03/14 05:24:27 bde Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.9 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -84,6 +84,13 @@ int i; int ret; + /* + * Turn on threaded mode, if failed, it is unnecessary to + * do further work. + */ + if (_kse_isthreaded() == 0 && _kse_setthreaded(1)) + return (EAGAIN); + ret = 0; curthread = _get_curthread(); /* Race condition, but so what. */ ==== //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_cond.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.51 2003/12/09 02:20:56 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.52 2004/12/18 18:07:37 deischen Exp $ */ #include #include @@ -47,6 +47,9 @@ static inline struct pthread *cond_queue_deq(pthread_cond_t); static inline void cond_queue_remove(pthread_cond_t, pthread_t); static inline void cond_queue_enq(pthread_cond_t, pthread_t); +static void cond_wait_backout(void *); +static inline void check_continuation(struct pthread *, + struct pthread_cond *, pthread_mutex_t *); /* * Double underscore versions are cancellation points. Single underscore @@ -171,8 +174,7 @@ struct pthread *curthread = _get_curthread(); int rval = 0; int done = 0; - int interrupted = 0; - int unlock_mutex = 1; + int mutex_locked = 1; int seqno; if (cond == NULL) @@ -198,10 +200,11 @@ * and backed out of the waiting queue prior to executing the * signal handler. */ + + /* Lock the condition variable structure: */ + THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); + seqno = (*cond)->c_seqno; do { - /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); - /* * If the condvar was statically allocated, properly * initialize the tail queue. @@ -217,9 +220,6 @@ case COND_TYPE_FAST: if ((mutex == NULL) || (((*cond)->c_mutex != NULL) && ((*cond)->c_mutex != *mutex))) { - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - /* Return invalid argument error: */ rval = EINVAL; } else { @@ -233,15 +233,11 @@ */ cond_queue_enq(*cond, curthread); - /* Remember the mutex and sequence number: */ - (*cond)->c_mutex = *mutex; - seqno = (*cond)->c_seqno; - /* Wait forever: */ curthread->wakeup_time.tv_sec = -1; /* Unlock the mutex: */ - if ((unlock_mutex != 0) && + if (mutex_locked && ((rval = _mutex_cv_unlock(mutex)) != 0)) { /* * Cannot unlock the mutex, so remove @@ -249,22 +245,18 @@ * variable queue: */ cond_queue_remove(*cond, curthread); - - /* Check for no more waiters: */ - if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) - (*cond)->c_mutex = NULL; - - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); } else { + /* Remember the mutex: */ + (*cond)->c_mutex = *mutex; + /* * Don't unlock the mutex the next * time through the loop (if the * thread has to be requeued after * handling a signal). */ - unlock_mutex = 0; + mutex_locked = 0; /* * This thread is active and is in a @@ -277,6 +269,7 @@ /* Remember the CV: */ curthread->data.cond = *cond; + curthread->sigbackout = cond_wait_backout; THR_SCHED_UNLOCK(curthread, curthread); /* Unlock the CV structure: */ @@ -286,8 +279,6 @@ /* Schedule the next thread: */ _thr_sched_switch(curthread); - curthread->data.cond = NULL; - /* * XXX - This really isn't a good check * since there can be more than one @@ -299,60 +290,61 @@ * should be sent "as soon as possible". */ done = (seqno != (*cond)->c_seqno); - - if (THR_IN_SYNCQ(curthread)) { + if (done && !THR_IN_CONDQ(curthread)) { /* - * Lock the condition variable - * while removing the thread. + * The thread is dequeued, so + * it is safe to clear these. */ - THR_LOCK_ACQUIRE(curthread, - &(*cond)->c_lock); + curthread->data.cond = NULL; + curthread->sigbackout = NULL; + check_continuation(curthread, + NULL, mutex); + return (_mutex_cv_lock(mutex)); + } + + /* Relock the CV structure: */ + THR_LOCK_ACQUIRE(curthread, + &(*cond)->c_lock); + + /* + * Clear these after taking the lock to + * prevent a race condition where a + * signal can arrive before dequeueing + * the thread. + */ + curthread->data.cond = NULL; + curthread->sigbackout = NULL; + done = (seqno != (*cond)->c_seqno); + if (THR_IN_CONDQ(curthread)) { cond_queue_remove(*cond, curthread); /* Check for no more waiters: */ if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) (*cond)->c_mutex = NULL; - - THR_LOCK_RELEASE(curthread, - &(*cond)->c_lock); } - - /* - * Save the interrupted flag; locking - * the mutex may destroy it. - */ - interrupted = curthread->interrupted; - - /* - * Note that even though this thread may - * have been canceled, POSIX requires - * that the mutex be reaquired prior to - * cancellation. - */ - if (done || interrupted) { - rval = _mutex_cv_lock(mutex); - unlock_mutex = 1; - } } } break; /* Trap invalid condition variable types: */ default: - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - /* Return an invalid argument error: */ rval = EINVAL; break; } - if ((interrupted != 0) && (curthread->continuation != NULL)) - curthread->continuation((void *) curthread); + check_continuation(curthread, *cond, + mutex_locked ? NULL : mutex); } while ((done == 0) && (rval == 0)); + /* Unlock the condition variable structure: */ + THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); + + if (mutex_locked == 0) + _mutex_cv_lock(mutex); + /* Return the completion status: */ return (rval); } @@ -378,8 +370,7 @@ struct pthread *curthread = _get_curthread(); int rval = 0; int done = 0; - int interrupted = 0; - int unlock_mutex = 1; + int mutex_locked = 1; int seqno; THR_ASSERT(curthread->locklevel == 0, @@ -407,10 +398,11 @@ * and backed out of the waiting queue prior to executing the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 19 08:12:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EBE516A4D0; Sun, 19 Dec 2004 08:12:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C092616A4CE for ; Sun, 19 Dec 2004 08:12:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7945C43D1D for ; Sun, 19 Dec 2004 08:12:07 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBJ8C7SU025870 for ; Sun, 19 Dec 2004 08:12:07 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBJ8C7BI025867 for perforce@freebsd.org; Sun, 19 Dec 2004 08:12:07 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 19 Dec 2004 08:12:07 GMT Message-Id: <200412190812.iBJ8C7BI025867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 67346 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2004 08:12:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=67346 Change 67346 by davidxu@davidxu_tiger on 2004/12/19 08:11:50 simplify some mutex locking code, this causes performance of super-smack test to be increased about 15%. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/Makefile#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/sys/lock.h#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/Makefile#5 (text+ko) ==== ==== //depot/projects/davidxu_thread/src/lib/libthread/sys/lock.h#4 (text+ko) ==== ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#4 (text+ko) ==== @@ -88,28 +88,14 @@ /* Child process */ errsave = errno; - /* clear aother thread locked us. */ - _UMTX_REINIT(&curthread->lock); - thr_self(&curthread->tid); + _thr_mutex_reinit(&_thr_atfork_mutex); - /* reinitialize libc spinlocks, this includes __malloc_lock. */ - _thr_spinlock_init(); - - /* - * reinitialize all mutexes the curthread owns, these include - * _thr_fork_mutex. - */ - TAILQ_FOREACH(m, &curthread->mutexq, m_qe) { - _thr_mutex_reinit(curthread, &m); - } /* Reinitialize lib kernel. */ _thr_single_thread(curthread); /* Restore signal mask. */ __sys_sigprocmask(SIG_SETMASK, &oldset, NULL); - _pthread_mutex_unlock(&_thr_atfork_mutex); - /* Run down atfork child handlers. */ TAILQ_FOREACH(af, &_thr_atfork_list, qe) { if (af->child != NULL) ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#4 (text+ko) ==== @@ -124,6 +124,14 @@ void _thr_single_thread(struct pthread *curthread) { + curthread->cancelflags &= ~THR_CANCELLING; + /* clear aother thread locked us. */ + _UMTX_REINIT(&curthread->lock); + thr_self(&curthread->tid); + /* reinitialize libc spinlocks, this includes __malloc_lock. */ + _thr_spinlock_init(); + TAILQ_INIT(&curthread->mutexq); + curthread->priority_mutex_count = 0; _libpthread_init(curthread); #if 0 if (__isthreaded) { ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#4 (text+ko) ==== @@ -74,8 +74,7 @@ /* * Prototypes */ -static long mutex_handoff(struct pthread *, - struct pthread_mutex *); +static long mutex_handoff(struct pthread *, struct pthread_mutex *); static inline int mutex_self_trylock(struct pthread *, pthread_mutex_t); static inline int mutex_self_lock(struct pthread *, pthread_mutex_t); static int mutex_unlock_common(pthread_mutex_t *, int); @@ -134,7 +133,7 @@ /* Check mutex protocol: */ else if (((*mutex_attr)->m_protocol < PTHREAD_PRIO_NONE) || - ((*mutex_attr)->m_protocol > PTHREAD_MUTEX_RECURSIVE)) + ((*mutex_attr)->m_protocol > PTHREAD_PRIO_PROTECT)) /* Return an invalid argument error: */ ret = EINVAL; @@ -203,16 +202,13 @@ } void -_thr_mutex_reinit(struct pthread *curthread, pthread_mutex_t *mutex) +_thr_mutex_reinit(pthread_mutex_t *mutex) { _UMTX_REINIT(&(*mutex)->m_lock); TAILQ_INIT(&(*mutex)->m_queue); - if (curthread == NULL || - (*mutex)->m_owner != curthread) { - MUTEX_INIT_LINK(*mutex); - (*mutex)->m_owner = NULL; - (*mutex)->m_count = 0; - } + MUTEX_INIT_LINK(*mutex); + (*mutex)->m_owner = NULL; + (*mutex)->m_count = 0; (*mutex)->m_refcount = 0; (*mutex)->m_prio = 0; (*mutex)->m_saved_prio = 0; @@ -221,16 +217,12 @@ int _pthread_mutex_destroy(pthread_mutex_t *mutex) { - struct pthread *curthread = _get_curthread(); pthread_mutex_t m; int ret = 0; if (mutex == NULL || *mutex == NULL) ret = EINVAL; else { - /* Lock the mutex structure: */ - THR_LOCK_ACQUIRE(curthread, &(*mutex)->m_lock); - /* * Check to see if this mutex is in use: */ @@ -238,9 +230,6 @@ (TAILQ_FIRST(&(*mutex)->m_queue) != NULL) || ((*mutex)->m_refcount != 0)) { ret = EBUSY; - - /* Unlock the mutex structure: */ - THR_LOCK_RELEASE(curthread, &(*mutex)->m_lock); } else { /* * Save a pointer to the mutex so it can be free'd @@ -249,9 +238,6 @@ m = *mutex; *mutex = NULL; - /* Unlock the mutex structure: */ - THR_LOCK_RELEASE(curthread, &m->m_lock); - /* * Free the memory allocated for the mutex * structure: @@ -307,6 +293,28 @@ THR_ASSERT((mutex != NULL) && (*mutex != NULL), "Uninitialized mutex in pthread_mutex_trylock_basic"); + if ((*mutex)->m_protocol == PTHREAD_PRIO_NONE) { + ret = umtx_trylock(&(*mutex)->m_lock, curthread->tid); + if (ret == 0) { + (*mutex)->m_owner = curthread; + /* + * XXX there should be a separated list for owned mutex, + * separated it from priority mutex list + */ +#if 0 + /* Add to the list of owned mutexes: */ + MUTEX_ASSERT_NOT_OWNED(*mutex); + TAILQ_INSERT_TAIL(&curthread->mutexq, + (*mutex), m_qe); +#endif + } else if ((*mutex)->m_owner == curthread) + ret = mutex_self_trylock(curthread, *mutex); + else + ret = EBUSY; + + return (ret); + } + /* Lock the mutex structure: */ THR_LOCK_ACQUIRE(curthread, &(*mutex)->m_lock); @@ -322,24 +330,6 @@ /* Process according to mutex type: */ switch ((*mutex)->m_protocol) { - /* Default POSIX mutex: */ - case PTHREAD_PRIO_NONE: - /* Check if this mutex is not locked: */ - if ((*mutex)->m_owner == NULL) { - /* Lock the mutex for the running thread: */ - (*mutex)->m_owner = curthread; - - /* Add to the list of owned mutexes: */ - MUTEX_ASSERT_NOT_OWNED(*mutex); - TAILQ_INSERT_TAIL(&curthread->mutexq, - (*mutex), m_qe); - } else if ((*mutex)->m_owner == curthread) - ret = mutex_self_trylock(curthread, *mutex); - else - /* Return a busy error: */ - ret = EBUSY; - break; - /* POSIX priority inheritence mutex: */ case PTHREAD_PRIO_INHERIT: /* Check if this mutex is not locked: */ @@ -472,6 +462,47 @@ THR_ASSERT((m != NULL) && (*m != NULL), "Uninitialized mutex in mutex_lock_common"); + if ((*m)->m_protocol == PTHREAD_PRIO_NONE) { + /* Default POSIX mutex: */ + ret = umtx_trylock(&(*m)->m_lock, curthread->tid); + if (ret == 0) { + (*m)->m_owner = curthread; + /* + * XXX there should be a separated list for owned mutex, + * separated it from priority mutex list + */ +#if 0 + /* Add to the list of owned mutexes: */ + MUTEX_ASSERT_NOT_OWNED(*m); + TAILQ_INSERT_TAIL(&curthread->mutexq, + (*m), m_qe); +#endif + } else if ((*m)->m_owner == curthread && + !((*m)->m_type == PTHREAD_MUTEX_NORMAL && + abstime != NULL)) { + ret = mutex_self_lock(curthread, *m); + } else { + if (abstime != NULL) { + ret = umtx_timedlock(&(*m)->m_lock, curthread->tid, + (struct timespec *)abstime); + if (ret == EAGAIN || ret == EINTR) + ret = ETIMEDOUT; + } else { + ret = _UMTX_LOCK(&(*m)->m_lock, curthread->tid); + } + if (ret == 0) { + (*m)->m_owner = curthread; +#if 0 + /* Add to the list of owned mutexes: */ + MUTEX_ASSERT_NOT_OWNED(*m); + TAILQ_INSERT_TAIL(&curthread->mutexq, + (*m), m_qe); +#endif + } + } + return (ret); + } + if (abstime != NULL && (abstime->tv_sec < 0 || abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)) return (EINVAL); @@ -505,68 +536,6 @@ /* Process according to mutex type: */ switch ((*m)->m_protocol) { - /* Default POSIX mutex: */ - case PTHREAD_PRIO_NONE: - if ((*m)->m_owner == NULL) { - /* Lock the mutex for this thread: */ - (*m)->m_owner = curthread; - - /* Add to the list of owned mutexes: */ - MUTEX_ASSERT_NOT_OWNED(*m); - TAILQ_INSERT_TAIL(&curthread->mutexq, - (*m), m_qe); - - /* Unlock the mutex structure: */ - THR_LOCK_RELEASE(curthread, &(*m)->m_lock); - } else if ((*m)->m_owner == curthread) { - ret = mutex_self_lock(curthread, *m); - - /* Unlock the mutex structure: */ - THR_LOCK_RELEASE(curthread, &(*m)->m_lock); - } else { - /* Set the wakeup time: */ - if (abstime) { - curthread->wakeup_time.tv_sec = - abstime->tv_sec; - curthread->wakeup_time.tv_nsec = - abstime->tv_nsec; - } - - /* - * Join the queue of threads waiting to lock - * the mutex and save a pointer to the mutex. - */ - mutex_queue_enq(*m, curthread); - curthread->data.mutex = *m; - curthread->sigbackout = mutex_lock_backout; - /* - * This thread is active and is in a critical - * region (holding the mutex lock); we should - * be able to safely set the state. - */ - THR_LOCK_SWITCH(curthread); - THR_SET_STATE(curthread, PS_MUTEX_WAIT); - - /* Unlock the mutex structure: */ - THR_LOCK_RELEASE(curthread, &(*m)->m_lock); - - /* Schedule the next thread: */ - _thr_sched_switch_unlocked(curthread); - - if (THR_IN_MUTEXQ(curthread)) { - THR_LOCK_ACQUIRE(curthread, &(*m)->m_lock); - mutex_queue_remove(*m, curthread); - THR_LOCK_RELEASE(curthread, &(*m)->m_lock); - } - /* - * Only clear these after assuring the - * thread is dequeued. - */ - curthread->data.mutex = NULL; - curthread->sigbackout = NULL; - } - break; - /* POSIX priority inheritence mutex: */ case PTHREAD_PRIO_INHERIT: /* Check if this mutex is not locked: */ @@ -907,11 +876,8 @@ int ret; curthread = _get_curthread(); - if ((ret = _pthread_mutex_lock(m)) == 0) { - THR_LOCK_ACQUIRE(curthread, &(*m)->m_lock); + if ((ret = _pthread_mutex_lock(m)) == 0) (*m)->m_refcount--; - THR_LOCK_RELEASE(curthread, &(*m)->m_lock); - } return (ret); } @@ -994,13 +960,7 @@ if (m == NULL || *m == NULL) ret = EINVAL; else { - /* Lock the mutex structure: */ - THR_LOCK_ACQUIRE(curthread, &(*m)->m_lock); - - /* Process according to mutex type: */ - switch ((*m)->m_protocol) { - /* Default POSIX mutex: */ - case PTHREAD_PRIO_NONE: + if ((*m)->m_protocol == PTHREAD_PRIO_NONE) { /* * Check if the running thread is not the owner of the * mutex: @@ -1008,30 +968,48 @@ if ((*m)->m_owner != curthread) ret = EPERM; else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) && - ((*m)->m_count > 0)) + ((*m)->m_count > 0)) { /* Decrement the count: */ (*m)->m_count--; - else { + if (add_reference) + (*m)->m_refcount++; + } else { /* * Clear the count in case this is a recursive * mutex. */ (*m)->m_count = 0; - + (*m)->m_owner = NULL; + /* + * XXX there should be a separated list + * for owned mutex, separated it from + * priority mutex list + */ +#if 0 /* Remove the mutex from the threads queue. */ MUTEX_ASSERT_IS_OWNED(*m); TAILQ_REMOVE(&(*m)->m_owner->mutexq, (*m), m_qe); MUTEX_INIT_LINK(*m); - +#endif + if (add_reference) + (*m)->m_refcount++; /* * Hand off the mutex to the next waiting * thread: */ - tid = mutex_handoff(curthread, *m); + ret = umtx_unlock(&(*m)->m_lock, + curthread->tid); + /* XXX decrease refcount if failed ? */ } - break; + return (ret); + } + + /* Lock the mutex structure: */ + THR_LOCK_ACQUIRE(curthread, &(*m)->m_lock); + /* Process according to mutex type: */ + switch ((*m)->m_protocol) { /* POSIX priority inheritence mutex: */ case PTHREAD_PRIO_INHERIT: /* ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#6 (text+ko) ==== @@ -776,7 +776,7 @@ struct pthread *_thr_alloc(struct pthread *); void _thr_exit(char *, int, char *); void _thr_exit_cleanup(void); -void _thr_mutex_reinit(struct pthread *, pthread_mutex_t *); +void _thr_mutex_reinit(pthread_mutex_t *); int _thr_ref_add(struct pthread *, struct pthread *, int); void _thr_ref_delete(struct pthread *, struct pthread *); void _thr_rtld_init(void); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#3 (text+ko) ==== @@ -129,9 +129,9 @@ int i; if (initialized != 0) { - _thr_mutex_reinit(_get_curthread(), &spinlock_static_lock); + _thr_mutex_reinit(&spinlock_static_lock); for (i = 0; i < spinlock_count; i++) - _thr_mutex_reinit(_get_curthread(), &extra[i].lock); + _thr_mutex_reinit(&extra[i].lock); } else { if (pthread_mutex_init(&spinlock_static_lock, NULL)) PANIC("Cannot initialize spinlock_static_lock"); From owner-p4-projects@FreeBSD.ORG Mon Dec 20 06:16:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2E0B16A4D0; Mon, 20 Dec 2004 06:16:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9087716A4CE for ; Mon, 20 Dec 2004 06:16:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CCD143D39 for ; Mon, 20 Dec 2004 06:16:48 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBK6Gmq9013283 for ; Mon, 20 Dec 2004 06:16:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBK6Gmk8013280 for perforce@freebsd.org; Mon, 20 Dec 2004 06:16:48 GMT (envelope-from sam@freebsd.org) Date: Mon, 20 Dec 2004 06:16:48 GMT Message-Id: <200412200616.iBK6Gmk8013280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Dec 2004 06:16:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=67376 Change 67376 by sam@sam_ebb on 2004/12/20 06:16:12 Fix special status reporting. Prior to the reorg there was special-purpose code to display status for an interface for state that was not address-oriented. This status reporting was merged in to the address-oriented status reporting but did not work for link address reporting (as discovered with fwip interfaces). Correct this mis-merge and eliminate the bogus kludge that was used for link-level address reporting. o add an af_other_status method for an address family for reporting status of things like media, vlan, etc. o call the af_other_status methods after reporting address status for an interface o special-case link address status; when reporting all status for an interface invoke it specially prior to reporting af_other_status methods (since it requires the sockaddr_dl that is passed in to status separately from the rtmsg address state) o correct the calling convention for link address status; don't cast types, construct the proper parameter This fixes ifconfig on fwip interfaces. Affected files ... .. //depot/projects/wifi/sbin/ifconfig/Makefile#4 edit .. //depot/projects/wifi/sbin/ifconfig/af_link.c#3 edit .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#8 edit .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#7 edit .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#32 edit .. //depot/projects/wifi/sbin/ifconfig/ifmac.c#6 edit .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#6 edit .. //depot/projects/wifi/sbin/ifconfig/ifvlan.c#6 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/Makefile#4 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_link.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include /* for RTX_IFA */ #include #include @@ -53,9 +54,10 @@ static void link_status(int s __unused, const struct rt_addrinfo *info) { - const struct sockaddr_dl *sdl = (const struct sockaddr_dl *)info; + const struct sockaddr_dl *sdl = + (const struct sockaddr_dl *) info->rti_info[RTAX_IFA]; - if (sdl->sdl_alen > 0) { + if (sdl != NULL && sdl->sdl_alen > 0) { if (sdl->sdl_type == IFT_ETHER && sdl->sdl_alen == ETHER_ADDR_LEN) printf("\tether %s\n", ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#8 (text+ko) ==== @@ -102,7 +102,7 @@ static struct afswtch *af_getbyname(const char *name); static struct afswtch *af_getbyfamily(int af); -static void af_all_status(int, const struct rt_addrinfo *sdl); +static void af_other_status(int); static struct option *opts = NULL; @@ -391,18 +391,18 @@ } static void -af_all_status(int s, const struct rt_addrinfo *sdl) +af_other_status(int s) { struct afswtch *afp; uint8_t afmask[howmany(AF_MAX, NBBY)]; memset(afmask, 0, sizeof(afmask)); for (afp = afs; afp != NULL; afp = afp->af_next) { - if (afp->af_status == NULL) + if (afp->af_other_status == NULL) continue; if (afp->af_af != AF_UNSPEC && isset(afmask, afp->af_af)) continue; - afp->af_status(s, sdl); + afp->af_other_status(s); setbit(afmask, afp->af_af); } } @@ -876,10 +876,25 @@ addrcount--; ifam = (struct ifa_msghdr *)((char *)ifam + ifam->ifam_msglen); } + if (allfamilies || afp->af_af == AF_LINK) { + const struct afswtch *lafp; + + /* + * Hack; the link level address is received separately + * from the routing information so any address is not + * handled above. Cobble together an entry and invoke + * the status method specially. + */ + lafp = af_getbyname("lladdr"); + if (lafp != NULL) { + info.rti_info[RTAX_IFA] = (struct sockaddr *)sdl; + lafp->af_status(s, &info); + } + } if (allfamilies) - af_all_status(s, (const struct rt_addrinfo *) sdl); - else if (afp->af_status != NULL) - afp->af_status(s, (const struct rt_addrinfo *) sdl); + af_other_status(s); + else if (afp->af_other_status != NULL) + afp->af_other_status(s); strncpy(ifs.ifs_name, name, sizeof ifs.ifs_name); if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.h#7 (text+ko) ==== @@ -85,8 +85,17 @@ struct afswtch { const char *af_name; /* as given on cmd line, e.g. "inet" */ short af_af; /* AF_* */ - /* print status method */ + /* + * Status is handled one of two ways; if there is an + * address associated with the interface then the + * associated address family af_status method is invoked + * with the appropriate addressin info. Otherwise, if + * all possible info is to be displayed and af_other_status + * is defined then it is invoked after all address status + * is presented. + */ void (*af_status)(int, const struct rt_addrinfo *); + void (*af_other_status)(int); /* parse address method */ void (*af_getaddr)(const char *, int); /* parse prefix method (IPv6) */ ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#32 (text+ko) ==== @@ -1271,7 +1271,7 @@ } static void -ieee80211_status(int s, const struct rt_addrinfo *info __unused) +ieee80211_status(int s) { static const uint8_t zerobssid[IEEE80211_ADDR_LEN]; enum ieee80211_opmode opmode = get80211opmode(s); @@ -1780,7 +1780,7 @@ static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", .af_af = AF_UNSPEC, - .af_status = ieee80211_status, + .af_other_status = ieee80211_status, }; static __constructor void ==== //depot/projects/wifi/sbin/ifconfig/ifmac.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ #include "ifconfig.h" static void -maclabel_status(int s, const struct rt_addrinfo *info) +maclabel_status(int s) { struct ifreq ifr; mac_t label; @@ -105,7 +105,7 @@ static struct afswtch af_mac = { .af_name = "af_maclabel", .af_af = AF_UNSPEC, - .af_status = maclabel_status, + .af_other_status = maclabel_status, }; static __constructor void ==== //depot/projects/wifi/sbin/ifconfig/ifmedia.c#6 (text+ko) ==== @@ -103,7 +103,7 @@ struct ifmedia_type_to_subtype *ttos); static void -media_status(int s, const struct rt_addrinfo *info __unused) +media_status(int s) { struct ifmediareq ifmr; int *media_list, i; @@ -787,7 +787,7 @@ static struct afswtch af_media = { .af_name = "af_media", .af_af = AF_UNSPEC, - .af_status = media_status, + .af_other_status = media_status, }; static __constructor void ==== //depot/projects/wifi/sbin/ifconfig/ifvlan.c#6 (text+ko) ==== @@ -62,7 +62,7 @@ static int __have_tag = 0; static void -vlan_status(int s, const struct rt_addrinfo *info __unused) +vlan_status(int s) { struct vlanreq vreq; @@ -157,7 +157,7 @@ static struct afswtch af_vlan = { .af_name = "af_vlan", .af_af = AF_UNSPEC, - .af_status = vlan_status, + .af_other_status = vlan_status, }; static __constructor void From owner-p4-projects@FreeBSD.ORG Mon Dec 20 06:18:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8830916A4D0; Mon, 20 Dec 2004 06:18:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49F3C16A4CE for ; Mon, 20 Dec 2004 06:18:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37DB943D39 for ; Mon, 20 Dec 2004 06:18:51 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBK6Ip3A013313 for ; Mon, 20 Dec 2004 06:18:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBK6IpGJ013310 for perforce@freebsd.org; Mon, 20 Dec 2004 06:18:51 GMT (envelope-from sam@freebsd.org) Date: Mon, 20 Dec 2004 06:18:51 GMT Message-Id: <200412200618.iBK6IpGJ013310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Dec 2004 06:18:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=67377 Change 67377 by sam@sam_ebb on 2004/12/20 06:17:50 o add deftxkey pseudonym for weptxkey to be consistent with what is displayed by status o recognize "undef" or "-" to mean set the default tx key to be undefined Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#33 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#33 (text+ko) ==== @@ -265,10 +265,19 @@ set80211(s, IEEE80211_IOC_WEP, d, 0, NULL); } +static int +isundefarg(const char *arg) +{ + return (strcmp(arg, "-") == 0 || strncasecmp(arg, "undef", 5) == 0); +} + static void set80211weptxkey(const char *val, int d, int s, const struct afswtch *rafp) { - set80211(s, IEEE80211_IOC_WEPTXKEY, atoi(val)-1, 0, NULL); + if (isundefarg(val)) + set80211(s, IEEE80211_IOC_WEPTXKEY, IEEE80211_KEYIX_NONE, 0, NULL); + else + set80211(s, IEEE80211_IOC_WEPTXKEY, atoi(val)-1, 0, NULL); } static void @@ -1733,6 +1742,7 @@ DEF_CMD_ARG("wepmode", set80211wepmode), DEF_CMD("wep", 1, set80211wep), DEF_CMD("-wep", 0, set80211wep), + DEF_CMD_ARG("deftxkey", set80211weptxkey), DEF_CMD_ARG("weptxkey", set80211weptxkey), DEF_CMD_ARG("wepkey", set80211wepkey), DEF_CMD_ARG("nwkey", set80211nwkey), /* NetBSD */ From owner-p4-projects@FreeBSD.ORG Mon Dec 20 13:49:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51EAF16A4D0; Mon, 20 Dec 2004 13:49:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 110CD16A4CE for ; Mon, 20 Dec 2004 13:49:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8523143D45 for ; Mon, 20 Dec 2004 13:49:01 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBKDn1Cf043505 for ; Mon, 20 Dec 2004 13:49:01 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBKDn1KW043502 for perforce@freebsd.org; Mon, 20 Dec 2004 13:49:01 GMT (envelope-from areisse@nailabs.com) Date: Mon, 20 Dec 2004 13:49:01 GMT Message-Id: <200412201349.iBKDn1KW043502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Dec 2004 13:49:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=67395 Change 67395 by areisse@areisse_tislabs on 2004/12/20 13:48:26 Merge file contexts with selinux policy from version 2004081908. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/acct.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/amanda.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/amavis.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/anaconda.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apache.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apmd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/asterisk.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/atd.fc#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/audio-entropyd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/auditd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/authbind.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/automount.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/backup.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/bluetooth.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/bootloader.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/calamaris.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/canna.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cardmgr.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/checkpolicy.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/chkpwd.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/chroot.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ciped.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/clamav.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/consoletype.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/courier.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cpucontrol.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cpuspeed.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crack.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crond.fc#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crontab.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cups.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cyrus.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dbusd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ddt-client.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/devfsd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dhcpd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dictd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/distcc.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dmesg.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dnsmasq.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dovecot.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dpkg.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fingerd.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/firstboot.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fs_daemon.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fsadm.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ftpd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/games.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gatekeeper.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/getty.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gnome-pty-helper.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gpg-agent.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gpg.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gpm.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/groupadd.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/hald.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/hostname.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/hotplug.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/howl.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/hwclock.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/i18n_input.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ifconfig.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/imazesrv.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/inetd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/init.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/initrc.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/innd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ipchains.fc#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ipsec.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/iptables.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/irc.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ircd.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/irqbalance.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/jabberd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/kcheckpass.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/kerberos.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/klogd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/kudzu.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lcd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ldconfig.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/load_policy.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/loadkeys.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/login.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/logrotate.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lpd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lpr.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lrrd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lvm.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mailman.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mdadm.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/modutil.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/monopd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mount.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mozilla.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mrtg.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mta.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mysqld.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nagios.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/named.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nessusd.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/netsaint.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/netscape.fc#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/netutils.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/newrole.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nrpe.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nscd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nsd.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ntpd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/oav-update.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/openca-ca.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/openca-common.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/openvpn.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pam.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pamconsole.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/perdition.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ping.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/portmap.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/portslave.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/postfix.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/postgresql.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/postgrey.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pppd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/prelink.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/privoxy.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/procmail.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pump.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pxe.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/qmail.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/quota.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/radius.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/radvd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/restorecon.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rhgb.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rlogind.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rpcd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rpm.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rshd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/samba.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/saslauthd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/scannerdaemon.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/screen.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/screensaver.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sendmail.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/setfiles.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/seuser.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/slapd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/slocate.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/slrnpull.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/snmpd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/snort.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sound-server.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sound.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/spamassassin.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/spamc.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/spamd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/speedmgmt.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/squid.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ssh-agent.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ssh.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/su.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sudo.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sulogin.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sxid.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/syslogd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sysstat.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tcpd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tftpd.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tinydns.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tmpreaper.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/traceroute.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/transproxy.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/udev.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/uml.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/uml_net.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/unconfined.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/updfstab.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/uptimed.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/usbmodules.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/useradd.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/userhelper.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/usernetctl.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/utempter.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/uwimapd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/vmware.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/watchdog.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/webalizer.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xauth.fc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xdm.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xfs.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xprint.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xserver.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ypbind.fc#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ypserv.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/zebra.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/types.fc#4 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/acct.fc#4 (text+ko) ==== @@ -1,4 +1,5 @@ # berkeley process accounting -/usr/sbin/accton system_u:object_r:acct_exec_t +/sbin/accton -- system_u:object_r:acct_exec_t +/usr/sbin/accton -- system_u:object_r:acct_exec_t /var/account(/.*)? system_u:object_r:acct_data_t -/etc/cron\.(daily|monthly)/acct system_u:object_r:acct_exec_t +/etc/cron\.(daily|monthly)/acct -- system_u:object_r:acct_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/amanda.fc#2 (text+ko) ==== @@ -1,71 +1,71 @@ # # Author: Carsten Grohmann # -# $Id: amanda.fc,v 1.1.1.1 2002/06/06 14:15:19 carsten Exp $ +# $Id: amanda.fc,v 1.3 2004/03/03 20:55:53 sds Exp $ # # amanda -/etc/amanda(/.*)? system_u:object_r:amanda_config_t -/etc/amanda/.*/tapelist(/.*)? system_u:object_r:amanda_data_t -/etc/amandates system_u:object_r:amanda_amandates_t +/etc/amanda(/.*)? system_u:object_r:amanda_config_t +/etc/amanda/.*/tapelist(/.*)? system_u:object_r:amanda_data_t +/etc/amandates system_u:object_r:amanda_amandates_t /etc/dumpdates system_u:object_r:amanda_dumpdates_t -/root/restore system_u:object_r:amanda_recover_dir_t -/tmp/amanda(/.*)? system_u:object_r:amanda_tmp_t -/usr/lib/amanda system_u:object_r:amanda_usr_lib_t -/usr/lib/amanda/amandad system_u:object_r:amanda_inetd_exec_t -/usr/lib/amanda/amcat\.awk system_u:object_r:amanda_script_exec_t -/usr/lib/amanda/amcleanupdisk system_u:object_r:amanda_exec_t -/usr/lib/amanda/amidxtaped system_u:object_r:amanda_inetd_exec_t -/usr/lib/amanda/amindexd system_u:object_r:amanda_inetd_exec_t -/usr/lib/amanda/amlogroll system_u:object_r:amanda_exec_t -/usr/lib/amanda/amplot\.awk system_u:object_r:amanda_script_exec_t -/usr/lib/amanda/amplot\.g system_u:object_r:amanda_script_exec_t -/usr/lib/amanda/amplot\.gp system_u:object_r:amanda_script_exec_t -/usr/lib/amanda/amtrmidx system_u:object_r:amanda_exec_t -/usr/lib/amanda/amtrmlog system_u:object_r:amanda_exec_t -/usr/lib/amanda/calcsize system_u:object_r:amanda_exec_t -/usr/lib/amanda/chg-chio system_u:object_r:amanda_exec_t -/usr/lib/amanda/chg-chs system_u:object_r:amanda_exec_t -/usr/lib/amanda/chg-manual system_u:object_r:amanda_exec_t -/usr/lib/amanda/chg-mtx system_u:object_r:amanda_exec_t -/usr/lib/amanda/chg-multi system_u:object_r:amanda_exec_t -/usr/lib/amanda/chg-rth system_u:object_r:amanda_exec_t -/usr/lib/amanda/chg-scsi system_u:object_r:amanda_exec_t -/usr/lib/amanda/chg-zd-mtx system_u:object_r:amanda_exec_t -/usr/lib/amanda/driver system_u:object_r:amanda_exec_t -/usr/lib/amanda/dumper system_u:object_r:amanda_exec_t -/usr/lib/amanda/killpgrp system_u:object_r:amanda_exec_t -/usr/lib/amanda/patch-system system_u:object_r:amanda_exec_t -/usr/lib/amanda/planner system_u:object_r:amanda_exec_t -/usr/lib/amanda/rundump system_u:object_r:amanda_exec_t -/usr/lib/amanda/runtar system_u:object_r:amanda_exec_t -/usr/lib/amanda/selfcheck system_u:object_r:amanda_exec_t -/usr/lib/amanda/sendbackup system_u:object_r:amanda_exec_t -/usr/lib/amanda/sendsize system_u:object_r:amanda_exec_t -/usr/lib/amanda/taper system_u:object_r:amanda_exec_t -/usr/lib/amanda/versionsuffix system_u:object_r:amanda_exec_t -/usr/sbin/amadmin system_u:object_r:amanda_user_exec_t -/usr/sbin/amcheck system_u:object_r:amanda_user_exec_t -/usr/sbin/amcheckdb system_u:object_r:amanda_user_exec_t -/usr/sbin/amcleanup system_u:object_r:amanda_user_exec_t -/usr/sbin/amdump system_u:object_r:amanda_user_exec_t -/usr/sbin/amflush system_u:object_r:amanda_user_exec_t -/usr/sbin/amgetconf system_u:object_r:amanda_user_exec_t -/usr/sbin/amlabel system_u:object_r:amanda_user_exec_t -/usr/sbin/amoverview system_u:object_r:amanda_user_exec_t -/usr/sbin/amplot system_u:object_r:amanda_user_exec_t -/usr/sbin/amrecover system_u:object_r:amanda_recover_exec_t -/usr/sbin/amreport system_u:object_r:amanda_user_exec_t -/usr/sbin/amrestore system_u:object_r:amanda_user_exec_t -/usr/sbin/amrmtape system_u:object_r:amanda_user_exec_t -/usr/sbin/amstatus system_u:object_r:amanda_user_exec_t -/usr/sbin/amtape system_u:object_r:amanda_user_exec_t -/usr/sbin/amtoc system_u:object_r:amanda_user_exec_t -/usr/sbin/amverify system_u:object_r:amanda_user_exec_t -/var/lib/amanda system_u:object_r:amanda_var_lib_t -/var/lib/amanda/\.amandahosts system_u:object_r:amanda_config_t -/var/lib/amanda/\.bashrc system_u:object_r:amanda_shellconfig_t -/var/lib/amanda/\.profile system_u:object_r:amanda_shellconfig_t -/var/lib/amanda/disklist system_u:object_r:amanda_data_t +/root/restore -d system_u:object_r:amanda_recover_dir_t +/tmp/amanda(/.*)? system_u:object_r:amanda_tmp_t +/usr/lib(64)?/amanda -d system_u:object_r:amanda_usr_lib_t +/usr/lib(64)?/amanda/amandad -- system_u:object_r:amanda_inetd_exec_t +/usr/lib(64)?/amanda/amcat\.awk -- system_u:object_r:amanda_script_exec_t +/usr/lib(64)?/amanda/amcleanupdisk -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/amidxtaped -- system_u:object_r:amanda_inetd_exec_t +/usr/lib(64)?/amanda/amindexd -- system_u:object_r:amanda_inetd_exec_t +/usr/lib(64)?/amanda/amlogroll -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/amplot\.awk -- system_u:object_r:amanda_script_exec_t +/usr/lib(64)?/amanda/amplot\.g -- system_u:object_r:amanda_script_exec_t +/usr/lib(64)?/amanda/amplot\.gp -- system_u:object_r:amanda_script_exec_t +/usr/lib(64)?/amanda/amtrmidx -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/amtrmlog -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/calcsize -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/chg-chio -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/chg-chs -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/chg-manual -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/chg-mtx -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/chg-multi -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/chg-rth -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/chg-scsi -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/chg-zd-mtx -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/driver -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/dumper -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/killpgrp -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/patch-system -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/planner -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/rundump -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/runtar -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/selfcheck -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/sendbackup -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/sendsize -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/taper -- system_u:object_r:amanda_exec_t +/usr/lib(64)?/amanda/versionsuffix -- system_u:object_r:amanda_exec_t +/usr/sbin/amadmin -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amcheck -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amcheckdb -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amcleanup -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amdump -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amflush -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amgetconf -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amlabel -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amoverview -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amplot -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amrecover -- system_u:object_r:amanda_recover_exec_t +/usr/sbin/amreport -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amrestore -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amrmtape -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amstatus -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amtape -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amtoc -- system_u:object_r:amanda_user_exec_t +/usr/sbin/amverify -- system_u:object_r:amanda_user_exec_t +/var/lib/amanda -d system_u:object_r:amanda_var_lib_t +/var/lib/amanda/\.amandahosts -- system_u:object_r:amanda_config_t +/var/lib/amanda/\.bashrc -- system_u:object_r:amanda_shellconfig_t +/var/lib/amanda/\.profile -- system_u:object_r:amanda_shellconfig_t +/var/lib/amanda/disklist -- system_u:object_r:amanda_data_t /var/lib/amanda/gnutar-lists(/.*)? system_u:object_r:amanda_gnutarlists_t /var/lib/amanda/index system_u:object_r:amanda_data_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/amavis.fc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # amavis -/usr/sbin/amavisd system_u:object_r:amavisd_exec_t -/etc/amavisd.conf system_u:object_r:amavisd_etc_t -/var/log/amavisd.log system_u:object_r:amavisd_log_t +/usr/sbin/amavisd.* -- system_u:object_r:amavisd_exec_t +/etc/amavisd\.conf -- system_u:object_r:amavisd_etc_t +/var/log/amavisd\.log -- system_u:object_r:amavisd_log_t /var/lib/amavis(/.*)? system_u:object_r:amavisd_lib_t /var/run/amavis(/.*)? system_u:object_r:amavisd_var_run_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apache.fc#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apmd.fc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # apmd -/usr/sbin/apmd system_u:object_r:apmd_exec_t -/usr/sbin/acpid system_u:object_r:apmd_exec_t -/usr/bin/apm system_u:object_r:apm_exec_t -/var/run/apmd\.pid system_u:object_r:apmd_var_run_t -/var/run/.acpid.socket system_u:object_r:apmd_var_run_t -/var/log/acpid system_u:object_r:apmd_log_t +/usr/sbin/apmd -- system_u:object_r:apmd_exec_t +/usr/sbin/acpid -- system_u:object_r:apmd_exec_t +/usr/bin/apm -- system_u:object_r:apm_exec_t +/var/run/apmd\.pid -- system_u:object_r:apmd_var_run_t +/var/run/.?acpid.socket -s system_u:object_r:apmd_var_run_t +/var/log/acpid -- system_u:object_r:apmd_log_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/authbind.fc#4 (text+ko) ==== @@ -1,3 +1,3 @@ # authbind -/etc/authbind(/.*)? system_u:object_r:etc_authbind_t -/usr/lib/authbind/helper system_u:object_r:authbind_exec_t +/etc/authbind(/.*)? system_u:object_r:authbind_etc_t +/usr/lib(64)?/authbind/helper -- system_u:object_r:authbind_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/automount.fc#4 (text+ko) ==== @@ -1,4 +1,4 @@ # automount -/usr/sbin/automount system_u:object_r:automount_exec_t -/etc/apm/event\.d/autofs system_u:object_r:automount_exec_t +/usr/sbin/automount -- system_u:object_r:automount_exec_t +/etc/apm/event\.d/autofs -- system_u:object_r:automount_exec_t /var/run/autofs(/.*)? system_u:object_r:automount_var_run_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/backup.fc#4 (text+ko) ==== @@ -1,4 +1,6 @@ # backup -#/usr/local/bin/backup-script system_u:object_r:backup_exec_t -#/var/backup system_u:object_r:backup_store_t +# label programs that do backups to other files on disk (IE a cron job that +# calls tar) in backup_exec_t and label the directory for storing them as +# backup_store_t, Debian uses /var/backups +#/usr/local/bin/backup-script -- system_u:object_r:backup_exec_t /var/backups(/.*)? system_u:object_r:backup_store_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/bootloader.fc#4 (text+ko) ==== @@ -1,8 +1,12 @@ # bootloader -/etc/lilo\.conf.* system_u:object_r:etc_bootloader_t -/initrd\.img.* system_u:object_r:boot_t -/sbin/lilo.* system_u:object_r:bootloader_exec_t -/sbin/grub.* system_u:object_r:bootloader_exec_t -/vmlinuz.* system_u:object_r:boot_t -/usr/sbin/mkinitrd system_u:object_r:bootloader_exec_t -/etc/mkinitrd/scripts/.* system_u:object_r:bootloader_exec_t +/etc/lilo\.conf.* -- system_u:object_r:bootloader_etc_t +/initrd\.img.* -l system_u:object_r:boot_t +/sbin/lilo.* -- system_u:object_r:bootloader_exec_t +/sbin/grub.* -- system_u:object_r:bootloader_exec_t +/vmlinuz.* -l system_u:object_r:boot_t +/usr/sbin/mkinitrd -- system_u:object_r:bootloader_exec_t +/sbin/mkinitrd -- system_u:object_r:bootloader_exec_t +/etc/mkinitrd/scripts/.* -- system_u:object_r:bootloader_exec_t +/sbin/ybin.* -- system_u:object_r:bootloader_exec_t +/etc/yaboot\.conf.* -- system_u:object_r:bootloader_etc_t +/boot/grub/menu.lst -- system_u:object_r:boot_runtime_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/calamaris.fc#2 (text+ko) ==== @@ -1,4 +1,4 @@ # squid -/etc/cron\.daily/calamaris system_u:object_r:calamaris_exec_t +/etc/cron\.daily/calamaris -- system_u:object_r:calamaris_exec_t /var/www/calamaris(/.*)? system_u:object_r:calamaris_www_t /var/log/calamaris(/.*)? system_u:object_r:calamaris_log_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cardmgr.fc#4 (text+ko) ==== @@ -1,6 +1,7 @@ # cardmgr -/sbin/cardmgr system_u:object_r:cardmgr_exec_t -/sbin/cardctl system_u:object_r:cardctl_exec_t -/var/run/stab system_u:object_r:cardmgr_var_run_t -/var/run/cardmgr.pid system_u:object_r:cardmgr_var_run_t -/etc/apm/event\.d/pcmcia system_u:object_r:cardmgr_exec_t +/sbin/cardmgr -- system_u:object_r:cardmgr_exec_t +/sbin/cardctl -- system_u:object_r:cardctl_exec_t +/var/run/stab -- system_u:object_r:cardmgr_var_run_t +/var/run/cardmgr.pid -- system_u:object_r:cardmgr_var_run_t +/etc/apm/event\.d/pcmcia -- system_u:object_r:cardmgr_exec_t +/var/lib/pcmcia(/.*)? system_u:object_r:cardmgr_var_run_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/checkpolicy.fc#2 (text+ko) ==== @@ -1,3 +1,5 @@ # checkpolicy -/usr/bin/checkpolicy system_u:object_r:checkpolicy_exec_t +/usr/bin/checkpolicy -- system_u:object_r:checkpolicy_exec_t +/etc/selinux/policy/policy.* -- system_u:object_r:policy_config_t +/etc/selinux/.*/src/policy/policy.* -- system_u:object_r:policy_config_t /sbin/sebsd_checkpolicy system_u:object_r:checkpolicy_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/chkpwd.fc#2 (text+ko) ==== @@ -1,2 +1,3 @@ # chkpwd -/sbin/.*_chkpwd system_u:object_r:chkpwd_exec_t +/sbin/unix_chkpwd -- system_u:object_r:chkpwd_exec_t +/sbin/unix_verify -- system_u:object_r:chkpwd_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/chroot.fc#2 (text+ko) ==== @@ -1,1 +1,1 @@ -/usr/sbin/chroot system_u:object_r:chroot_exec_t +/usr/sbin/chroot -- system_u:object_r:chroot_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/clamav.fc#2 (text+ko) ==== @@ -1,6 +1,12 @@ # clamscan -/usr/bin/clamscan system_u:object_r:clamscan_exec_t -/usr/bin/freshclam system_u:object_r:freshclam_exec_t -/usr/sbin/clamd system_u:object_r:clamd_exec_t +/usr/bin/clamscan -- system_u:object_r:clamscan_exec_t +/usr/bin/freshclam -- system_u:object_r:freshclam_exec_t +/usr/sbin/clamav-freshclam-handledaemon -- system_u:object_r:freshclam_exec_t +/usr/sbin/clamd -- system_u:object_r:clamd_exec_t /var/lib/clamav(/.*)? system_u:object_r:clamav_var_lib_t -/var/log/clam-update.log system_u:object_r:var_log_freshclam_t +/var/log/clam-update.log -- system_u:object_r:freshclam_log_t +/var/log/clamav-freshclam.log.* -- system_u:object_r:freshclam_log_t +/var/run/clamd.ctl -s system_u:object_r:clamd_var_run_t +/var/run/clamd.pid -- system_u:object_r:clamd_var_run_t +/var/log/clamav(/.*)? system_u:object_r:freshclam_log_t +/var/run/clamav(/.*)? system_u:object_r:clamd_var_run_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/courier.fc#4 (text+ko) ==== @@ -1,16 +1,18 @@ # courier pop, imap, and webmail -/usr/lib/courier(/.*)? system_u:object_r:bin_t -/usr/lib/courier/rootcerts(/.*)? system_u:object_r:etc_courier_t -/usr/lib/courier/authlib/.* system_u:object_r:courier_authdaemon_exec_t -/usr/lib/courier/courier/.* system_u:object_r:courier_exec_t -/usr/lib/courier/courier/courierpop.* system_u:object_r:courier_pop_exec_t -/usr/lib/courier/courier/imaplogin system_u:object_r:courier_pop_exec_t -/usr/lib/courier/courier/pcpd system_u:object_r:courier_pcp_exec_t -/usr/lib/courier/imapd system_u:object_r:courier_pop_exec_t -/usr/lib/courier/pop3d system_u:object_r:courier_pop_exec_t -/usr/lib/courier/sqwebmail/cleancache.pl system_u:object_r:sqwebmail_cron_exec_t -/usr/bin/imapd system_u:object_r:courier_pop_exec_t -/usr/sbin/courierlogger system_u:object_r:courier_exec_t -/usr/sbin/couriertcpd system_u:object_r:courier_tcpd_exec_t -/var/run/courier.* system_u:object_r:courier_var_run_t -/etc/courier(/.*)? system_u:object_r:etc_courier_t +/usr/lib(64)?/courier(/.*)? system_u:object_r:bin_t +/usr/lib(64)?/courier/rootcerts(/.*)? system_u:object_r:courier_etc_t +/usr/lib(64)?/courier/authlib/.* -- system_u:object_r:courier_authdaemon_exec_t +/usr/lib(64)?/courier/courier/.* -- system_u:object_r:courier_exec_t +/usr/lib(64)?/courier/courier/courierpop.* -- system_u:object_r:courier_pop_exec_t +/usr/lib(64)?/courier/courier/imaplogin -- system_u:object_r:courier_pop_exec_t +/usr/lib(64)?/courier/courier/pcpd -- system_u:object_r:courier_pcp_exec_t +/usr/lib(64)?/courier/imapd -- system_u:object_r:courier_pop_exec_t +/usr/lib(64)?/courier/pop3d -- system_u:object_r:courier_pop_exec_t +/usr/lib(64)?/courier/sqwebmail/cleancache.pl -- system_u:object_r:sqwebmail_cron_exec_t +/var/lib/courier(/.*)? system_u:object_r:courier_var_lib_t +/usr/bin/imapd -- system_u:object_r:courier_pop_exec_t +/usr/sbin/courierlogger -- system_u:object_r:courier_exec_t +/usr/sbin/courierldapaliasd -- system_u:object_r:courier_exec_t +/usr/sbin/couriertcpd -- system_u:object_r:courier_tcpd_exec_t +/var/run/courier(/.*)? system_u:object_r:courier_var_run_t +/etc/courier(/.*)? system_u:object_r:courier_etc_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crack.fc#4 (text+ko) ==== @@ -1,3 +1,4 @@ # crack - for password checking -/usr/sbin/crack_[a-z]* system_u:object_r:crack_exec_t +/usr/sbin/crack_[a-z]* -- system_u:object_r:crack_exec_t /var/cache/cracklib(/.*)? system_u:object_r:crack_db_t +/usr/lib(64)?/cracklib_dict.* -- system_u:object_r:crack_db_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crond.fc#5 (text+ko) ==== @@ -1,24 +1,32 @@ # crond -/etc/crontab system_u:object_r:system_crond_script_t -/etc/cron\.d(/.*)? system_u:object_r:system_crond_script_t -/usr/sbin/cron(d)? system_u:object_r:crond_exec_t +/etc/crontab -- system_u:object_r:system_cron_spool_t +/etc/cron\.d(/.*)? system_u:object_r:system_cron_spool_t +/usr/sbin/cron(d)? -- system_u:object_r:crond_exec_t /usr/sbin/anacron -- system_u:object_r:anacron_exec_t -/var/spool/cron system_u:object_r:cron_spool_t -/var/spool/cron/crontabs system_u:object_r:cron_spool_t -/var/spool/cron/crontabs/.* system_u:object_r:user_cron_spool_t -/var/spool/cron/crontabs/root system_u:object_r:sysadm_cron_spool_t -/var/log/cron system_u:object_r:cron_log_t -/var/log/mrtg(/.*)? system_u:object_r:cron_log_t -/var/run/crond\.reboot system_u:object_r:crond_var_run_t -/var/run/crond\.pid system_u:object_r:crond_var_run_t +/var/spool/cron -d system_u:object_r:cron_spool_t +/var/spool/cron/crontabs -d system_u:object_r:cron_spool_t +/var/spool/cron/crontabs/.* -- <> +/var/spool/cron/crontabs/root -- system_u:object_r:sysadm_cron_spool_t +/var/spool/cron/root -- system_u:object_r:sysadm_cron_spool_t +/var/spool/cron/[^/]* -- <> +/var/log/cron.* -- system_u:object_r:crond_log_t +/var/run/crond\.reboot -- system_u:object_r:crond_var_run_t +/var/run/crond\.pid -- system_u:object_r:crond_var_run_t # fcron -/usr/sbin/fcron system_u:object_r:crond_exec_t -/var/spool/fcron system_u:object_r:cron_spool_t +/usr/sbin/fcron -- system_u:object_r:crond_exec_t +/var/spool/fcron -d system_u:object_r:cron_spool_t /var/spool/fcron/.* <> -/var/spool/fcron/systab.orig system_u:object_r:sysadm_cron_spool_t -/var/spool/fcron/systab system_u:object_r:sysadm_cron_spool_t -/var/run/fcron\.fifo system_u:object_r:crond_var_run_t -/var/run/fcron\.pid system_u:object_r:crond_var_run_t +/var/spool/fcron/systab.orig -- system_u:object_r:system_cron_spool_t +/var/spool/fcron/systab -- system_u:object_r:system_cron_spool_t +/var/spool/fcron/new.systab -- system_u:object_r:system_cron_spool_t +/var/run/fcron\.fifo -s system_u:object_r:crond_var_run_t +/var/run/fcron\.pid -- system_u:object_r:crond_var_run_t +# atd +/usr/sbin/atd -- system_u:object_r:crond_exec_t +/var/spool/at -d system_u:object_r:cron_spool_t +/var/spool/at/spool -d system_u:object_r:cron_spool_t +/var/spool/at/[^/]* -- <> +/var/run/atd\.pid -- system_u:object_r:crond_var_run_t # FreeBSD /var/cron system_u:object_r:cron_spool_t /var/cron/tabs system_u:object_r:cron_spool_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crontab.fc#4 (text+ko) ==== @@ -1,2 +1,3 @@ # crontab -/usr/bin/(f)?crontab system_u:object_r:crontab_exec_t +/usr/bin/(f)?crontab -- system_u:object_r:crontab_exec_t +/usr/bin/at -- system_u:object_r:crontab_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cups.fc#4 (text+ko) ==== @@ -1,13 +1,33 @@ # cups printing -/etc/cups(/.*)? system_u:object_r:etc_cupsd_t -/etc/cups/client\.conf system_u:object_r:etc_t -/etc/cups/printers.conf.* system_u:object_r:etc_cupsd_rw_t -/etc/cups/ppd/.* system_u:object_r:etc_cupsd_rw_t -/etc/cups/ppds.dat system_u:object_r:etc_cupsd_rw_t -/etc/printcap\.cups system_u:object_r:etc_cupsd_t -/usr/lib/cups/backend/.* system_u:object_r:cupsd_exec_t -/usr/sbin/cupsd system_u:object_r:cupsd_exec_t +/etc/cups(/.*)? system_u:object_r:cupsd_etc_t +/usr/share/cups(/.*)? system_u:object_r:cupsd_etc_t +/etc/alchemist/namespace/printconf/local.adl system_u:object_r:cupsd_rw_etc_t +/var/cache/alchemist/printconf.* system_u:object_r:cupsd_rw_etc_t +/etc/cups/client\.conf -- system_u:object_r:etc_t +/etc/cups/cupsd.conf.* -- system_u:object_r:cupsd_rw_etc_t +/etc/cups/lpoptions -- system_u:object_r:cupsd_rw_etc_t +/etc/cups/printers.conf.* -- system_u:object_r:cupsd_rw_etc_t +/etc/cups/ppd/.* -- system_u:object_r:cupsd_rw_etc_t +/etc/cups/certs -d system_u:object_r:cupsd_rw_etc_t +/etc/cups/certs/.* -- system_u:object_r:cupsd_rw_etc_t +/var/lib/cups/certs -d system_u:object_r:cupsd_rw_etc_t +/var/lib/cups/certs/.* -- system_u:object_r:cupsd_rw_etc_t +/etc/cups/ppds.dat -- system_u:object_r:cupsd_rw_etc_t +/etc/cups/lpoptions.* -- system_u:object_r:cupsd_rw_etc_t +/etc/printcap.* -- system_u:object_r:cupsd_rw_etc_t +/usr/lib(64)?/cups/backend/.* -- system_u:object_r:cupsd_exec_t +/usr/lib(64)?/cups/daemon/.* -- system_u:object_r:cupsd_exec_t +/usr/sbin/cupsd -- system_u:object_r:cupsd_exec_t +/usr/sbin/printconf-backend -- system_u:object_r:cupsd_exec_t /var/log/cups(/.*)? system_u:object_r:cupsd_log_t /var/spool/cups(/.*)? system_u:object_r:print_spool_t -/usr/lib/cups/filter/.* system_u:object_r:bin_t -/usr/lib/cups/cgi-bin/.* system_u:object_r:bin_t +/var/run/cups/printcap -- system_u:object_r:cupsd_var_run_t +/usr/lib(64)?/cups/filter/.* -- system_u:object_r:bin_t +/usr/lib(64)?/cups/cgi-bin/.* -- system_u:object_r:bin_t +/usr/bin/lpr.cups -- system_u:object_r:lpr_exec_t +/usr/bin/lpq.cups -- system_u:object_r:lpr_exec_t +/usr/bin/lprm.cups -- system_u:object_r:lpr_exec_t +/usr/sbin/ptal-printd -- system_u:object_r:ptal_exec_t +/usr/sbin/ptal-mlcd -- system_u:object_r:ptal_exec_t +/var/run/ptal-printd(/.*)? system_u:object_r:ptal_var_run_t +/var/run/ptal-mlcd(/.*)? system_u:object_r:ptal_var_run_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ddt-client.fc#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# slapd - ldap server -/usr/sbin/ddtcd system_u:object_r:ddt_client_exec_t -/var/run/ddtcd\.pid system_u:object_r:ddt_client_var_run_t -/etc/ddtcd\.conf system_u:object_r:etc_ddt_client_t +# ddt - Dynamic DNS client +/usr/sbin/ddtcd -- system_u:object_r:ddt_client_exec_t +/var/run/ddtcd\.pid -- system_u:object_r:ddt_client_var_run_t +/etc/ddtcd\.conf -- system_u:object_r:ddt_client_etc_t /var/lib/ddt-client(/.*)? system_u:object_r:var_lib_ddt_client_t -/var/log/ddtcd\.log.* system_u:object_r:var_log_ddt_client_t +/var/log/ddtcd\.log.* -- system_u:object_r:ddt_client_log_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/devfsd.fc#4 (text+ko) ==== @@ -1,4 +1,4 @@ # devfsd -/etc/devfs(/.*)? system_u:object_r:etc_devfsd_t -/sbin/devfsd.* system_u:object_r:devfsd_exec_t -/etc/init\.d/makedev system_u:object_r:devfsd_exec_t +/etc/devfs(/.*)? system_u:object_r:devfsd_etc_t +/sbin/devfsd.* -- system_u:object_r:devfsd_exec_t +/etc/init\.d/makedev -- system_u:object_r:devfsd_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#4 (text+ko) ==== @@ -1,12 +1,17 @@ # dhcpcd -/etc/dhcpc.*(/.*)? system_u:object_r:etc_dhcp_t -/etc/dhclient\.conf system_u:object_r:etc_dhcp_t -/etc/dhclient-script system_u:object_r:etc_dhcp_t -/sbin/dhcpcd system_u:object_r:dhcpc_exec_t +/etc/dhcpc.*(/.*)? system_u:object_r:dhcp_etc_t +/etc/dhcp3?/dhclient.* system_u:object_r:dhcp_etc_t +/etc/dhclient.*conf -- system_u:object_r:dhcp_etc_t +/etc/dhclient-script -- system_u:object_r:dhcp_etc_t +/sbin/dhcpcd -- system_u:object_r:dhcpc_exec_t /sbin/dhclient.* -- system_u:object_r:dhcpc_exec_t /var/lib/dhcp(3)? system_u:object_r:dhcp_state_t /var/lib/dhcp(3)?/dhclient.* system_u:object_r:dhcpc_state_t /var/run/dhclient.*\.pid system_u:object_r:dhcpc_var_run_t /var/db/dhclient.leases system_u:object_r:dhcpc_state_t # pump -/sbin/pump system_u:object_r:dhcpc_exec_t +/sbin/pump -- system_u:object_r:dhcpc_exec_t +ifdef(`dhcp_defined', `', ` +/var/lib/dhcp(3)? -d system_u:object_r:dhcp_state_t +define(`dhcp_defined') +') ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dhcpd.fc#4 (text+ko) ==== @@ -1,7 +1,10 @@ # dhcpd -/etc/dhcpd.conf system_u:object_r:etc_dhcp_t -/etc/dhcp3(/.*)? system_u:object_r:etc_dhcp_t -/usr/sbin/dhcpd.* system_u:object_r:dhcpd_exec_t -/var/lib/dhcp(3)? system_u:object_r:dhcp_state_t -/var/lib/dhcp(3)?/dhcpd\.leases.* system_u:object_r:dhcpd_state_t -/var/run/dhcpd\.pid system_u:object_r:dhcpd_var_run_t +/etc/dhcpd.conf -- system_u:object_r:dhcp_etc_t +/etc/dhcp3(/.*)? system_u:object_r:dhcp_etc_t +/usr/sbin/dhcpd.* -- system_u:object_r:dhcpd_exec_t +/var/lib/dhcp(3)?/dhcpd\.leases.* -- system_u:object_r:dhcpd_state_t +/var/run/dhcpd\.pid -d system_u:object_r:dhcpd_var_run_t +ifdef(`dhcp_defined', `', ` +/var/lib/dhcp(3)? -d system_u:object_r:dhcp_state_t +define(`dhcp_defined') +') ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dictd.fc#4 (text+ko) ==== @@ -1,4 +1,4 @@ # dictd -/etc/dictd.conf system_u:object_r:etc_dictd_t -/usr/sbin/dictd system_u:object_r:dictd_exec_t +/etc/dictd.conf -- system_u:object_r:dictd_etc_t +/usr/sbin/dictd -- system_u:object_r:dictd_exec_t /var/lib/dictd(/.*)? system_u:object_r:var_lib_dictd_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dpkg.fc#4 (text+ko) ==== @@ -1,40 +1,51 @@ # dpkg/dselect/apt -/etc/apt(/.*)? system_u:object_r:etc_apt_t -/usr/bin/apt-cache system_u:object_r:apt_exec_t -/usr/bin/apt-config system_u:object_r:apt_exec_t -/usr/bin/apt-get system_u:object_r:apt_exec_t -/usr/bin/dpkg system_u:object_r:dpkg_exec_t -/usr/sbin/dpkg-reconfigure system_u:object_r:dpkg_exec_t -/usr/bin/dselect system_u:object_r:dpkg_exec_t -/usr/bin/update-menus system_u:object_r:install_menu_exec_t -/usr/lib/apt/methods/.+ system_u:object_r:apt_exec_t -/usr/lib/man-db(/.*)? system_u:object_r:bin_t -/usr/lib/dpkg/.+ system_u:object_r:dpkg_exec_t -/usr/sbin/dpkg-preconfigure system_u:object_r:dpkg_exec_t -/usr/sbin/install-menu system_u:object_r:install_menu_exec_t +/etc/apt(/.*)? system_u:object_r:apt_etc_t +/etc/apt/listbugs(/.*)? system_u:object_r:apt_rw_etc_t +/usr/bin/apt-cache -- system_u:object_r:apt_exec_t +/usr/bin/apt-config -- system_u:object_r:apt_exec_t +/usr/bin/apt-get -- system_u:object_r:apt_exec_t +/usr/bin/dpkg -- system_u:object_r:dpkg_exec_t +/usr/sbin/dpkg-reconfigure -- system_u:object_r:dpkg_exec_t +/usr/bin/dselect -- system_u:object_r:dpkg_exec_t +/usr/bin/aptitude -- system_u:object_r:dpkg_exec_t +/usr/bin/update-menus -- system_u:object_r:install_menu_exec_t +/usr/lib(64)?/apt/methods/.+ -- system_u:object_r:apt_exec_t +/usr/lib(64)?/man-db(/.*)? system_u:object_r:bin_t +/usr/lib(64)?/dpkg/.+ -- system_u:object_r:dpkg_exec_t +/usr/sbin/dpkg-preconfigure -- system_u:object_r:dpkg_exec_t +/usr/sbin/install-menu -- system_u:object_r:install_menu_exec_t /usr/share/applnk(/.*)? system_u:object_r:debian_menu_t /usr/share/debconf(/.*)? system_u:object_r:dpkg_exec_t -/usr/share/debiandoc-sgml/saspconvert system_u:object_r:bin_t -/usr/share/lintian/.+ system_u:object_r:bin_t -/usr/share/kernel-package/.+ system_u:object_r:bin_t +/usr/share/debiandoc-sgml/saspconvert -- system_u:object_r:bin_t +/usr/share/lintian/.+ -- system_u:object_r:bin_t +/usr/share/kernel-package/.+ -- system_u:object_r:bin_t +/usr/share/smartmontools/selftests -- system_u:object_r:bin_t /usr/share/bug/[^/]+ -- system_u:object_r:bin_t /var/cache/apt(/.*)? system_u:object_r:var_cache_apt_t /var/cache/apt-listbugs(/.*)? system_u:object_r:var_cache_apt_t /var/lib/apt(/.*)? system_u:object_r:apt_var_lib_t /var/state/apt(/.*)? system_u:object_r:apt_var_lib_t /var/lib/dpkg(/.*)? system_u:object_r:dpkg_var_lib_t -/var/lib/dpkg/(meth)?lock system_u:object_r:dpkg_lock_t +/var/lib/dpkg/(meth)?lock -- system_u:object_r:dpkg_lock_t /var/lib/kde(/.*)? system_u:object_r:debian_menu_t /var/spool/kdeapplnk(/.*)? system_u:object_r:debian_menu_t /var/cache/debconf(/.*)? system_u:object_r:debconf_cache_t -/etc/dpkg/.+ system_u:object_r:etc_dpkg_t -/etc/menu-methods/.* system_u:object_r:install_menu_exec_t -/etc/kde2/.+\.sh system_u:object_r:install_menu_exec_t -/usr/share/console/getkmapchoice\.pl system_u:object_r:bin_t -/var/run/update-menus\.pid system_u:object_r:install_menu_var_run_t -/usr/share/openoffice\.org-debian-files/install-hook system_u:object_r:bin_t -/usr/share/dlint/digparse system_u:object_r:bin_t -/usr/share/gimp/1.2/user_install system_u:object_r:bin_t -/usr/share/openoffice.org-debian-files/install-hook system_u:object_r:bin_t -/var/lib/defoma(/.*)? system_u:object_r:readable_t -/usr/lib/doc-rfc/register-doc-rfc-docs system_u:object_r:bin_t +/etc/dpkg/.+ -- system_u:object_r:dpkg_etc_t +/etc/menu-methods/.* -- system_u:object_r:install_menu_exec_t +/etc/kde2/.+\.sh -- system_u:object_r:install_menu_exec_t +/usr/share/console/getkmapchoice\.pl -- system_u:object_r:bin_t +/var/run/update-menus\.pid -- system_u:object_r:install_menu_var_run_t +/usr/share/openoffice\.org-debian-files/install-hook -- system_u:object_r:bin_t +/usr/share/dlint/digparse -- system_u:object_r:bin_t +/usr/share/gimp/1.2/user_install -- system_u:object_r:bin_t +/usr/share/openoffice.org-debian-files/install-hook -- system_u:object_r:bin_t +/var/lib/defoma(/.*)? system_u:object_r:fonts_t +/usr/lib(64)?/doc-rfc/register-doc-rfc-docs -- system_u:object_r:bin_t +/usr/share/intltool-debian/.* -- system_u:object_r:bin_t +/usr/share/po-debconf/intltool-merge -- system_u:object_r:bin_t +/usr/share/linuxdoc-tools/sgmlswhich -- system_u:object_r:bin_t +/usr/share/shorewall/.* -- system_u:object_r:bin_t +/usr/share/reportbug/.* -- system_u:object_r:bin_t +/etc/network/ifstate.* -- system_u:object_r:etc_runtime_t +/usr/lib/gconf2/gconfd-2 -- system_u:object_r:bin_t +/bin/mountpoint -- system_u:object_r:fsadm_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fingerd.fc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # fingerd -/usr/sbin/in\.fingerd system_u:object_r:fingerd_exec_t -/usr/sbin/[cef]fingerd system_u:object_r:fingerd_exec_t -/etc/cron.weekly/(c)?fingerd system_u:object_r:fingerd_exec_t -/etc/cfingerd(/.*)? system_u:object_r:etc_fingerd_t -/var/log/cfingerd\.log.* system_u:object_r:var_log_fingerd_t +/usr/sbin/in\.fingerd -- system_u:object_r:fingerd_exec_t +/usr/sbin/[cef]fingerd -- system_u:object_r:fingerd_exec_t +/etc/cron.weekly/(c)?fingerd -- system_u:object_r:fingerd_exec_t +/etc/cfingerd(/.*)? system_u:object_r:fingerd_etc_t +/var/log/cfingerd\.log.* -- system_u:object_r:fingerd_log_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fsadm.fc#4 (text+ko) ==== @@ -1,33 +1,37 @@ # fs admin utilities /sbin/fsck.* -- system_u:object_r:fsadm_exec_t /sbin/mkfs.* -- system_u:object_r:fsadm_exec_t -/sbin/e2fsck system_u:object_r:fsadm_exec_t -/sbin/reiserfs(ck|tune) system_u:object_r:fsadm_exec_t -/sbin/mkreiserfs system_u:object_r:fsadm_exec_t -/sbin/resize.*fs system_u:object_r:fsadm_exec_t -/sbin/e2label system_u:object_r:fsadm_exec_t -/sbin/findfs system_u:object_r:fsadm_exec_t -/sbin/mkfs system_u:object_r:fsadm_exec_t -/sbin/mke2fs system_u:object_r:fsadm_exec_t -/sbin/mkswap system_u:object_r:fsadm_exec_t -/sbin/scsi_info system_u:object_r:fsadm_exec_t -/sbin/sfdisk system_u:object_r:fsadm_exec_t -/sbin/cfdisk system_u:object_r:fsadm_exec_t -/sbin/fdisk system_u:object_r:fsadm_exec_t -/sbin/parted system_u:object_r:fsadm_exec_t -/sbin/tune2fs system_u:object_r:fsadm_exec_t -/sbin/dumpe2fs system_u:object_r:fsadm_exec_t -/sbin/swap(on|off|ctl) system_u:object_r:fsadm_exec_t -/sbin/hdparm system_u:object_r:fsadm_exec_t -/sbin/raidstart system_u:object_r:fsadm_exec_t -/sbin/mkraid system_u:object_r:fsadm_exec_t -/sbin/blockdev system_u:object_r:fsadm_exec_t -/sbin/losetup system_u:object_r:fsadm_exec_t -/sbin/jfs_.* system_u:object_r:fsadm_exec_t -/usr/sbin/updfstab system_u:object_r:fsadm_exec_t -/usr/sbin/smart(d|ctl) system_u:object_r:fsadm_exec_t -/sbin/lvmiopversion system_u:object_r:fsadm_exec_t -/sbin/install-mbr system_u:object_r:fsadm_exec_t +/sbin/e2fsck -- system_u:object_r:fsadm_exec_t +/sbin/mkdosfs -- system_u:object_r:fsadm_exec_t +/sbin/dosfsck -- system_u:object_r:fsadm_exec_t +/sbin/reiserfs(ck|tune) -- system_u:object_r:fsadm_exec_t +/sbin/mkreiserfs -- system_u:object_r:fsadm_exec_t +/sbin/resize.*fs -- system_u:object_r:fsadm_exec_t +/sbin/e2label -- system_u:object_r:fsadm_exec_t +/sbin/findfs -- system_u:object_r:fsadm_exec_t +/sbin/mkfs -- system_u:object_r:fsadm_exec_t +/sbin/mke2fs -- system_u:object_r:fsadm_exec_t +/sbin/mkswap -- system_u:object_r:fsadm_exec_t +/sbin/scsi_info -- system_u:object_r:fsadm_exec_t +/sbin/sfdisk -- system_u:object_r:fsadm_exec_t +/sbin/cfdisk -- system_u:object_r:fsadm_exec_t +/sbin/fdisk -- system_u:object_r:fsadm_exec_t +/sbin/parted -- system_u:object_r:fsadm_exec_t +/sbin/tune2fs -- system_u:object_r:fsadm_exec_t +/sbin/dumpe2fs -- system_u:object_r:fsadm_exec_t +/sbin/swapon.* -- system_u:object_r:fsadm_exec_t +/sbin/hdparm -- system_u:object_r:fsadm_exec_t +/sbin/raidstart -- system_u:object_r:fsadm_exec_t +/sbin/mkraid -- system_u:object_r:fsadm_exec_t +/sbin/blockdev -- system_u:object_r:fsadm_exec_t +/sbin/losetup.* -- system_u:object_r:fsadm_exec_t +/sbin/jfs_.* -- system_u:object_r:fsadm_exec_t +/usr/sbin/smartctl -- system_u:object_r:fsadm_exec_t +/sbin/install-mbr -- system_u:object_r:fsadm_exec_t +/usr/bin/scsi_unique_id -- system_u:object_r:fsadm_exec_t +/usr/bin/raw -- system_u:object_r:fsadm_exec_t +/sbin/partx -- system_u:object_r:fsadm_exec_t +/usr/bin/partition_uuid -- system_u:object_r:fsadm_exec_t # FreeBSD /sbin/bsdlabel system_u:object_r:fsadm_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ftpd.fc#4 (text+ko) ==== @@ -1,11 +1,14 @@ # ftpd -/usr/sbin/in\.ftpd system_u:object_r:ftpd_exec_t -/usr/sbin/proftpd system_u:object_r:ftpd_exec_t -/usr/sbin/muddleftpd system_u:object_r:ftpd_exec_t -/usr/sbin/ftpwho system_u:object_r:ftpd_exec_t -/etc/proftpd\.conf system_u:object_r:etc_ftpd_t -/var/run/proftpd/proftpd-inetd system_u:object_r:ftpd_var_run_t -/var/log/muddleftpd\.log.* system_u:object_r:xferlog_t -/var/log/xferlog.* system_u:object_r:xferlog_t -/var/log/xferreport.* system_u:object_r:xferlog_t -/etc/cron\.monthly/proftpd system_u:object_r:ftpd_exec_t +/usr/sbin/in\.ftpd -- system_u:object_r:ftpd_exec_t +/usr/sbin/proftpd -- system_u:object_r:ftpd_exec_t +/usr/sbin/muddleftpd -- system_u:object_r:ftpd_exec_t +/usr/sbin/ftpwho -- system_u:object_r:ftpd_exec_t +/usr/kerberos/sbin/ftpd -- system_u:object_r:ftpd_exec_t +/usr/sbin/vsftpd -- system_u:object_r:ftpd_exec_t +/etc/proftpd\.conf -- system_u:object_r:ftpd_etc_t +/var/run/proftpd/proftpd-inetd -- system_u:object_r:ftpd_var_run_t +/var/run/proftpd/proftpd.scoreboard -- system_u:object_r:ftpd_var_run_t +/var/log/muddleftpd\.log.* -- system_u:object_r:xferlog_t +/var/log/xferlog.* -- system_u:object_r:xferlog_t +/var/log/xferreport.* -- system_u:object_r:xferlog_t +/etc/cron\.monthly/proftpd -- system_u:object_r:ftpd_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/games.fc#2 (text+ko) ==== @@ -1,5 +1,56 @@ # games -/usr/games/.* -- system_u:object_r:games_exec_t -/usr/lib/games/.* -- system_u:object_r:games_exec_t -/var/games(/.*)? system_u:object_r:games_data_t -/usr/bin/micq system_u:object_r:games_exec_t +/usr/lib(64)?/games/.* -- system_u:object_r:games_exec_t +/var/games(/.*)? system_u:object_r:games_data_t +/usr/games/.* -- system_u:object_r:games_exec_t +/var/lib/games(/.*)? system_u:object_r:games_data_t +/usr/bin/micq -- system_u:object_r:games_exec_t +/usr/bin/blackjack -- system_u:object_r:games_exec_t +/usr/bin/gataxx -- system_u:object_r:games_exec_t +/usr/bin/glines -- system_u:object_r:games_exec_t +/usr/bin/gnect -- system_u:object_r:games_exec_t +/usr/bin/gnibbles -- system_u:object_r:games_exec_t +/usr/bin/gnobots2 -- system_u:object_r:games_exec_t +/usr/bin/gnome-stones -- system_u:object_r:games_exec_t +/usr/bin/gnomine -- system_u:object_r:games_exec_t +/usr/bin/gnotravex -- system_u:object_r:games_exec_t +/usr/bin/gnotski -- system_u:object_r:games_exec_t +/usr/bin/gtali -- system_u:object_r:games_exec_t +/usr/bin/iagno -- system_u:object_r:games_exec_t +/usr/bin/mahjongg -- system_u:object_r:games_exec_t +/usr/bin/same-gnome -- system_u:object_r:games_exec_t +/usr/bin/sol -- system_u:object_r:games_exec_t +/usr/bin/atlantik -- system_u:object_r:games_exec_t +/usr/bin/kasteroids -- system_u:object_r:games_exec_t +/usr/bin/katomic -- system_u:object_r:games_exec_t +/usr/bin/kbackgammon -- system_u:object_r:games_exec_t +/usr/bin/kbattleship -- system_u:object_r:games_exec_t +/usr/bin/kblackbox -- system_u:object_r:games_exec_t +/usr/bin/kbounce -- system_u:object_r:games_exec_t +/usr/bin/kenolaba -- system_u:object_r:games_exec_t +/usr/bin/kfouleggs -- system_u:object_r:games_exec_t +/usr/bin/kgoldrunner -- system_u:object_r:games_exec_t +/usr/bin/kjumpingcube -- system_u:object_r:games_exec_t +/usr/bin/klickety -- system_u:object_r:games_exec_t +/usr/bin/klines -- system_u:object_r:games_exec_t +/usr/bin/kmahjongg -- system_u:object_r:games_exec_t +/usr/bin/kmines -- system_u:object_r:games_exec_t +/usr/bin/kolf -- system_u:object_r:games_exec_t +/usr/bin/konquest -- system_u:object_r:games_exec_t +/usr/bin/kpat -- system_u:object_r:games_exec_t +/usr/bin/kpoker -- system_u:object_r:games_exec_t +/usr/bin/kreversi -- system_u:object_r:games_exec_t +/usr/bin/ksame -- system_u:object_r:games_exec_t +/usr/bin/kshisen -- system_u:object_r:games_exec_t +/usr/bin/ksirtet -- system_u:object_r:games_exec_t +/usr/bin/ksmiletris -- system_u:object_r:games_exec_t +/usr/bin/ksnake -- system_u:object_r:games_exec_t +/usr/bin/ksokoban -- system_u:object_r:games_exec_t +/usr/bin/kspaceduel -- system_u:object_r:games_exec_t +/usr/bin/ktron -- system_u:object_r:games_exec_t +/usr/bin/ktuberling -- system_u:object_r:games_exec_t +/usr/bin/kwin4 -- system_u:object_r:games_exec_t +/usr/bin/kwin4proc -- system_u:object_r:games_exec_t +/usr/bin/lskat -- system_u:object_r:games_exec_t >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 21 17:32:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E605216A4D0; Tue, 21 Dec 2004 17:32:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D10416A4CE for ; Tue, 21 Dec 2004 17:32:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85C9143D48 for ; Tue, 21 Dec 2004 17:32:56 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBLHWuPH067954 for ; Tue, 21 Dec 2004 17:32:56 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBLHWudn067951 for perforce@freebsd.org; Tue, 21 Dec 2004 17:32:56 GMT (envelope-from areisse@nailabs.com) Date: Tue, 21 Dec 2004 17:32:56 GMT Message-Id: <200412211732.iBLHWudn067951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Dec 2004 17:32:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=67473 Change 67473 by areisse@areisse_tislabs on 2004/12/21 17:32:00 Changes to policy for it to build, and run (sort of). -initial sid for init is required on freebsd -new genhomedircon that does not use python or try to guess things from passwd file Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#15 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genhomedircon#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#15 (text+ko) ==== @@ -146,7 +146,7 @@ @echo "Building file_contexts ..." @m4 $(ALL_TUNABLES) $(FCFILES) > $@.tmp @grep -v "^/root" $@.tmp > $@.root - @/usr/sbin/genhomedircon . $@.root > $@ + ./genhomedircon $@.root > $@ @grep "^/root" $@.tmp >> $@ @-rm $@.tmp $@.root ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#6 (text+ko) ==== @@ -11,8 +11,7 @@ sid file system_u:object_r:file_t # Persistent label mapping is gone. This initial SID can be removed. sid file_labels system_u:object_r:unlabeled_t -# init_t is still used, but an initial SID is no longer required. -sid init system_u:object_r:unlabeled_t +sid init system_u:system_r:init_t # any_socket is no longer used. sid any_socket system_u:object_r:unlabeled_t sid port system_u:object_r:port_t From owner-p4-projects@FreeBSD.ORG Wed Dec 22 00:59:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2439916A4D1; Wed, 22 Dec 2004 00:59:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D06D716A4CE for ; Wed, 22 Dec 2004 00:59:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCE0E43D48 for ; Wed, 22 Dec 2004 00:59:04 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBM0x4OO098542 for ; Wed, 22 Dec 2004 00:59:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBM0x4pF098539 for perforce@freebsd.org; Wed, 22 Dec 2004 00:59:04 GMT (envelope-from sam@freebsd.org) Date: Wed, 22 Dec 2004 00:59:04 GMT Message-Id: <200412220059.iBM0x4pF098539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 00:59:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=67497 Change 67497 by sam@sam_ebb on 2004/12/22 00:58:14 fix debug msgs Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#31 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#4 (text+ko) ==== @@ -103,7 +103,7 @@ * happen, at least, when changing keys. */ IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] key (id %u) is invalid\n", + "[%s] key id %u is not set (encap)\n", ether_sprintf(wh->i_addr1), keyid>>6); ic->ic_stats.is_tx_badcipher++; return 0; @@ -124,7 +124,7 @@ */ /* XXX useful to know dst too */ IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] key (id %u) is invalid\n", + "[%s] key id %u is not set (decap)\n", ether_sprintf(wh->i_addr2), ivp[IEEE80211_WEP_IVLEN] >> 6); ic->ic_stats.is_rx_badkeyid++; return 0; ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#31 (text+ko) ==== @@ -1823,7 +1823,7 @@ IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID, wh, ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], - "for off-channel %u\n", chan); + "for off-channel %u", chan); ic->ic_stats.is_rx_chanmismatch++; return; } From owner-p4-projects@FreeBSD.ORG Wed Dec 22 00:59:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ED8316A4D0; Wed, 22 Dec 2004 00:59:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 433D616A4E0 for ; Wed, 22 Dec 2004 00:59:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 156B143D48 for ; Wed, 22 Dec 2004 00:59:05 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBM0x4Ih098549 for ; Wed, 22 Dec 2004 00:59:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBM0x4OD098545 for perforce@freebsd.org; Wed, 22 Dec 2004 00:59:04 GMT (envelope-from sam@freebsd.org) Date: Wed, 22 Dec 2004 00:59:04 GMT Message-Id: <200412220059.iBM0x4OD098545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 00:59:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=67498 Change 67498 by sam@sam_ebb on 2004/12/22 00:58:43 correct QoS frame recognition in ieee80211_dump_pkt Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#19 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#19 (text+ko) ==== @@ -301,7 +301,7 @@ printf(" type#%d", wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK); break; } - if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) { + if (IEEE80211_QOS_HAS_SEQ(wh)) { const struct ieee80211_qosframe *qwh = (const struct ieee80211_qosframe *)buf; printf(" QoS [TID %u%s]", qwh->i_qos[0] & IEEE80211_QOS_TID, From owner-p4-projects@FreeBSD.ORG Wed Dec 22 04:05:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 385A216A4D2; Wed, 22 Dec 2004 04:05:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9282E16A4CE for ; Wed, 22 Dec 2004 04:05:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 114B543D2F for ; Wed, 22 Dec 2004 04:05:51 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBM45olM005761 for ; Wed, 22 Dec 2004 04:05:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBM45oFm005758 for perforce@freebsd.org; Wed, 22 Dec 2004 04:05:50 GMT (envelope-from sam@freebsd.org) Date: Wed, 22 Dec 2004 04:05:50 GMT Message-Id: <200412220405.iBM45oFm005758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 04:05:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=67502 Change 67502 by sam@sam_ebb on 2004/12/22 04:05:42 IFC @ 67501 Affected files ... .. //depot/projects/wifi/Makefile#6 integrate .. //depot/projects/wifi/Makefile.inc1#8 integrate .. //depot/projects/wifi/UPDATING#8 integrate .. //depot/projects/wifi/bin/Makefile.inc#2 integrate .. //depot/projects/wifi/bin/ed/Makefile#2 integrate .. //depot/projects/wifi/bin/rmail/Makefile#2 integrate .. //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/wifi/etc/Makefile#2 integrate .. //depot/projects/wifi/etc/defaults/Makefile#3 integrate .. //depot/projects/wifi/etc/devd.conf#4 integrate .. //depot/projects/wifi/etc/isdn/Makefile#2 integrate .. //depot/projects/wifi/etc/mtree/Makefile#3 integrate .. //depot/projects/wifi/etc/namedb/Makefile#3 integrate .. //depot/projects/wifi/etc/pam.d/Makefile#3 integrate .. //depot/projects/wifi/etc/periodic/Makefile.inc#2 integrate .. //depot/projects/wifi/etc/rc.d/named#3 integrate .. //depot/projects/wifi/games/factor/Makefile#2 integrate .. //depot/projects/wifi/games/fortune/unstr/Makefile#3 integrate .. //depot/projects/wifi/games/ppt/Makefile#3 integrate .. //depot/projects/wifi/games/primes/Makefile#3 integrate .. //depot/projects/wifi/gnu/Makefile.inc#3 integrate .. //depot/projects/wifi/gnu/lib/libdialog/Makefile#2 integrate .. //depot/projects/wifi/gnu/lib/libg2c/Makefile#2 integrate .. //depot/projects/wifi/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/wifi/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/wifi/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/ar/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/as/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/gdb/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/gdbreplay/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/c++/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/c++filt/Makefile#4 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/cc/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/cc1/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/cc1obj/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/cc1plus/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/collect2/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/f771/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/protoize/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/cvs/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/Makefile.inc#4 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/gdbtui/Makefile#4 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/font/devX100-12/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/font/devX100/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/font/devX75-12/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/font/devX75/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/src/devices/grohtml/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/src/preproc/html/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/texinfo/infokey/Makefile#3 integrate .. //depot/projects/wifi/include/arpa/Makefile#3 integrate .. //depot/projects/wifi/include/protocols/Makefile#3 integrate .. //depot/projects/wifi/kerberos5/Makefile.inc#2 integrate .. //depot/projects/wifi/kerberos5/libexec/ipropd-master/Makefile#2 integrate .. //depot/projects/wifi/kerberos5/libexec/ipropd-slave/Makefile#2 integrate .. //depot/projects/wifi/kerberos5/tools/asn1_compile/Makefile#2 integrate .. //depot/projects/wifi/kerberos5/tools/make-print-version/Makefile#2 integrate .. //depot/projects/wifi/kerberos5/tools/make-roken/Makefile#2 integrate .. //depot/projects/wifi/kerberos5/usr.bin/ksu/Makefile#3 integrate .. //depot/projects/wifi/lib/Makefile#3 integrate .. //depot/projects/wifi/lib/bind/config.mk#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/wifi/lib/libbsnmp/modules/Makefile#2 integrate .. //depot/projects/wifi/lib/libc_r/Makefile#3 integrate .. //depot/projects/wifi/lib/libcompat/Makefile#2 integrate .. //depot/projects/wifi/lib/libcrypt/Makefile#3 integrate .. //depot/projects/wifi/lib/libdisk/Makefile#3 integrate .. //depot/projects/wifi/lib/libfetch/Makefile#2 integrate .. //depot/projects/wifi/lib/libio/Makefile#3 integrate .. //depot/projects/wifi/lib/libipsec/Makefile#2 integrate .. //depot/projects/wifi/lib/libmilter/Makefile#2 integrate .. //depot/projects/wifi/lib/libncp/Makefile#2 integrate .. //depot/projects/wifi/lib/libncurses/Makefile#3 integrate .. //depot/projects/wifi/lib/libpam/libpam/Makefile#3 integrate .. //depot/projects/wifi/lib/libpam/modules/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libpam/modules/modules.inc#2 integrate .. //depot/projects/wifi/lib/libpcap/Makefile#2 integrate .. //depot/projects/wifi/lib/libpcap/config.h#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_sigsuspend.c#3 integrate .. //depot/projects/wifi/lib/libradius/Makefile#2 integrate .. //depot/projects/wifi/lib/librpcsvc/Makefile#4 integrate .. //depot/projects/wifi/lib/libsm/Makefile#3 integrate .. //depot/projects/wifi/lib/libsmb/Makefile#3 integrate .. //depot/projects/wifi/lib/libstand/Makefile#3 integrate .. //depot/projects/wifi/lib/libtelnet/Makefile#3 integrate .. //depot/projects/wifi/lib/libwrap/Makefile#3 integrate .. //depot/projects/wifi/lib/liby/Makefile#3 integrate .. //depot/projects/wifi/libexec/Makefile#3 integrate .. //depot/projects/wifi/libexec/bootpd/bootpgw/Makefile#3 integrate .. //depot/projects/wifi/libexec/ftpd/Makefile#2 integrate .. //depot/projects/wifi/libexec/lukemftpd/Makefile#2 integrate .. //depot/projects/wifi/libexec/pt_chown/Makefile#3 integrate .. //depot/projects/wifi/libexec/save-entropy/Makefile#2 integrate .. //depot/projects/wifi/libexec/tcpd/Makefile#2 integrate .. //depot/projects/wifi/libexec/telnetd/Makefile#2 integrate .. //depot/projects/wifi/release/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/wifi/release/picobsd/build/picobsd#2 integrate .. //depot/projects/wifi/release/picobsd/tinyware/aps/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/help/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/login/Makefile#4 integrate .. //depot/projects/wifi/release/picobsd/tinyware/msg/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/ns/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/oinit/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/passwd/Makefile#2 integrate .. //depot/projects/wifi/release/picobsd/tinyware/simple_httpd/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/sps/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/view/Makefile#3 integrate .. //depot/projects/wifi/release/picobsd/tinyware/vm/Makefile#3 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#6 integrate .. //depot/projects/wifi/sbin/Makefile#5 integrate .. //depot/projects/wifi/sbin/Makefile.inc#2 integrate .. //depot/projects/wifi/sbin/devd/Makefile#2 integrate .. //depot/projects/wifi/sbin/geom/core/Makefile#2 integrate .. //depot/projects/wifi/sbin/gvinum/Makefile#3 integrate .. //depot/projects/wifi/sbin/init/Makefile#3 integrate .. //depot/projects/wifi/sbin/mca/Makefile#3 integrate .. //depot/projects/wifi/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/wifi/sbin/mount_msdosfs/Makefile#2 integrate .. //depot/projects/wifi/sbin/mount_ntfs/Makefile#2 integrate .. //depot/projects/wifi/sbin/mount_udf/Makefile#2 integrate .. //depot/projects/wifi/sbin/mount_ufs/Makefile#2 integrate .. //depot/projects/wifi/sbin/rtsol/Makefile#3 integrate .. //depot/projects/wifi/secure/Makefile#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/wifi/secure/lib/libssh/Makefile#4 integrate .. //depot/projects/wifi/secure/lib/libssl/Makefile#3 integrate .. //depot/projects/wifi/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/wifi/share/dict/Makefile#3 integrate .. //depot/projects/wifi/share/doc/IPv6/Makefile#3 integrate .. //depot/projects/wifi/share/doc/bind9/Makefile#3 integrate .. //depot/projects/wifi/share/examples/FreeBSD_version/Makefile#2 integrate .. //depot/projects/wifi/share/examples/Makefile#3 integrate .. //depot/projects/wifi/share/examples/autofs/driver/Makefile#3 integrate .. //depot/projects/wifi/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/wifi/share/examples/etc/make.conf#7 integrate .. //depot/projects/wifi/share/examples/find_interface/Makefile#2 integrate .. //depot/projects/wifi/share/examples/ipfilter/Makefile#3 integrate .. //depot/projects/wifi/share/examples/isdn/v21/Makefile#3 integrate .. //depot/projects/wifi/share/examples/kld/cdev/test/Makefile#2 integrate .. //depot/projects/wifi/share/examples/kld/syscall/test/Makefile#3 integrate .. //depot/projects/wifi/share/examples/libvgl/Makefile#3 integrate .. //depot/projects/wifi/share/examples/perfmon/Makefile#2 integrate .. //depot/projects/wifi/share/examples/pf/Makefile#3 integrate .. //depot/projects/wifi/share/examples/ppi/Makefile#3 integrate .. //depot/projects/wifi/share/examples/smbfs/Makefile#3 integrate .. //depot/projects/wifi/share/examples/smbfs/print/Makefile#3 integrate .. //depot/projects/wifi/share/info/Makefile#3 integrate .. //depot/projects/wifi/share/man/Makefile#2 integrate .. //depot/projects/wifi/share/man/man3/Makefile#2 integrate .. //depot/projects/wifi/share/man/man4/Makefile#10 integrate .. //depot/projects/wifi/share/man/man4/ata.4#2 integrate .. //depot/projects/wifi/share/man/man4/aue.4#2 integrate .. //depot/projects/wifi/share/man/man4/bpf.4#2 integrate .. //depot/projects/wifi/share/man/man4/de.4#2 integrate .. //depot/projects/wifi/share/man/man4/ef.4#2 integrate .. //depot/projects/wifi/share/man/man4/lp.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/cs.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ray.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/wl.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_etf.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_source.4#2 integrate .. //depot/projects/wifi/share/man/man4/vlan.4#4 integrate .. //depot/projects/wifi/share/man/man4/wi.4#2 integrate .. //depot/projects/wifi/share/man/man4/xl.4#2 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#6 integrate .. //depot/projects/wifi/share/man/man8/picobsd.8#2 integrate .. //depot/projects/wifi/share/misc/Makefile#3 integrate .. //depot/projects/wifi/share/mk/Makefile#3 integrate .. //depot/projects/wifi/share/mk/bsd.README#2 integrate .. //depot/projects/wifi/share/mk/bsd.compat.mk#1 branch .. //depot/projects/wifi/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.doc.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.info.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.init.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/wifi/share/mk/bsd.man.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.obj.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.pkg.mk#1 branch .. //depot/projects/wifi/share/mk/bsd.prog.mk#4 integrate .. //depot/projects/wifi/share/security/Makefile#3 integrate .. //depot/projects/wifi/share/sendmail/Makefile#3 integrate .. //depot/projects/wifi/share/skel/Makefile#3 integrate .. //depot/projects/wifi/share/snmp/mibs/Makefile#3 integrate .. //depot/projects/wifi/share/syscons/fonts/Makefile#3 integrate .. //depot/projects/wifi/share/syscons/keymaps/Makefile#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/wifi/sys/boot/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/alpha/boot1/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/alpha/cdboot/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/wifi/sys/boot/alpha/netboot/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/arc/loader/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/pc98/boot0/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/sparc64/boot1/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/wifi/sys/conf/NOTES#7 integrate .. //depot/projects/wifi/sys/conf/files.amd64#4 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/wifi/sys/crypto/rijndael/Makefile#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#7 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/wifi/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/wifi/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/wifi/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/wifi/sys/geom/geom.h#5 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/wifi/sys/kern/tty.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/wifi/sys/modules/Makefile#9 integrate .. //depot/projects/wifi/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/cp/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/if_gif/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/ipfilter/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/netgraph/fec/sample_startup#2 delete .. //depot/projects/wifi/sys/modules/pf/Makefile#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/wifi/sys/pci/if_sk.c#5 integrate .. //depot/projects/wifi/sys/sys/vnode.h#8 integrate .. //depot/projects/wifi/tools/KSE/ksetest/Makefile#2 integrate .. //depot/projects/wifi/tools/KSE/rr/Makefile#2 integrate .. //depot/projects/wifi/tools/diag/dumpvfscache/Makefile#3 integrate .. //depot/projects/wifi/tools/diag/localeck/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/fsx/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/gaithrstress/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/geom/ConfCmp/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/geom/MdLoad/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/geom_mirror/test-1.sh#2 integrate .. //depot/projects/wifi/tools/regression/geom_mirror/test-2.sh#2 integrate .. //depot/projects/wifi/tools/regression/geom_mirror/test-3.sh#2 integrate .. //depot/projects/wifi/tools/regression/geom_mirror/test-4.sh#2 integrate .. //depot/projects/wifi/tools/regression/geom_mirror/test-5.sh#2 integrate .. //depot/projects/wifi/tools/regression/geom_mirror/test-6.sh#2 integrate .. //depot/projects/wifi/tools/regression/geom_mirror/test-7.sh#2 integrate .. //depot/projects/wifi/tools/regression/geom_raid3/test-12.sh#2 integrate .. //depot/projects/wifi/tools/regression/ia64_unaligned/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/include/tgmath/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/netatalk/simple_send/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/netinet/ipsockopt/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/netinet/tcpconnect/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/netinet/tcpstream/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/nfsmmap/test1/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/nfsmmap/test2/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/p1003_1b/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/pipe/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/security/access/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/security/proc_to_proc/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/sockets/accept_fd_leak/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/sockets/accf_data_attach/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/sockets/kqueue/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/sockets/listenclose/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/sockets/socketpair/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/sysvmsg/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/sysvsem/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/sysvshm/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/tls/libxx/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/tls/libyy/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/tls/ttls1/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/tls/ttls2/Makefile#3 integrate .. //depot/projects/wifi/tools/test/malloc/Makefile#3 integrate .. //depot/projects/wifi/tools/test/ppsapi/Makefile#4 integrate .. //depot/projects/wifi/tools/tools/aac/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/find-sb/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/gdb_regofs/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/ifinfo/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/ministat/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/nanobsd/make.conf#6 integrate .. //depot/projects/wifi/tools/tools/netrate/Makefile.inc#1 branch .. //depot/projects/wifi/tools/tools/netrate/netblast/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/netrate/netreceive/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/netrate/netsend/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/netrate/netsend/netsend.c#2 integrate .. //depot/projects/wifi/tools/tools/pirtool/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/recoverdisk/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/syscall_timing/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/alias/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/bzip2recover/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/wifi/usr.bin/dirname/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/elf2aout/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/fetch/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/lessecho/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/lex/lib/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/limits/limits.c#2 integrate .. //depot/projects/wifi/usr.bin/locate/bigram/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/locate/code/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/make/Makefile#6 integrate .. //depot/projects/wifi/usr.bin/make/job.c#11 integrate .. //depot/projects/wifi/usr.bin/tar/Makefile#4 integrate .. //depot/projects/wifi/usr.bin/tar/fts.c#2 integrate .. //depot/projects/wifi/usr.bin/telnet/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/unexpand/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/uudecode/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/vgrind/RETEST/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/xlint/lint2/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/Makefile#4 integrate .. //depot/projects/wifi/usr.sbin/bootparamd/callbootd/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/burncd/burncd.8#2 integrate .. //depot/projects/wifi/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/wifi/usr.sbin/crunch/examples/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ctm/ctm_dequeue/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ctm/ctm_smail/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ctm/mkCTM/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/lpr/filters/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/lpr/lpd/printjob.c#3 integrate .. //depot/projects/wifi/usr.sbin/mount_smbfs/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/mrouted/testrsrr/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/nologin/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/ntp/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/ntp/Makefile.inc#2 integrate .. //depot/projects/wifi/usr.sbin/ntp/ntp-keygen/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ntp/ntpd/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ntp/ntpdate/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ntp/ntpdc/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ntp/ntpq/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ntp/ntptime/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ntp/ntptrace/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ntp/sntp/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/pccard/Makefile.inc#2 integrate .. //depot/projects/wifi/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/pcvt/Misc/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/pcvt/demo/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/pcvt/kbdio/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/Makefile.inc#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ppp/main.c#3 integrate .. //depot/projects/wifi/usr.sbin/pppd/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/wifi/usr.sbin/rpc.ypupdated/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/sendmail/Makefile#4 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/tcpdchk/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/tcpdmatch/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/traceroute/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/vnconfig/Makefile#3 integrate Differences ... ==== //depot/projects/wifi/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.313 2004/12/16 19:55:57 ru Exp $ +# $FreeBSD: src/Makefile,v 1.315 2004/12/21 09:59:39 ru Exp $ # # The user-driven targets are: # @@ -232,7 +232,7 @@ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} make \ -D_UPGRADING \ - -DNOMAN -DNOSHARED \ + -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR make: .PHONY ==== //depot/projects/wifi/Makefile.inc1#8 (text+ko) ==== @@ -1,19 +1,19 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.460 2004/12/17 10:11:33 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.470 2004/12/21 12:21:25 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNO_RESCUE do not build rescue binaries -# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir -# -DNOCLEAN do not clean at all -# -DNOCRYPT will prevent building of crypt versions -# -DNOMAN do not build the manual pages -# -DNOPROFILE do not build profiled libraries -# -DNOGAMES do not go into games subdir -# -DNOSHARE do not go into share subdir -# -DNOINFO do not make or install info files -# -DNOLIBC_R do not build libc_r. +# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir +# -DNO_CLEAN do not clean at all +# -DNO_CRYPT will prevent building of crypt versions +# -DNO_MAN do not build the manual pages +# -DNO_PROFILE do not build profiled libraries +# -DNO_GAMES do not go into games subdir +# -DNO_SHARE do not go into share subdir +# -DNO_INFO do not make or install info files +# -DNO_LIBC_R do not build libc_r. # -DNO_FORTRAN do not build g77 and related libraries. # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel @@ -45,21 +45,21 @@ # We must do etc last for install/distribute to work. # SUBDIR= share/info include lib libexec bin -.if !defined(NOGAMES) +.if !defined(NO_GAMES) SUBDIR+=games .endif SUBDIR+=gnu -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) SUBDIR+=kerberos5 .endif .if !defined(NO_RESCUE) SUBDIR+=rescue .endif SUBDIR+=sbin -.if !defined(NOCRYPT) +.if !defined(NO_CRYPT) SUBDIR+=secure .endif -.if !defined(NOSHARE) +.if !defined(NO_SHARE) SUBDIR+=share .endif SUBDIR+=sys usr.bin usr.sbin etc @@ -76,7 +76,7 @@ SUBDIR= ${SUBDIR_OVERRIDE} .endif -.if defined(NOCLEANDIR) +.if defined(NO_CLEANDIR) CLEANDIR= clean cleandepend .else CLEANDIR= cleandir @@ -182,14 +182,14 @@ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \ - -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS + -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PIC -DNO_PROFILE \ + -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ - BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS + BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -231,7 +231,7 @@ SHLIBDIR=/usr/lib32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ + -DNO_BIND -DNO_MAN -DNO_INFO -DNO_HTML \ CC="cc ${LIB32CC}" \ CXX="c++ ${LIB32CXX}" \ OBJC="cc ${LIB32OBJC}" \ @@ -273,7 +273,7 @@ @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @echo "--------------------------------------------------------------" -.if !defined(NOCLEAN) +.if !defined(NO_CLEAN) rm -rf ${WORLDTMP} .else rm -rf ${WORLDTMP}/legacy/usr/include @@ -327,7 +327,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools _cleanobj: -.if !defined(NOCLEAN) +.if !defined(NO_CLEAN) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @@ -364,7 +364,7 @@ @echo ">>> stage 4.2: building libraries" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ - ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPROFILE \ + ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PROFILE \ libraries _depend: @echo @@ -393,7 +393,7 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t} @@ -406,11 +406,11 @@ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} cd ${.CURDIR}/gnu/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} -.if !defined(NOCRYPT) +.if !defined(NO_CRYPT) cd ${.CURDIR}/secure/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) cd ${.CURDIR}/kerberos5/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif @@ -434,7 +434,7 @@ mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree cd ${.CURDIR}/lib; ${LIB32MAKE} install cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install -.if !defined(NOCRYPT) +.if !defined(NO_CRYPT) cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install .endif cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install @@ -664,7 +664,7 @@ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ ${KERNCONFDIR}/${_kernel} .endif -.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) +.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @@ -798,7 +798,7 @@ # # bootstrap-tools: Build tools needed for compatibility # -.if !defined(NOGAMES) +.if !defined(NO_GAMES) _strfile= games/fortune/strfile .endif @@ -876,11 +876,11 @@ _aicasm= sys/modules/aic7xxx/aicasm .endif -.if !defined(NOSHARE) +.if !defined(NO_SHARE) _share= share/syscons/scrnmaps .endif -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) _kerberos5_tools= kerberos5/tools .endif @@ -994,7 +994,7 @@ _generic_libs= gnu/lib -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 @@ -1021,7 +1021,7 @@ _generic_libs+= lib -.if !defined(NOCRYPT) +.if !defined(NO_CRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl lib/libradius__L: secure/lib/libssl__L @@ -1039,7 +1039,7 @@ _generic_libs+= secure/lib .endif -.if defined(NOCRYPT) || defined(NO_OPENSSL) +.if defined(NO_CRYPT) || defined(NO_OPENSSL) lib/libradius__L: lib/libmd__L .endif ==== //depot/projects/wifi/UPDATING#8 (text+ko) ==== @@ -23,6 +23,15 @@ developers choose to disable these features on build machines to maximize performance. +20041219: + Auto-loading of ancillary wlan modules such as wlan_wep has + been temporarily disabled; you need to statically configure + the modules you need into your kernel or explicitly load them + prior to use. Specifically, if you intend to use WEP encryption + with an 802.11 device load/configure wlan_wep; if you want to + use WPA with the ath driver load/configure wlan_tkip, wlan_ccmp, + and wlan_xauth as required. + 20041213: The behaviour of ppp(8) has changed slightly. If lqr is enabled (``enable lqr''), older versions would revert to LCP ECHO mode on @@ -1984,4 +1993,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.383 2004/12/13 17:52:10 brian Exp $ +$FreeBSD: src/UPDATING,v 1.384 2004/12/20 04:27:23 sam Exp $ ==== //depot/projects/wifi/bin/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile.inc,v 1.21 2004/08/06 00:07:26 gordon Exp $ +# $FreeBSD: src/bin/Makefile.inc,v 1.22 2004/12/21 09:59:40 ru Exp $ BINDIR?= /bin WARNS?= 6 .if defined(NO_DYNAMICROOT) -NOSHARED?= YES +NO_SHARED?= YES .endif ==== //depot/projects/wifi/bin/ed/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.30 2004/08/06 07:27:03 cperciva Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.31 2004/12/21 10:15:59 ru Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DDES WARNS?= 2 DPADD= ${LIBCRYPTO} ==== //depot/projects/wifi/bin/rmail/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rmail/Makefile,v 1.20 2004/03/22 03:17:36 obrien Exp $ +# $FreeBSD: src/bin/rmail/Makefile,v 1.21 2004/12/21 09:59:40 ru Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail # Not much point this being static. It calls a shared sendmail... -NOSHARED?= NO +NO_SHARED?= NO PROG= rmail SRCS= rmail.c ==== //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#2 (text+ko) ==== @@ -51,7 +51,7 @@ Note that we intentionally disable IPv6 support on the configure command line; src/lib/bind/config.mk will re-enable it at compile - time if NOINET6 is not defined. + time if NO_INET6 is not defined. 8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and commit it. Do not commit any other file that was modified or @@ -96,4 +96,4 @@ -- des@FreeBSD.org -$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.2 2004/09/27 00:25:56 des Exp $ +$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.3 2004/12/21 10:49:25 ru Exp $ ==== //depot/projects/wifi/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.335 2004/10/08 00:14:27 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.337 2004/12/21 10:15:59 ru Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -23,7 +23,7 @@ BIN1+= printcap .endif -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) .if !defined(NO_OPENSSH) SSH= ${.CURDIR}/../crypto/openssh/ssh_config \ ${.CURDIR}/../crypto/openssh/sshd_config \ @@ -65,7 +65,7 @@ FREEBSD=COPYRIGHT afterinstall: -.if !defined(NOMAN) +.if !defined(NO_MAN) cd ${.CURDIR}/../share/man; ${MAKE} makedb .endif ==== //depot/projects/wifi/etc/defaults/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.4 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.5 2004/12/21 08:46:49 ru Exp $ FILES= devfs.rules pccard.conf periodic.conf rc.conf -NOOBJ= +NO_OBJ= FILESDIR= /etc/defaults FILESMODE= 444 ==== //depot/projects/wifi/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.19 2004/11/28 23:16:00 iedowse Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.20 2004/12/19 00:50:07 brueffer Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -19,12 +19,13 @@ # Setup some shorthand for regex that we use later in the file. set ethernet-nic-regex "(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\ - ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ - rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\ - xl)[0-9]+"; + ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\ + sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|udav|vge|vr|vx|wb|wi|xe|xl)\ + [0-9]+"; set scsi-controller-regex - "(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\ - stg|sym|wds)[0-9]+"; + "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\ + ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\ + [0-9]+"; }; # Note that the attach/detach with the highest value wins, so that one can ==== //depot/projects/wifi/etc/isdn/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/isdn/Makefile,v 1.12 2004/01/19 13:40:50 ru Exp $ +# $FreeBSD: src/etc/isdn/Makefile,v 1.13 2004/12/21 08:46:50 ru Exp $ -NOOBJ= +NO_OBJ= SCRIPTS= answer \ isdntel.sh \ ==== //depot/projects/wifi/etc/mtree/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/Makefile,v 1.4 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/etc/mtree/Makefile,v 1.5 2004/12/21 08:46:50 ru Exp $ FILES= ${_BIND.chroot.dist} \ ${_BIND.include.dist} \ @@ -17,7 +17,7 @@ .endif .endif -NOOBJ= +NO_OBJ= FILESDIR= /etc/mtree .include ==== //depot/projects/wifi/etc/namedb/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/etc/namedb/Makefile,v 1.3 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/etc/namedb/Makefile,v 1.4 2004/12/21 08:46:50 ru Exp $ FILES= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ make-localhost -NOOBJ= +NO_OBJ= FILESDIR= /etc/namedb FILESMODE= 644 ==== //depot/projects/wifi/etc/pam.d/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/pam.d/Makefile,v 1.11 2004/10/24 15:32:24 ru Exp $ +# $FreeBSD: src/etc/pam.d/Makefile,v 1.12 2004/12/21 08:46:50 ru Exp $ -NOOBJ= +NO_OBJ= FILES= README ftpd gdm imap kde login other passwd pop3 \ rexecd rsh sshd su system telnetd xdm FILESDIR= /etc/pam.d ==== //depot/projects/wifi/etc/periodic/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.6 2002/07/18 12:32:57 ru Exp $ +# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.7 2004/12/21 08:46:50 ru Exp $ BINDIR= /etc/periodic/${.CURDIR:T} -NOOBJ= +NO_OBJ= FILESMODE= 755 ==== //depot/projects/wifi/etc/rc.d/named#3 (text+ko) ==== @@ -1,12 +1,13 @@ #!/bin/sh # # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/named,v 1.17 2004/12/18 15:19:36 phk Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.19 2004/12/20 18:34:10 peadar Exp $ # # PROVIDE: named # REQUIRE: SERVERS # BEFORE: DAEMON +# KEYWORD: shutdown . /etc/rc.subr @@ -14,6 +15,7 @@ rcvar=`set_rcvar` start_precmd="named_precmd" start_postcmd="make_symlinks" +stop_postcmd="named_poststop" required_dirs="$named_chrootdir" # if it is set, it must exist extra_commands="reload" @@ -81,6 +83,13 @@ ln -fs "${named_chrootdir}${pidfile}" ${pidfile} } +named_poststop() +{ + if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then + umount ${named_chrootdir}/dev 2>/dev/null || true + fi +} + named_precmd() { local confgen_chroot ==== //depot/projects/wifi/games/factor/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/factor/Makefile,v 1.8 2004/02/05 22:44:20 ru Exp $ +# $FreeBSD: src/games/factor/Makefile,v 1.9 2004/12/21 10:15:59 ru Exp $ PROG= factor SRCS= factor.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DHAVE_OPENSSL LDADD= -lcrypto DPADD= ${LIBCRYPTO} ==== //depot/projects/wifi/games/fortune/unstr/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/fortune/unstr/Makefile,v 1.4 2004/10/24 15:32:24 ru Exp $ +# $FreeBSD: src/games/fortune/unstr/Makefile,v 1.5 2004/12/21 08:46:57 ru Exp $ PROG= unstr -NOMAN= +NO_MAN= CFLAGS+=-Wall -I${.CURDIR}/../strfile .include ==== //depot/projects/wifi/games/ppt/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/ppt/Makefile,v 1.4 2004/10/24 15:32:24 ru Exp $ +# $FreeBSD: src/games/ppt/Makefile,v 1.5 2004/12/21 08:46:57 ru Exp $ PROG= ppt -NOMAN= +NO_MAN= WARNS?= 6 ==== //depot/projects/wifi/games/primes/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/primes/Makefile,v 1.2 2004/10/24 15:32:24 ru Exp $ +# $FreeBSD: src/games/primes/Makefile,v 1.3 2004/12/21 08:46:57 ru Exp $ PROG= primes SRCS= pattern.c pr_tbl.c primes.c -NOMAN= +NO_MAN= DPADD= ${LIBM} LDADD= -lm ==== //depot/projects/wifi/gnu/Makefile.inc#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/Makefile.inc,v 1.5 2004/10/24 15:32:24 ru Exp $ +# $FreeBSD: src/gnu/Makefile.inc,v 1.6 2004/12/21 09:33:44 ru Exp $ # Do not lint the GNU stuff. It is all externally maintained and # lint output is wasteful noise here. -NOLINT= +NO_LINT= ==== //depot/projects/wifi/gnu/lib/libdialog/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libdialog -# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.40 2004/10/18 16:39:53 ru Exp $ +# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.41 2004/12/21 12:05:10 ru Exp $ LIB= dialog INCS= dialog.h @@ -20,7 +20,7 @@ LDADD= -lncurses DPADD= ${LIBNCURSES} -.if !defined(NOHTML) +.if !defined(NO_HTML) FILES= ${EXAMPLES:C;^;${.CURDIR}/TESTS/;} FILESDIR= ${SHAREDIR}/examples/libdialog .endif ==== //depot/projects/wifi/gnu/lib/libg2c/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.14 2004/07/28 05:27:18 kan Exp $ +# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.15 2004/12/21 09:33:45 ru Exp $ SRCDIR= ${.CURDIR}/../../../contrib/libf2c @@ -99,13 +99,13 @@ ${E77OBJS}: f2cext.c ${CC} ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} -.if !defined(NOPIC) +.if !defined(NO_PIC) ${E77OBJS:.o=.So}: f2cext.c ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} \ ${.ALLSRC:M*.c} .endif -.if !defined(NOPROFILE) +.if !defined(NO_PROFILE) ${E77OBJS:.o=.po}: f2cext.c ${CC} -p ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 22 13:57:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D17D416A4D0; Wed, 22 Dec 2004 13:57:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3F3616A4CE for ; Wed, 22 Dec 2004 13:57:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31F3043D48 for ; Wed, 22 Dec 2004 13:57:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBMDvsoi047821 for ; Wed, 22 Dec 2004 13:57:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBMDvr0t047818 for perforce@freebsd.org; Wed, 22 Dec 2004 13:57:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 22 Dec 2004 13:57:53 GMT Message-Id: <200412221357.iBMDvr0t047818@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 Subject: PERFORCE change 67522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 13:57:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=67522 Change 67522 by rwatson@rwatson_tislabs on 2004/12/22 13:57:07 Add APSL-required modification notifications where needed. Add additional NETA copyrights in some places. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/BootX/bootx.tproj/include.subproj/boot_args.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/BootX/bootx.tproj/sl.subproj/main.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/parser.y#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/ls.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/print.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.defs#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/rpc_services.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_attrlist.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_cnode.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_extattr.c#6 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_vfsops.c#5 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_vnops.c#6 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/bsd_init.c#6 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/init_sysent.c#8 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_exec.c#6 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_exit.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_fork.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_ktrace.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_malloc.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_prot.c#9 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_resource.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_sig.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/syscalls.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/uipc_usrreq.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/miscfs/devfs/devfs_tree.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/miscfs/devfs/devfs_vfsops.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/miscfs/devfs/devfs_vnops.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/miscfs/devfs/devfsdefs.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/net/bpfdesc.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/net/if_var.h#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/netinet/ip_var.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/errno.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/malloc.h#7 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mbuf.h#5 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mount.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/namei.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/proc.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/socketvar.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/sysctl.h#5 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/ucred.h#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/vnode.h#6 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/vnode_if.h#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_lookup.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_subr.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_support.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_support.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_syscalls.c#14 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_vnops.c#6 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vnode_if.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vnode_if.src#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/device/subrs.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_entry.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_init.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_kmsg.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_kmsg.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_notify.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_object.c#5 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_object.h#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_port.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_port.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_right.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_space.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_space.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/mach_msg.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/mach_port.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/ipc_kobject.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/ipc_tt.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/startup.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/task.c#5 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/task.h#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/libsa/string.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/mach/mach_types.defs#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/mach/message.h#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/mach/port.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ppc/ppc_init.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/pexpert/pexpert/ppc/boot.h#3 edit .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/print.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/BootX/bootx.tproj/include.subproj/boot_args.h#3 (text+ko) ==== @@ -29,6 +29,12 @@ * * DRI: Josh de Cesare */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #ifndef _BOOTX_BOOT_ARGS_H_ #define _BOOTX_BOOT_ARGS_H_ ==== //depot/projects/trustedbsd/sedarwin/apsl/BootX/bootx.tproj/sl.subproj/main.c#4 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. * @@ -29,6 +61,12 @@ * * DRI: Josh de Cesare */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#3 (text+ko) ==== @@ -60,6 +60,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include "strdefs.h" #include "type.h" ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/parser.y#3 (text+ko) ==== @@ -46,6 +46,12 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ %token sySkip %token syRoutine ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.c#3 (text+ko) ==== @@ -46,6 +46,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include "type.h" ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.h#3 (text+ko) ==== @@ -46,6 +46,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.c#3 (text+ko) ==== @@ -46,6 +46,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include "type.h" #include ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.h#3 (text+ko) ==== @@ -34,6 +34,12 @@ * Added itPortType * Added itTidType */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #ifndef _TYPE_H #define _TYPE_H ==== //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/ls.c#4 (text+ko) ==== @@ -1,5 +1,37 @@ /* $NetBSD: ls.c,v 1.31 1998/08/19 01:44:19 thorpej Exp $ */ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. ==== //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/print.c#4 (text+ko) ==== @@ -1,5 +1,37 @@ /* $NetBSD: print.c,v 1.22 1998/07/28 05:15:47 mycroft Exp $ */ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. ==== //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.c#4 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 1999-2002 Apple Computer, Inc. All rights reserved. * @@ -28,6 +60,12 @@ * * bootstrap.c -- implementation of bootstrap main service loop */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ /* * Imports ==== //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.defs#3 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 1999 Apple Computer, Inc. All rights reserved. * @@ -28,6 +60,12 @@ * * bootstrap.defs -- Mig interface definition */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ subsystem bootstrap 400; ==== //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/rpc_services.c#4 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 1999-2002 Apple Computer, Inc. All rights reserved. * @@ -28,6 +60,12 @@ * * rpc_services.c -- implementation of bootstrap rpc services */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #import #import ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs.h#3 (text+ko) ==== @@ -19,6 +19,12 @@ * * @APPLE_LICENSE_HEADER_END@ */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #ifndef __HFS__ #define __HFS__ ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_attrlist.c#4 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved. * @@ -25,6 +57,12 @@ * * Copyright (c) 1998-2002, Apple Computer, Inc. All Rights Reserved. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_cnode.c#3 (text+ko) ==== @@ -19,6 +19,12 @@ * * @APPLE_LICENSE_HEADER_END@ */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_extattr.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_vfsops.c#5 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 1999-2002 Apple Computer, Inc. All rights reserved. * @@ -64,6 +96,12 @@ * hfs_vfsops.c -- VFS layer for loadable HFS file system. * */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_vnops.c#6 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved. * @@ -19,6 +51,12 @@ * * @APPLE_LICENSE_HEADER_END@ */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/bsd_init.c#6 (text+ko) ==== @@ -71,6 +71,12 @@ * 16-Apr-98 A. Ramesh at Apple * Created for Apple Core from DR2 init_main.c. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/init_sysent.c#8 (text+ko) ==== @@ -19,6 +19,12 @@ * * @APPLE_LICENSE_HEADER_END@ */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_exec.c#6 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ /* * Copyright (c) 2000-2001 Apple Computer, Inc. All rights reserved. * @@ -68,6 +100,12 @@ * * from: @(#)kern_exec.c 8.1 (Berkeley) 6/10/93 */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_exit.c#4 (text+ko) ==== @@ -59,6 +59,12 @@ * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_fork.c#4 (text+ko) ==== @@ -59,6 +59,12 @@ * * @(#)kern_fork.c 8.8 (Berkeley) 2/14/95 */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_ktrace.c#4 (text+ko) ==== @@ -55,6 +55,12 @@ * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.35.2.4 2001/03/05 13:09:01 obrien Exp $ */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_malloc.c#3 (text+ko) ==== @@ -54,6 +54,12 @@ * * @(#)kern_malloc.c 8.4 (Berkeley) 5/20/95 */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_prot.c#9 (text+ko) ==== @@ -59,6 +59,12 @@ * * @(#)kern_prot.c 8.9 (Berkeley) 2/14/95 */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ /* * System calls related to processes and protection ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_resource.c#3 (text+ko) ==== @@ -59,6 +59,12 @@ * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_sig.c#3 (text+ko) ==== @@ -59,6 +59,12 @@ * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #define SIGPROP /* include signal properties table */ #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/syscalls.c#3 (text+ko) ==== @@ -20,6 +20,12 @@ * @APPLE_LICENSE_HEADER_END@ */ /* Copyright (c) 1992,1995-1999 Apple Computer, Inc. All rights resereved. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ char *syscallnames[] = { "syscall", /* 0 = syscall */ ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/uipc_usrreq.c#3 (text+ko) ==== @@ -53,6 +53,12 @@ * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/miscfs/devfs/devfs_tree.c#3 (text+ko) ==== @@ -47,6 +47,12 @@ * * devfs_tree.c */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ /* * HISTORY ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/miscfs/devfs/devfs_vfsops.c#3 (text+ko) ==== @@ -53,6 +53,12 @@ * - modified devfs_statfs() to use devfs_stats to calculate the * amount of memory used by devfs */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/miscfs/devfs/devfs_vnops.c#3 (text+ko) ==== @@ -66,6 +66,12 @@ * Dieter Siegmund (dieter@apple.com) Fri Sep 17 09:58:38 PDT 1999 * - update the mod/access times */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/miscfs/devfs/devfsdefs.h#3 (text+ko) ==== @@ -54,7 +54,12 @@ * Removed unnecessary/unused defines * Renamed structures/elements to clarify usage in code. */ - +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #ifndef __DEVFS_DEVFSDEFS_H__ #define __DEVFS_DEVFSDEFS_H__ ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/net/bpfdesc.h#3 (text+ko) ==== @@ -60,6 +60,12 @@ * * $FreeBSD: src/sys/net/bpfdesc.h,v 1.14.2.1 2000/03/19 05:55:36 rwatson Exp $ */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 1.2. + */ #ifndef _NET_BPFDESC_H_ #define _NET_BPFDESC_H_ ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/net/if_var.h#4 (text+ko) ==== @@ -54,6 +54,12 @@ * From: @(#)if.h 8.1 (Berkeley) 6/10/93 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 22 14:05:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98BDE16A4D0; Wed, 22 Dec 2004 14:05:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 739E716A4CE for ; Wed, 22 Dec 2004 14:05:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E51643D4C for ; Wed, 22 Dec 2004 14:05:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBME53MA048033 for ; Wed, 22 Dec 2004 14:05:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBME52ks048030 for perforce@freebsd.org; Wed, 22 Dec 2004 14:05:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 22 Dec 2004 14:05:02 GMT Message-Id: <200412221405.iBME52ks048030@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 Subject: PERFORCE change 67523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 14:05:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=67523 Change 67523 by rwatson@rwatson_tislabs on 2004/12/22 14:04:07 Add a copyright to the head off the bootstrapping instructions. Indicate that our newer Panther-based prototype is preferred. Affected files ... .. //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#30 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#30 (text+ko) ==== @@ -1,5 +1,40 @@ -XXX: These are still draft install instructions, and known to be -potentially flakey. Caution advised, especially near the end. +/*- + * Copyright (c) 2004 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by and Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. + * + * 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. + * + * $FreeBSD$ + */ + +These instructions describe how to update an installed Jaguar 10.2.8 system +to the experimentational SEDarwin implementation provided by McAfee +Research. At the time of this writing, a newer Panther-derived system is +in the works, and is recommended in preference to the Jaguar-derived system. Step 1: Mac OS X Jaguar 10.2.8 From owner-p4-projects@FreeBSD.ORG Wed Dec 22 14:43:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55DA116A4D0; Wed, 22 Dec 2004 14:43:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28A0216A4CE for ; Wed, 22 Dec 2004 14:43:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0083C43D62 for ; Wed, 22 Dec 2004 14:43:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBMEhn6a049276 for ; Wed, 22 Dec 2004 14:43:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBMEhnhq049273 for perforce@freebsd.org; Wed, 22 Dec 2004 14:43:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 22 Dec 2004 14:43:49 GMT Message-Id: <200412221443.iBMEhnhq049273@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 Subject: PERFORCE change 67524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 14:43:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=67524 Change 67524 by rwatson@rwatson_tislabs on 2004/12/22 14:43:39 CHANGELOG for Jaguar drop. Affected files ... .. //depot/projects/trustedbsd/sedarwin/CHANGELOG#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 22 14:44:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B26D16A4E0; Wed, 22 Dec 2004 14:44:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA55116A4D0 for ; Wed, 22 Dec 2004 14:44:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B25B443D31 for ; Wed, 22 Dec 2004 14:44:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBMEipGk049295 for ; Wed, 22 Dec 2004 14:44:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBMEipTe049292 for perforce@freebsd.org; Wed, 22 Dec 2004 14:44:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 22 Dec 2004 14:44:51 GMT Message-Id: <200412221444.iBMEipTe049292@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 Subject: PERFORCE change 67525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 14:44:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=67525 Change 67525 by rwatson@rwatson_tislabs on 2004/12/22 14:44:08 Copyright. Affected files ... .. //depot/projects/trustedbsd/sedarwin/COPYRIGHT#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 22 15:59:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 377B516A4D0; Wed, 22 Dec 2004 15:59:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C1C816A4CE for ; Wed, 22 Dec 2004 15:59:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D018143D41 for ; Wed, 22 Dec 2004 15:59:23 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBMFxNV6052489 for ; Wed, 22 Dec 2004 15:59:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBMFxNkk052486 for perforce@freebsd.org; Wed, 22 Dec 2004 15:59:23 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Dec 2004 15:59:23 GMT Message-Id: <200412221559.iBMFxNkk052486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 15:59:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=67530 Change 67530 by jhb@jhb_slimer on 2004/12/22 15:58:55 Merge in some changes from the jhb_clock child branch. Affected files ... .. //depot/projects/smpng/sys/i386/include/apicvar.h#10 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/apicvar.h#10 (text+ko) ==== @@ -42,7 +42,7 @@ * 0xff (255) +-------------+ * | | 15 (Spurious / IPIs / Local Interrupts) * 0xf0 (240) +-------------+ - * | | 14 (I/O Interrupts) + * | | 14 (I/O Interrupts / Timer) * 0xe0 (224) +-------------+ * | | 13 (I/O Interrupts) * 0xd0 (208) +-------------+ @@ -81,7 +81,10 @@ /* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ #define APIC_IO_INTS (IDT_IO_INTS + 16) -#define APIC_NUM_IOINTS 192 +#define APIC_NUM_IOINTS 191 + +/* The timer interrupt is used for clock handling and drives hardclock, etc. */ +#define APIC_TIMER_INT (APIC_IO_INTS + APIC_NUM_IOINTS) /* ********************* !!! WARNING !!! ****************************** @@ -103,20 +106,12 @@ * other deadlocks caused by IPI_STOP. */ -/* Clock interrupts are used for clock handling and drive hardclock, etc. */ -#define APIC_CLOCK_INTS (APIC_IO_INTS + APIC_NUM_IOINTS) -#define APIC_TIMER_INT APIC_CLOCK_INTS -#if 0 -#define IPI_HARDCLOCK (APIC_CLOCK_INTS + 1) /* Inter-CPU clock handling. */ -#define IPI_STATCLOCK (APIC_CLOCK_INTS + 2) -#endif - /* * These interrupt handlers are for IPIs and local interrupts whose handlers * do not use any spin locks, so they may still be allowed when a spin lock * is held. */ -#define APIC_LOCK_SAFE_INTS (APIC_CLOCK_INTS + 3) +#define APIC_LOCK_SAFE_INTS (APIC_TIMER_INT + 1) /* Interrupts for local APIC LVT entries other than the timer. */ #define APIC_LOCAL_INTS APIC_LOCK_SAFE_INTS @@ -142,7 +137,8 @@ #define IPI_STOP (APIC_IPI_INTS + 6) /* Stop CPU until restarted. */ -/* The spurious interrupt can share the priority class with the IPIs since +/* + * The spurious interrupt can share the priority class with the IPIs since * it is not a normal interrupt. (Does not use the APIC's interrupt fifo) */ #define APIC_SPURIOUS_INT 255 From owner-p4-projects@FreeBSD.ORG Wed Dec 22 17:39:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC95F16A4CE; Wed, 22 Dec 2004 17:39:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9432F16A4F4 for ; Wed, 22 Dec 2004 17:39:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 694F343D2D for ; Wed, 22 Dec 2004 17:39:29 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBMHdTnm063235 for ; Wed, 22 Dec 2004 17:39:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBMHdTHs063232 for perforce@freebsd.org; Wed, 22 Dec 2004 17:39:29 GMT (envelope-from sam@freebsd.org) Date: Wed, 22 Dec 2004 17:39:29 GMT Message-Id: <200412221739.iBMHdTHs063232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 17:39:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=67541 Change 67541 by sam@sam_ebb on 2004/12/22 17:39:12 s/inline/__inline/ Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_acl.c#3 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_acl.c#3 (text+ko) ==== @@ -116,7 +116,7 @@ FREE(as, M_DEVBUF); } -static inline struct acl * +static __inline struct acl * _find_acl(struct aclstate *as, const u_int8_t *macaddr) { struct acl *acl; From owner-p4-projects@FreeBSD.ORG Wed Dec 22 20:21:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5747916A4D0; Wed, 22 Dec 2004 20:21:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 249E216A4CE for ; Wed, 22 Dec 2004 20:21:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F232943D46 for ; Wed, 22 Dec 2004 20:21:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBMKLrhg068615 for ; Wed, 22 Dec 2004 20:21:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBMKLrdH068612 for perforce@freebsd.org; Wed, 22 Dec 2004 20:21:53 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Dec 2004 20:21:53 GMT Message-Id: <200412222021.iBMKLrdH068612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 20:21:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=67549 Change 67549 by jhb@jhb_twclab on 2004/12/22 20:20:53 APIC_CLOCK_INTS isn't the start of the last vector set anymore. Affected files ... .. //depot/projects/smpng/sys/i386/i386/local_apic.c#19 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#19 (text+ko) ==== @@ -60,8 +60,8 @@ #define MAX_APICID 16 /* Sanity checks on IDT vectors. */ -CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_CLOCK_INTS); -CTASSERT(APIC_CLOCK_INTS == 240); +CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_LOCAL_INTS); +CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); /* From owner-p4-projects@FreeBSD.ORG Wed Dec 22 20:24:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FCAE16A4D0; Wed, 22 Dec 2004 20:24:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6025416A4CE for ; Wed, 22 Dec 2004 20:24:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E3BD43D5D for ; Wed, 22 Dec 2004 20:24:58 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBMKOwRZ068703 for ; Wed, 22 Dec 2004 20:24:58 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBMKOwh4068700 for perforce@freebsd.org; Wed, 22 Dec 2004 20:24:58 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Dec 2004 20:24:58 GMT Message-Id: <200412222024.iBMKOwh4068700@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 20:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=67551 Change 67551 by jhb@jhb_twclab on 2004/12/22 20:24:10 Fixup assertions. Affected files ... .. //depot/projects/smpng/sys/i386/i386/local_apic.c#20 edit .. //depot/user/jhb/clock/i386/i386/local_apic.c#35 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#20 (text+ko) ==== @@ -60,7 +60,8 @@ #define MAX_APICID 16 /* Sanity checks on IDT vectors. */ -CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_LOCAL_INTS); +CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); +CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); ==== //depot/user/jhb/clock/i386/i386/local_apic.c#35 (text+ko) ==== @@ -60,7 +60,8 @@ #define MAX_APICID 16 /* Sanity checks on IDT vectors. */ -CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_LOCAL_INTS); +CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); +CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); From owner-p4-projects@FreeBSD.ORG Thu Dec 23 18:24:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D859F16A4D0; Thu, 23 Dec 2004 18:24:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC0D016A4CE for ; Thu, 23 Dec 2004 18:24:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AFBB43D39 for ; Thu, 23 Dec 2004 18:24:47 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNIOlLA072188 for ; Thu, 23 Dec 2004 18:24:47 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNIOlW3072185 for perforce@freebsd.org; Thu, 23 Dec 2004 18:24:47 GMT (envelope-from areisse@nailabs.com) Date: Thu, 23 Dec 2004 18:24:47 GMT Message-Id: <200412231824.iBNIOlW3072185@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 18:24:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=67592 Change 67592 by areisse@areisse_tislabs on 2004/12/23 18:23:47 Install flask generated files from the new policy to the kernel. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_perm_to_string.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_permissions.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/initial_sid_to_string.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask.h#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_perm_to_string.h#6 (text+ko) ==== @@ -31,6 +31,9 @@ { SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto" }, { SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn" }, { SECCLASS_TCP_SOCKET, TCP_SOCKET__ACCEPTFROM, "acceptfrom" }, + { SECCLASS_TCP_SOCKET, TCP_SOCKET__NODE_BIND, "node_bind" }, + { SECCLASS_UDP_SOCKET, UDP_SOCKET__NODE_BIND, "node_bind" }, + { SECCLASS_RAWIP_SOCKET, RAWIP_SOCKET__NODE_BIND, "node_bind" }, { SECCLASS_NODE, NODE__TCP_RECV, "tcp_recv" }, { SECCLASS_NODE, NODE__TCP_SEND, "tcp_send" }, { SECCLASS_NODE, NODE__UDP_RECV, "udp_recv" }, @@ -76,6 +79,7 @@ { SECCLASS_MSG, MSG__SEND, "send" }, { SECCLASS_MSG, MSG__RECEIVE, "receive" }, { SECCLASS_MSG, MSG__DESTROY, "destroy" }, + { SECCLASS_SHM, SHM__LOCK, "lock" }, { SECCLASS_POSIX_SEM, POSIX_SEM__ASSOCIATE, "associate" }, { SECCLASS_POSIX_SEM, POSIX_SEM__DISASSOCIATE, "disassociate" }, { SECCLASS_POSIX_SEM, POSIX_SEM__DESTROY, "destroy" }, @@ -141,6 +145,8 @@ { SECCLASS_PASSWD, PASSWD__PASSWD, "passwd" }, { SECCLASS_PASSWD, PASSWD__CHFN, "chfn" }, { SECCLASS_PASSWD, PASSWD__CHSH, "chsh" }, + { SECCLASS_PASSWD, PASSWD__ROOTOK, "rootok" }, + { SECCLASS_PASSWD, PASSWD__CRONTAB, "crontab" }, }; #define AV_PERM_TO_STRING_SIZE (sizeof(av_perm_to_string)/sizeof(av_perm_to_string_t)) ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_permissions.h#7 (text+ko) ==== @@ -280,6 +280,7 @@ #define TCP_SOCKET__CONNECTTO 0x0000000001000000UL #define TCP_SOCKET__NEWCONN 0x0000000002000000UL #define TCP_SOCKET__ACCEPTFROM 0x0000000004000000UL +#define TCP_SOCKET__NODE_BIND 0x0000000008000000UL #define UDP_SOCKET__TRANSITION 0x0000000000000400UL #define UDP_SOCKET__SHUTDOWN 0x0000000000040000UL @@ -306,6 +307,8 @@ #define UDP_SOCKET__IOCTL 0x0000000000000002UL #define UDP_SOCKET__RELABELTO 0x0000000000000200UL +#define UDP_SOCKET__NODE_BIND 0x0000000001000000UL + #define RAWIP_SOCKET__TRANSITION 0x0000000000000400UL #define RAWIP_SOCKET__SHUTDOWN 0x0000000000040000UL #define RAWIP_SOCKET__POLL 0x0000000000000001UL @@ -331,6 +334,8 @@ #define RAWIP_SOCKET__IOCTL 0x0000000000000002UL #define RAWIP_SOCKET__RELABELTO 0x0000000000000200UL +#define RAWIP_SOCKET__NODE_BIND 0x0000000001000000UL + #define NODE__TCP_RECV 0x0000000000000001UL #define NODE__TCP_SEND 0x0000000000000002UL #define NODE__UDP_RECV 0x0000000000000004UL @@ -547,6 +552,8 @@ #define SHM__DESTROY 0x0000000000000002UL #define SHM__GETATTR 0x0000000000000004UL +#define SHM__LOCK 0x0000000000000200UL + #define POSIX_SEM__ASSOCIATE 0x0000000000000001UL #define POSIX_SEM__DISASSOCIATE 0x0000000000000002UL #define POSIX_SEM__DESTROY 0x0000000000000004UL @@ -616,6 +623,8 @@ #define PASSWD__PASSWD 0x0000000000000001UL #define PASSWD__CHFN 0x0000000000000002UL #define PASSWD__CHSH 0x0000000000000004UL +#define PASSWD__ROOTOK 0x0000000000000008UL +#define PASSWD__CRONTAB 0x0000000000000010UL /* FLASK */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/initial_sid_to_string.h#5 (text+ko) ==== @@ -26,10 +26,8 @@ "sysctl_vm", "sysctl_dev", "kmod", - "devfs", - "devpts", - "nfs", "policy", - "tmpfs", + "scmp_packet", + "devnull", }; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask.h#6 (text+ko) ==== @@ -66,12 +66,10 @@ #define SECINITSID_SYSCTL_VM 22 #define SECINITSID_SYSCTL_DEV 23 #define SECINITSID_KMOD 24 -#define SECINITSID_DEVFS 25 -#define SECINITSID_DEVPTS 26 -#define SECINITSID_NFS 27 -#define SECINITSID_POLICY 28 -#define SECINITSID_TMPFS 29 +#define SECINITSID_POLICY 25 +#define SECINITSID_SCMP_PACKET 26 +#define SECINITSID_DEVNULL 27 -#define SECINITSID_NUM 29 +#define SECINITSID_NUM 27 #endif From owner-p4-projects@FreeBSD.ORG Thu Dec 23 19:20:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4E5716A4D0; Thu, 23 Dec 2004 19:20:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 878AB16A4CE for ; Thu, 23 Dec 2004 19:20:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6150D43D2D for ; Thu, 23 Dec 2004 19:20:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNJKuqg074650 for ; Thu, 23 Dec 2004 19:20:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNJKu7B074647 for perforce@freebsd.org; Thu, 23 Dec 2004 19:20:56 GMT (envelope-from jhb@freebsd.org) Date: Thu, 23 Dec 2004 19:20:56 GMT Message-Id: <200412231920.iBNJKu7B074647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 19:20:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=67595 Change 67595 by jhb@jhb_slimer on 2004/12/23 19:20:04 Defer tty_close() until the very end of ttyclose() since tty_close() may remove the last reference to 'tp' via ttyrel() resulting in it being free'd. Affected files ... .. //depot/projects/smpng/sys/kern/tty.c#54 edit Differences ... ==== //depot/projects/smpng/sys/kern/tty.c#54 (text+ko) ==== @@ -3172,10 +3172,10 @@ ttyldoptim(tp); if (tp->t_close != NULL) tp->t_close(tp); - tty_close(tp); tp->t_do_timestamp = 0; if (tp->t_pps != NULL) tp->t_pps->ppsparam.mode = 0; + tty_close(tp); return (0); } From owner-p4-projects@FreeBSD.ORG Thu Dec 23 19:56:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DEA816A4D0; Thu, 23 Dec 2004 19:56:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E11C416A4CE for ; Thu, 23 Dec 2004 19:56:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69A9143D31 for ; Thu, 23 Dec 2004 19:56:40 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNJueLI076026 for ; Thu, 23 Dec 2004 19:56:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNJudXs076023 for perforce@freebsd.org; Thu, 23 Dec 2004 19:56:39 GMT (envelope-from jhb@freebsd.org) Date: Thu, 23 Dec 2004 19:56:39 GMT Message-Id: <200412231956.iBNJudXs076023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 19:56:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=67597 Change 67597 by jhb@jhb_slimer on 2004/12/23 19:56:09 IFC @67594. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#6 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#4 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/smpng/sys/boot/Makefile#18 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#6 integrate .. //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/arc/loader/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#18 integrate .. //depot/projects/smpng/sys/boot/i386/mbr/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/pc98/boot0.5/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot0/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#13 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#13 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#16 integrate .. //depot/projects/smpng/sys/conf/NOTES#87 integrate .. //depot/projects/smpng/sys/conf/files.amd64#26 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#12 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#14 integrate .. //depot/projects/smpng/sys/crypto/rijndael/Makefile#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#25 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#11 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#51 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#26 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#7 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.h#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.c#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#5 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#57 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbd.c#13 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbdreg.h#2 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#15 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#24 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#13 integrate .. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#5 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#13 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#28 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#13 integrate .. //depot/projects/smpng/sys/dev/twe/tweio.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#67 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#66 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#37 integrate .. //depot/projects/smpng/sys/geom/geom.h#43 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#13 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#5 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#3 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#50 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#51 integrate .. //depot/projects/smpng/sys/kern/tty.c#55 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#36 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#11 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#63 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#39 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#44 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#40 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#90 integrate .. //depot/projects/smpng/sys/modules/Makefile#88 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/cp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/if_gif/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/ipfilter/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#17 integrate .. //depot/projects/smpng/sys/modules/netgraph/fec/sample_startup#2 delete .. //depot/projects/smpng/sys/modules/pf/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/smpng/sys/net/bpf.c#43 integrate .. //depot/projects/smpng/sys/net/if_tap.c#31 integrate .. //depot/projects/smpng/sys/net/if_tun.c#38 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#29 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.c#7 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#61 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#22 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#31 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#36 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#14 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#44 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#45 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#12 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#41 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#39 integrate .. //depot/projects/smpng/sys/sys/proc.h#136 integrate .. //depot/projects/smpng/sys/sys/syscall.h#49 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#49 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#51 integrate .. //depot/projects/smpng/sys/sys/umtx.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#53 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#63 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#39 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.512 2004/12/15 19:55:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.513 2004/12/21 19:25:56 alc Exp $"); /* * Manages physical address maps. @@ -858,7 +858,7 @@ if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) { pa = DMAP_TO_PHYS(va); } else { - pde = pmap_pde(kernel_pmap, va); + pde = vtopde(va); if (*pde & PG_PS) { pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); } else { ==== //depot/projects/smpng/sys/arm/conf/SIMICS#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.6 2004/11/07 23:02:15 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.7 2004/12/18 17:58:49 cognet Exp $ machine arm ident SIMICS @@ -40,7 +40,6 @@ options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=65535 options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server ==== //depot/projects/smpng/sys/arm/include/atomic.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.3 2004/11/05 23:48:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.4 2004/12/18 17:43:01 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -75,7 +75,7 @@ __swp(uint32_t val, volatile uint32_t *ptr) { __asm __volatile("swp %0, %1, [%2]" - : "=r" (val) : "r" (val) , "r" (ptr) : "memory"); + : "=&r" (val) : "r" (val) , "r" (ptr) : "memory"); return (val); } ==== //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#7 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.7 2004/11/20 16:51:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.8 2004/12/18 17:58:49 cognet Exp $"); #include "opt_md.h" @@ -134,7 +134,7 @@ struct pcpu *pcpup = &__pcpu; #ifndef MD_ROOT_SIZE -#error SIMICS needs MD_ROOT and MD_ROOT_SIZE +#define MD_ROOT_SIZE 65535 #endif /* Physical and virtual addresses for some global pages */ @@ -400,14 +400,14 @@ pmap_curmaxkvaddr = freemempos + KERNEL_PT_VMDATA_NUM * 0x400000; - pmap_bootstrap(KERNEL_VM_BASE, + pmap_bootstrap(freemempos, 0xd0000000, &kernel_l1pt); mutex_init(); - phys_avail[0] = round_page(freemempos); + phys_avail[0] = round_page(virtual_avail); phys_avail[1] = 0xc0000000 + 0x02000000 - 1; phys_avail[2] = 0; phys_avail[3] = 0; ==== //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#3 (text+ko) ==== @@ -76,7 +76,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.2 2004/09/23 22:33:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.3 2004/12/18 17:58:49 cognet Exp $"); #include #include @@ -115,16 +115,26 @@ return(bus_space_read_4(sc->sc_iot, sc->sc_ioh, SAIPIC_IP)); } +static uint32_t sa11x0_irq_mask = 0xfffffff; + +extern vm_offset_t saipic_base; + void arm_mask_irqs(int irq) { - /* XXX */ + + sa11x0_irq_mask &= ~irq; + __asm __volatile("str %0, [%1, #0x04]" /* SAIPIC_MR */ + : : "r" (sa11x0_irq_mask), "r" (saipic_base)); } void arm_unmask_irqs(int irq) { - /* XXX */ + + sa11x0_irq_mask |= irq; + __asm __volatile("str %0, [%1, #0x04]" /* SAIPIC_MR */ + : : "r" (sa11x0_irq_mask), "r" (saipic_base)); } void stray_irqhandler(void *); ==== //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.1 2004/09/23 22:45:36 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.2 2004/12/21 11:36:09 cognet Exp $"); #include #include @@ -236,7 +236,7 @@ struct i80321_pci_softc *sc = device_get_softc(dev); uint32_t addr; - if (i80321_pci_conf_setup(sc, bus, slot, func, reg, &addr)) + if (i80321_pci_conf_setup(sc, bus, slot, func, reg & ~3, &addr)) return; @@ -244,10 +244,12 @@ addr); switch (bytes) { case 1: - bus_space_write_1(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data); + bus_space_write_1(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR + + (reg & 3), data); break; case 2: - bus_space_write_2(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data); + bus_space_write_2(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR + + (reg & 3), data); break; case 4: bus_space_write_4(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data); @@ -266,7 +268,6 @@ int func; uint32_t busno; struct i80321_pci_softc *sc = device_get_softc(pcib); - bus = pci_get_bus(dev); device = pci_get_slot(dev); func = pci_get_function(dev); @@ -293,6 +294,10 @@ goto no_mapping; /* IQ80321 PCI */ case 4: /* i82544 Gig-E */ + case 8: /* + * Apparently you can set the device for the ethernet adapter + * to 8 with a jumper, so handle that as well + */ if (pin == 1) return (ICU_INT_XINT(0)); goto no_mapping; @@ -362,7 +367,10 @@ case SYS_RES_MEMORY: rm = &sc->sc_mem_rman; bt = sc->sc_pcimem; - bh = sc->sc_mem; + bh = (start >= 0x80000000 && start < 0x84000000) ? 0x80000000 : + sc->sc_mem; + start &= (0x1000000 - 1); + end &= (0x1000000 - 1); break; case SYS_RES_IOPORT: rm = &sc->sc_io_rman; ==== //depot/projects/smpng/sys/boot/Makefile#18 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.25 2004/11/23 05:52:00 marcel Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.26 2004/12/21 12:32:13 ru Exp $ -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Build the add-in FORTH interpreter. SUBDIR+= ficl .endif ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#8 (text+ko) ==== @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.17 2004/02/11 22:01:17 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.18 2004/12/21 08:47:11 ru Exp $ PROG= boot1.sym INTERNALPROG= -NOMAN= +NO_MAN= LINKS= ${BINDIR}/boot1 ${BINDIR}/boot .PATH: ${.CURDIR}/../libalpha ==== //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.9 2004/12/21 08:47:12 ru Exp $ BOOT= cdboot -NOMAN= +NO_MAN= NEWVERSWHAT= "SRM CD9660 boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} ==== //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.19 2004/08/22 00:26:01 marcel Exp $ +# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.20 2004/12/21 12:32:13 ru Exp $ # # Common Alpha loader build rules @@ -15,7 +15,7 @@ .PATH: ${.CURDIR}/../libalpha -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH ==== //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#4 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.11 2004/02/11 22:01:17 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.12 2004/12/21 08:47:12 ru Exp $ # $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $ BOOT= netboot -NOMAN= +NO_MAN= NEWVERSWHAT= "SRM net boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} ==== //depot/projects/smpng/sys/boot/arc/loader/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $ -# $FreeBSD: src/sys/boot/arc/loader/Makefile,v 1.7 2002/05/10 09:26:30 obrien Exp $ +# $FreeBSD: src/sys/boot/arc/loader/Makefile,v 1.8 2004/12/21 08:47:12 ru Exp $ BASE= loader PROG= ${BASE}.exe -NOMAN= +NO_MAN= NEWVERSWHAT= "ARC disk boot" ${MACHINE_ARCH} .PATH: ${.CURDIR}/../common ==== //depot/projects/smpng/sys/boot/i386/boot0/Makefile#11 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.30 2004/08/27 00:18:03 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.31 2004/12/21 08:47:13 ru Exp $ PROG?= boot0 STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.S # The default set of flags compiled into boot0. This enables update (writing ==== //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#7 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.18 2004/04/27 19:45:15 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.19 2004/12/21 08:47:13 ru Exp $ PROG= btx INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btx.S .if defined(PAGING) ==== //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#7 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.17 2004/04/27 19:45:16 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.18 2004/12/21 08:47:13 ru Exp $ PROG= btxldr INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxldr.S CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS} ==== //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#7 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.12 2004/02/09 14:11:57 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $ PROG= crt0.o INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxcsu.s btxsys.s btxv86.s LDFLAGS=-Wl,-r ==== //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#6 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.12 2004/04/28 21:31:20 ru Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $ PROG= cdboot STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.s ORG= 0x7c00 ==== //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#12 (text+ko) ==== @@ -1,15 +1,15 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.20 2004/02/12 22:06:33 ru Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.22 2004/12/21 09:59:44 ru Exp $ PROG= kgzldr.o STRIP= BINMODE=${LIBMODE} BINDIR= ${LIBDIR} -NOMAN= +NO_MAN= SRCS= start.s boot.c inflate.c lib.c crt.s sio.s CFLAGS= -Os CFLAGS+=-DKZIP -NOSHARED= +NO_SHARED= LDFLAGS=-Wl,-r .PATH: ${.CURDIR}/../../../kern ==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.78 2004/11/29 09:31:04 ru Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.79 2004/12/21 12:32:14 ru Exp $ PROG= loader.sym INTERNALPROG= @@ -18,7 +18,7 @@ HAVE_PNP= yes HAVE_ISABUS= yes -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 ==== //depot/projects/smpng/sys/boot/i386/mbr/Makefile#8 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.14 2004/08/28 08:39:35 yar Exp $ +# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.15 2004/12/21 08:47:15 ru Exp $ PROG= mbr STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.s # MBR flags: 0x80 -- try packet interface (also known as EDD or LBA) ==== //depot/projects/smpng/sys/boot/ia64/efi/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.24 2004/11/28 00:26:11 marcel Exp $ +# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.26 2004/12/21 12:32:14 ru Exp $ PROG= loader.sym INTERNALPROG= SRCS= conf.c dev_net.c efimd.c main.c start.S vers.c -NOMAN= +NO_MAN= CFLAGS+= -DLOADER CFLAGS+= -I${.CURDIR}/../../efi/include @@ -11,7 +11,7 @@ CFLAGS+= -I${.CURDIR}/../../efi/libefi CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -.if !defined(NOFORTH) +.if !defined(NO_FORTH) BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl ==== //depot/projects/smpng/sys/boot/ia64/ski/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.16 2004/09/24 04:06:22 marcel Exp $ +# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.18 2004/12/21 12:32:14 ru Exp $ PROG= skiload -NOMAN= +NO_MAN= NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} STRIP= # We must not strip skiload at install time. @@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} LDFLAGS= -Wl,-T${.CURDIR}/ldscript.ia64 -.if !defined(NOFORTH) +.if !defined(NO_FORTH) CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_ARCH} ==== //depot/projects/smpng/sys/boot/pc98/boot0.5/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.3 2004/02/09 16:01:45 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} -NOMAN= +NO_MAN= SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s CLEANFILES= ${BOOT} ${BOOT}.bin ==== //depot/projects/smpng/sys/boot/pc98/boot0/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/pc98/boot0/Makefile,v 1.3 2004/02/09 16:01:45 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} -NOMAN= +NO_MAN= SRCS= ${BOOT}.s CLEANFILES= ${BOOT} ==== //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.19 2004/09/18 00:12:04 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.21 2004/12/21 09:59:44 ru Exp $ # PROG= boot @@ -49,8 +49,8 @@ CLEANFILES+= boot.nohdr boot.strip boot.ldr boot1 boot2 sizetest LDFLAGS+= -N -Ttext 0 -e start -NOSHARED= YES -NOMAN= +NO_SHARED= YES +NO_MAN= STRIP= # tunable timeout parameter, waiting for keypress, calibrated in ms ==== //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#7 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.10 2004/04/29 08:24:30 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.11 2004/12/21 08:47:17 ru Exp $ PROG= btx INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btx.S CFLAGS+=-DPC98 ==== //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#6 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/pc98/btx/btxldr/Makefile,v 1.8 2004/04/29 08:24:57 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/btx/btxldr/Makefile,v 1.9 2004/12/21 08:47:17 ru Exp $ PROG= btxldr INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxldr.S CFLAGS+=-DPC98 ==== //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#6 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.9 2004/02/09 16:01:45 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.10 2004/12/21 08:47:18 ru Exp $ PROG= crt0.o INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxcsu.s btxsys.s btxv86.s LDFLAGS=-Wl,-r ==== //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#10 (text+ko) ==== @@ -1,15 +1,15 @@ -# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.14 2004/02/13 15:24:25 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.16 2004/12/21 09:59:44 ru Exp $ PROG= kgzldr.o STRIP= BINMODE=${LIBMODE} BINDIR= ${LIBDIR} -NOMAN= +NO_MAN= SRCS= start.s boot.c inflate.c lib.c crt.s sio.s CFLAGS= -Os CFLAGS+=-DKZIP -NOSHARED= +NO_SHARED= LDFLAGS=-Wl,-r .PATH: ${.CURDIR}/../../../kern .PATH: ${.CURDIR}/../../i386/kgzldr ==== //depot/projects/smpng/sys/boot/pc98/loader/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.36 2004/11/29 11:55:14 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.37 2004/12/21 12:32:15 ru Exp $ PROG= loader.sym INTERNALPROG= @@ -20,7 +20,7 @@ HAVE_PNP= yes HAVE_ISABUS= yes -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 ==== //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.17 2004/08/18 11:31:00 grehan Exp $ +# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.18 2004/12/21 12:32:15 ru Exp $ PROG= loader NEWVERSWHAT= "bootstrap loader" "Open Firmware/PowerPC" @@ -46,7 +46,7 @@ CFLAGS+= -DLOADER_TFTP_SUPPORT .endif -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc ==== //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#8 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.10 2004/02/11 21:17:04 ru Exp $ +# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.11 2004/12/21 08:47:18 ru Exp $ PROG= boot1.elf INTERNALPROG= -NOMAN= +NO_MAN= FILES= boot1 SRCS= _start.s boot1.c ==== //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.18 2004/08/16 15:45:25 marius Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.19 2004/12/21 12:32:15 ru Exp $ PROG= loader NEWVERSWHAT= "bootstrap loader" sparc64 @@ -41,7 +41,7 @@ CFLAGS+= -DLOADER_TFTP_SUPPORT .endif -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/sparc64 ==== //depot/projects/smpng/sys/conf/NOTES#87 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1289 2004/11/20 02:32:15 das Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1290 2004/12/20 04:22:41 sam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -525,8 +525,17 @@ # The `vlan' device implements the VLAN tagging of Ethernet frames # according to IEEE 802.1Q. It requires `device miibus'. # The `wlan' device provides generic code to support 802.11 -# drivers, including host AP mode; it is MANDATORY for the wi -# driver and will eventually be required by all 802.11 drivers. +# drivers, including host AP mode; it is MANDATORY for the wi, +# ath, and awi drivers and will eventually be required by all 802.11 drivers. +# The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide +# support for WEP, TKIP, and AES-CCMP crypto protocols optionally +# used with 802.11 devices that depend on the `wlan' module. +# The `wlan_xauth' device provides support for external (i.e. user-mode) +# authenticators for use with 802.11 drivers that use the `wlan' +# module and supoprt 802.1x and/or WPA security protocols. +# The `wlan_acl' device provides a MAC-based access control mechanism +# for use with 802.11 drivers operating in ap mode and using the +# `wlan' module. # The `fddi' device provides generic code to support FDDI. # The `arcnet' device provides generic code to support Arcnet. # The `sppp' device serves a similar role for certain types @@ -570,6 +579,11 @@ device ether #Generic Ethernet device vlan #VLAN support (needs miibus) device wlan #802.11 support +device wlan_wep #802.11 WEP support +device wlan_ccmp #802.11 CCMP support +device wlan_tkip #802.11 TKIP support +device wlan_xauth #802.11 external authenticator support +device wlan_acl #802.11 MAC ACL support device token #Generic TokenRing device fddi #Generic FDDI device arcnet #Generic Arcnet ==== //depot/projects/smpng/sys/conf/files.amd64#26 (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.amd64,v 1.52 2004/12/15 02:21:23 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.54 2004/12/21 02:08:14 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,7 +28,7 @@ # ia32_assym.h standard \ dependency "$S/kern/genassym.sh ia32_genassym.o" \ - compile-with "env NM=${NM} sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \ + compile-with "env NM='${NM}' sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \ no-obj no-implicit-rule before-depend \ clean "ia32_assym.h" # @@ -57,7 +57,6 @@ no-obj no-implicit-rule before-depend \ clean "opt_ah.h" # -dev/acpica/acpi_if.m standard amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi @@ -121,6 +120,7 @@ crypto/des/des_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional netsmbcrypto crypto/des/des_setkey.c optional netsmbcrypto +dev/acpica/acpi_if.m standard dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#14 (text+ko) ==== @@ -100,7 +100,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.39 2004/06/29 03:39:06 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.40 2004/12/16 21:02:15 darrenr Exp $"; #endif #ifndef _KERNEL @@ -2433,7 +2433,12 @@ ATOMIC_INCL(frstats[out].fr_pull[0]); qf->qf_data = MTOD(m, char *) + ipoff; # else - m = m_pullup(m, len); +# if (__FreeBSD_version >= 490000) + if ((len > MHLEN) && ((m->m_flags & M_PKTHDR) != 0)) + m = m_defrag(m, M_DONTWAIT); + else +# endif + m = m_pullup(m, len); *fin->fin_mp = m; if (m == NULL) { ATOMIC_INCL(frstats[out].fr_pull[1]); ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#12 (text+ko) ==== @@ -111,7 +111,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.37.2.44 2001/07/21 07:17:22 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.34 2004/06/21 22:46:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.37 2004/12/18 03:47:54 mlaier Exp $"; #endif nat_t **nat_table[2] = { NULL, NULL }, @@ -132,7 +132,7 @@ fr_defnaticmpage = 6; /* 3 seconds */ natstat_t nat_stats; int fr_nat_lock = 0; -#if (SOLARIS || defined(__sgi)) && defined(_KERNEL) +#ifdef USE_MUTEX extern kmutex_t ipf_rw; extern KRWLOCK_T ipf_nat; #endif @@ -2613,8 +2613,10 @@ hv = NAT_HASH_FN(iph, 0, ipf_rdrrules_sz); for (np = rdr_rules[hv]; np; np = np->in_rnext) { if ((np->in_ifp && (np->in_ifp != ifp)) || - (np->in_p && (np->in_p != fin->fin_p)) || - (np->in_flags && !(nflags & np->in_flags))) + (np->in_p && (np->in_p != fin->fin_p))) + continue; + if ((np->in_flags & IPN_RF) && + !(nflags & np->in_flags)) continue; if (np->in_flags & IPN_FILTER) { if (!nat_match(fin, np, ip)) @@ -2877,11 +2879,14 @@ struct nat *nat; u_int type; { +# ifndef LARGE_NAT struct ipnat *np; + int rulen; +# endif struct natlog natl; void *items[1]; size_t sizes[1]; - int rulen, types[1]; + int types[1]; natl.nl_inip = nat->nat_inip; natl.nl_outip = nat->nat_outip; ==== //depot/projects/smpng/sys/contrib/pf/net/pf.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.24 2004/12/05 12:15:43 dhartmei Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.25 2004/12/19 19:43:04 dhartmei Exp $ */ /* $OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */ /* add $OpenBSD: pf.c,v 1.448 2004/05/11 07:34:11 dhartmei Exp $ */ @@ -2087,6 +2087,8 @@ get_addr: PF_ACPY(naddr, &rpool->counter, af); + if (init_addr != NULL && PF_AZERO(init_addr, af)) + PF_ACPY(init_addr, naddr, af); PF_AINC(&rpool->counter, af); break; } @@ -2129,7 +2131,7 @@ * similar 2 portloop in in_pcbbind */ if (!(proto == IPPROTO_TCP || proto == IPPROTO_UDP)) { - key.gwy.port = 0; + key.gwy.port = dport; if (pf_find_state_all(&key, PF_EXT_GWY, NULL) == NULL) return (0); } else if (low == 0 && high == 0) { @@ -3405,7 +3407,7 @@ if (direction == PF_OUT) { /* check outgoing packet for BINAT/NAT */ if ((nr = pf_get_translation(pd, m, off, PF_OUT, kif, &nsn, - saddr, 0, daddr, 0, &pd->naddr, NULL)) != NULL) { + saddr, icmpid, daddr, icmpid, &pd->naddr, NULL)) != NULL) { PF_ACPY(&pd->baddr, saddr, af); switch (af) { #ifdef INET @@ -3429,7 +3431,7 @@ } else { /* check incoming packet for BINAT/RDR */ if ((nr = pf_get_translation(pd, m, off, PF_IN, kif, &nsn, - saddr, 0, daddr, 0, &pd->naddr, NULL)) != NULL) { + saddr, icmpid, daddr, icmpid, &pd->naddr, NULL)) != NULL) { PF_ACPY(&pd->baddr, daddr, af); switch (af) { #ifdef INET ==== //depot/projects/smpng/sys/crypto/rijndael/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/crypto/rijndael/Makefile,v 1.2 2004/10/24 15:32:50 ru Exp $ +# $FreeBSD: src/sys/crypto/rijndael/Makefile,v 1.3 2004/12/21 08:47:18 ru Exp $ PROG=test00 -NOMAN= +NO_MAN= SRCS= ${PROG}.c rijndael-alg-fst.c rijndael-api-fst.c CFLAGS += -I${.CURDIR}/../.. -g -static ==== //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 23 20:15:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E88716A4D0; Thu, 23 Dec 2004 20:15:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D543216A4CE for ; Thu, 23 Dec 2004 20:15:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE9FE43D31 for ; Thu, 23 Dec 2004 20:15:03 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNKF3ZZ076647 for ; Thu, 23 Dec 2004 20:15:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNKF3BL076644 for perforce@freebsd.org; Thu, 23 Dec 2004 20:15:03 GMT (envelope-from jhb@freebsd.org) Date: Thu, 23 Dec 2004 20:15:03 GMT Message-Id: <200412232015.iBNKF3BL076644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 20:15:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=67599 Change 67599 by jhb@jhb_slimer on 2004/12/23 20:14:30 IFC @67596 (loop back). Affected files ... .. //depot/projects/smpng/sys/i386/i386/local_apic.c#21 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#11 integrate Differences ... ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#21 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.9 2004/07/14 18:12:15 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.10 2004/12/23 19:47:58 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/i386/include/apicvar.h#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.9 2004/12/07 20:15:01 ups Exp $ + * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.10 2004/12/23 19:47:59 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -106,12 +106,15 @@ * other deadlocks caused by IPI_STOP. */ +/* Interrupts for local APIC LVT entries other than the timer. */ /* * These interrupt handlers are for IPIs and local interrupts whose handlers * do not use any spin locks, so they may still be allowed when a spin lock * is held. */ #define APIC_LOCK_SAFE_INTS (APIC_TIMER_INT + 1) +#define APIC_ERROR_INT APIC_LOCAL_INTS +#define APIC_THERMAL_INT (APIC_LOCAL_INTS + 1) /* Interrupts for local APIC LVT entries other than the timer. */ #define APIC_LOCAL_INTS APIC_LOCK_SAFE_INTS From owner-p4-projects@FreeBSD.ORG Thu Dec 23 20:26:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 600C816A4D0; Thu, 23 Dec 2004 20:26:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36BF216A4CE for ; Thu, 23 Dec 2004 20:26:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 261FD43D2F for ; Thu, 23 Dec 2004 20:26:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNKQJah077379 for ; Thu, 23 Dec 2004 20:26:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNKQIRf077376 for perforce@freebsd.org; Thu, 23 Dec 2004 20:26:18 GMT (envelope-from jhb@freebsd.org) Date: Thu, 23 Dec 2004 20:26:18 GMT Message-Id: <200412232026.iBNKQIRf077376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 20:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=67603 Change 67603 by jhb@jhb_slimer on 2004/12/23 20:26:03 Mismerge. Affected files ... .. //depot/projects/smpng/sys/i386/include/apicvar.h#12 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/apicvar.h#12 (text+ko) ==== @@ -106,15 +106,12 @@ * other deadlocks caused by IPI_STOP. */ -/* Interrupts for local APIC LVT entries other than the timer. */ /* * These interrupt handlers are for IPIs and local interrupts whose handlers * do not use any spin locks, so they may still be allowed when a spin lock * is held. */ #define APIC_LOCK_SAFE_INTS (APIC_TIMER_INT + 1) -#define APIC_ERROR_INT APIC_LOCAL_INTS -#define APIC_THERMAL_INT (APIC_LOCAL_INTS + 1) /* Interrupts for local APIC LVT entries other than the timer. */ #define APIC_LOCAL_INTS APIC_LOCK_SAFE_INTS From owner-p4-projects@FreeBSD.ORG Thu Dec 23 20:38:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A097C16A4CF; Thu, 23 Dec 2004 20:38:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75EA916A4D0 for ; Thu, 23 Dec 2004 20:38:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34F7F43D3F for ; Thu, 23 Dec 2004 20:38:35 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNKcZth078128 for ; Thu, 23 Dec 2004 20:38:35 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNKcYe8078125 for perforce@freebsd.org; Thu, 23 Dec 2004 20:38:34 GMT (envelope-from areisse@nailabs.com) Date: Thu, 23 Dec 2004 20:38:34 GMT Message-Id: <200412232038.iBNKcYe8078125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 20:38:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=67606 Change 67606 by areisse@areisse_tislabs on 2004/12/23 20:38:30 Checkpoint work on updating policy. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atrun.te#6 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/cleanvar.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/devd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/getty.te#6 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/hostname.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#7 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#8 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/syslogd.te#6 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dhcpc.te#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rpcd.te#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sendmail.te#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/devd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fsadm.fc#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/logrotate.fc#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/syslogd.fc#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/types.fc#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/core_macros.te#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/global_macros.te#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atrun.te#6 (text+ko) ==== @@ -32,3 +32,6 @@ allow atrun_t { var_at_jobs_t var_at_spool_t }:dir rw_dir_perms; allow atrun_t var_at_jobs_t:file { r_file_perms unlink }; allow atrun_t var_at_spool_t:file create_file_perms; + +uses_shlib(atrun_t) +allow atrun_t self:fd { create use }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/cleanvar.te#5 (text+ko) ==== @@ -26,3 +26,4 @@ allow cleanvar_t fs_t:filesystem { getattr }; can_exec(cleanvar_t, bin_t) general_domain_access(cleanvar_t) #!!! +uses_shlib(cleanvar_t) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/getty.te#6 (text+ko) ==== @@ -62,3 +62,5 @@ dontaudit getty_t staff_home_dir_t:dir search; r_dir_file(getty_t, sysfs_t) + +allow getty_t self:fd { create use }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/hostname.te#2 (text+ko) ==== @@ -22,3 +22,5 @@ # for when /usr is not mounted dontaudit hostname_t file_t:dir search; + +allow hostname_t self:fd { create use }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#7 (text+ko) ==== @@ -156,6 +156,10 @@ allow initrc_t var_lib_t:file rw_file_perms; allow initrc_t var_lib_t:file unlink; +# /var/db/entropy +allow initrc_t var_db_entropy_t:file { read write create }; +allow initrc_t var_db_entropy_t:dir { read add_name remove_name }; + # Create lock file. allow initrc_t var_lock_t:dir create_dir_perms; allow initrc_t var_lock_t:file create_file_perms; @@ -169,8 +173,8 @@ # Read and unlink /var/run/*.pid files. allow initrc_t pidfile:file { getattr read unlink }; -# Write to /dev/urandom. -allow initrc_t urandom_device_t:chr_file rw_file_perms; +# Write to /dev/random. +allow initrc_t random_device_t:chr_file rw_file_perms; # Set device ownerships/modes. allow initrc_t framebuf_device_t:lnk_file read; @@ -267,6 +271,10 @@ # allow making links in /dev allow initrc_t device_t:dir { add_name }; allow initrc_t device_t:lnk_file { create }; +allow device_t device_t:filesystem associate; + +# /var/.diskless +allow initrc_t var_t:dir { add_name remove_name rmdir create }; ################################# # ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#8 (text+ko) ==== @@ -110,6 +110,8 @@ # Update /var/log/lastlog. allow $1_t lastlog_t:file rw_file_perms; +allow $1_t self:fd { create use }; + read_locale($1_t) read_sysctl($1_t) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/syslogd.te#6 (text+ko) ==== @@ -88,3 +88,5 @@ # allow access to klog allow syslogd_t klog_device_t:chr_file { poll read }; +# Use file descriptors +allow syslogd_t self:fd { create use }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dhcpc.te#3 (text+ko) ==== @@ -80,7 +80,7 @@ allow dhcpc_t { userdomain run_init_t }:fd use; # Use capabilities -allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service sys_resource sys_tty_config }; +allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service sys_resource sys_tty_config sys_admin }; # for access("/etc/bashrc", X_OK) on Red Hat dontaudit dhcpc_t self:capability { dac_read_search sys_module }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rpcd.te#3 (text+ko) ==== @@ -129,3 +129,8 @@ # for exportfs and rpc.mountd allow nfsd_t tmp_t:dir getattr; r_dir_file(rpcd_t, rpc_pipefs_t) + +# rpc.umntall +allow rpcd_t self:fd { create use }; +allow rpcd_t nfs_t:filesystem getattr; +#dontaudit rpcd_t fs_type:filesystem getattr; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sendmail.te#4 (text+ko) ==== @@ -29,6 +29,8 @@ allow sendmail_t self:unix_dgram_socket create_socket_perms; allow sendmail_t self:fifo_file rw_file_perms; +allow sendmail_t self:fd { create use }; + # Bind to the SMTP port. allow sendmail_t smtp_port_t:tcp_socket name_bind; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fsadm.fc#5 (text+ko) ==== @@ -19,7 +19,7 @@ /sbin/parted -- system_u:object_r:fsadm_exec_t /sbin/tune2fs -- system_u:object_r:fsadm_exec_t /sbin/dumpe2fs -- system_u:object_r:fsadm_exec_t -/sbin/swapon.* -- system_u:object_r:fsadm_exec_t +/sbin/swapon -- system_u:object_r:fsadm_exec_t /sbin/hdparm -- system_u:object_r:fsadm_exec_t /sbin/raidstart -- system_u:object_r:fsadm_exec_t /sbin/mkraid -- system_u:object_r:fsadm_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/logrotate.fc#5 (text+ko) ==== @@ -7,3 +7,5 @@ /var/lib/logcheck(/.*)? system_u:object_r:logrotate_var_lib_t # using a hard-coded name under /var/tmp is a bug - new version fixes it /var/tmp/logcheck -d system_u:object_r:logrotate_tmp_t +# FreeBsd +/usr/sbin/newsyslog -- system_u:object_r:logrotate_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/syslogd.fc#5 (text+ko) ==== @@ -6,3 +6,4 @@ /dev/log -s system_u:object_r:devlog_t /var/run/log -s system_u:object_r:devlog_t /var/run/syslogd\.pid -- system_u:object_r:syslogd_var_run_t +newsyslog XXX -- system_u:object_r:syslogd_exec_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/types.fc#5 (text+ko) ==== @@ -59,6 +59,7 @@ # A common mount point /mnt(/.*)? -d system_u:object_r:mnt_t /media(/.*)? -d system_u:object_r:mnt_t +/cdrom -d system_u:object_r:mnt_t # # /var ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/core_macros.te#3 (text+ko) ==== @@ -549,12 +549,10 @@ # Access the pty master multiplexer. allow $1_t ptmx_t:chr_file rw_file_perms; -ifdef(`devfsd.te', ` allow $1_t device_t:filesystem getattr; -') -allow $1_t devpts_t:filesystem getattr; # allow searching /dev/pts +allow $1_t device_t:dir { getattr read search }; allow $1_t devpts_t:dir { getattr read search }; # ignore old BSD pty devices @@ -572,7 +570,7 @@ type $1_devpts_t, file_type, sysadmfile, ptyfile $2; # Allow the pty to be associated with the file system. -allow $1_devpts_t devpts_t:filesystem associate; +allow $1_devpts_t device_t:filesystem associate; # Label pty files with a derived type. type_transition $1_t devpts_t:chr_file $1_devpts_t; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/global_macros.te#8 (text+ko) ==== @@ -88,7 +88,7 @@ allow $1 { var_t var_run_t }:dir search; allow $1 lib_t:lnk_file r_file_perms; allow $1 ld_so_t:file rx_file_perms; -#allow $1 ld_so_t:file execute_no_trans; +allow $1 ld_so_t:file execute_no_trans; allow $1 ld_so_t:lnk_file r_file_perms; allow $1 shlib_t:file rx_file_perms; allow $1 shlib_t:lnk_file r_file_perms; From owner-p4-projects@FreeBSD.ORG Thu Dec 23 20:38:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79A7916A511; Thu, 23 Dec 2004 20:38:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFA7016A4DD for ; Thu, 23 Dec 2004 20:38:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98AD843D3F for ; Thu, 23 Dec 2004 20:38:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNKcZSk078135 for ; Thu, 23 Dec 2004 20:38:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNKcZg1078132 for perforce@freebsd.org; Thu, 23 Dec 2004 20:38:35 GMT (envelope-from jhb@freebsd.org) Date: Thu, 23 Dec 2004 20:38:35 GMT Message-Id: <200412232038.iBNKcZg1078132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 20:38:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=67607 Change 67607 by jhb@jhb_slimer on 2004/12/23 20:38:31 Add an assertion. Affected files ... .. //depot/projects/smpng/sys/sys/mutex.h#46 edit Differences ... ==== //depot/projects/smpng/sys/sys/mutex.h#46 (text+ko) ==== @@ -182,8 +182,10 @@ critical_enter(); \ if ((mp)->mtx_lock == (uintptr_t)_tid) \ (mp)->mtx_recurse++; \ - else \ + else { \ + KASSERT((mp)->mtx_lock == MTX_UNOWNED, ("corrupt spinlock")); \ (mp)->mtx_lock = (uintptr_t)_tid; \ + } \ } while (0) #endif /* SMP */ #endif From owner-p4-projects@FreeBSD.ORG Thu Dec 23 20:48:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78A6016A4D0; Thu, 23 Dec 2004 20:48:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BD9A16A4CE for ; Thu, 23 Dec 2004 20:48:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF9F843D3F for ; Thu, 23 Dec 2004 20:48:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNKmmLb085062 for ; Thu, 23 Dec 2004 20:48:48 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNKmmS5085059 for perforce@freebsd.org; Thu, 23 Dec 2004 20:48:48 GMT (envelope-from jhb@freebsd.org) Date: Thu, 23 Dec 2004 20:48:48 GMT Message-Id: <200412232048.iBNKmmS5085059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 20:48:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=67609 Change 67609 by jhb@jhb_slimer on 2004/12/23 20:48:47 IFC @67608. Loop back simple changes from jhb_clock. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#67 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#40 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#78 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#80 integrate .. //depot/projects/smpng/sys/i386/include/apicreg.h#3 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#67 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#49 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#55 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#44 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#69 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#67 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.175 2004/12/15 19:55:03 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.176 2004/12/23 20:16:09 alc Exp $"); #include #include @@ -1799,7 +1799,6 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 5. Tlbflush is deferred to calling procedure. * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ @@ -1810,7 +1809,8 @@ register pt_entry_t *pte; int managed; - vm_page_lock_queues(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); /* @@ -1905,7 +1905,6 @@ *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed; out: alpha_pal_imb(); /* XXX overkill? */ - vm_page_unlock_queues(); PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#40 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.513 2004/12/21 19:25:56 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.514 2004/12/23 20:16:09 alc Exp $"); /* * Manages physical address maps. @@ -2007,7 +2007,6 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 5. Tlbflush is deferred to calling procedure. * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ @@ -2018,7 +2017,8 @@ pt_entry_t *pte; vm_paddr_t pa; - vm_page_lock_queues(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); /* @@ -2110,7 +2110,6 @@ else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); out: - vm_page_unlock_queues(); PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/smpng/sys/arm/arm/pmap.c#11 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.21 2004/12/15 19:55:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.22 2004/12/23 20:16:10 alc Exp $"); #include #include #include @@ -3409,7 +3409,6 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 5. Tlbflush is deferred to calling procedure. * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ @@ -3418,7 +3417,6 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { - vm_page_lock_queues(); vm_page_busy(m); vm_page_unlock_queues(); VM_OBJECT_UNLOCK(m->object); @@ -3429,7 +3427,6 @@ VM_OBJECT_LOCK(m->object); vm_page_lock_queues(); vm_page_wakeup(m); - vm_page_unlock_queues(); return (NULL); } ==== //depot/projects/smpng/sys/i386/i386/intr_machdep.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.12 2004/12/06 22:25:01 ups Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.13 2004/12/23 20:34:18 jhb Exp $ */ /* @@ -286,6 +286,17 @@ is->is_straycount = &intrcnt[is->is_index + 1]; } +void +intrcnt_add(const char *name, u_long **countp) +{ + + mtx_lock_spin(&intr_table_lock); + *countp = &intrcnt[intrcnt_index]; + intrcnt_setname(name, intrcnt_index); + intrcnt_index++; + mtx_unlock_spin(&intr_table_lock); +} + static void intr_init(void *dummy __unused) { ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#22 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.10 2004/12/23 19:47:58 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.11 2004/12/23 20:42:53 jhb Exp $"); #include #include @@ -97,10 +97,10 @@ static struct lvt lvts[LVT_MAX + 1] = { { 1, 1, 1, 1, APIC_LVT_DM_EXTINT, 0 }, /* LINT0: masked ExtINT */ { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* LINT1: NMI */ - { 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* Timer: needs a vector */ - { 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* Error: needs a vector */ + { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT }, /* Timer */ + { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT }, /* Error */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* PMC */ - { 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* Thermal: needs a vector */ + { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT }, /* Thermal */ }; static inthand_t *ioint_handlers[] = { @@ -116,6 +116,9 @@ volatile lapic_t *lapic; +static void lapic_enable(void); +static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value); + static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value) { @@ -149,11 +152,7 @@ /* Use a vector of 0. */ break; case APIC_LVT_DM_FIXED: -#if 0 value |= lvt->lvt_vector; -#else - panic("Fixed LINT pins not supported"); -#endif break; default: panic("bad APIC LVT delivery mode: %#x\n", value); @@ -167,7 +166,6 @@ void lapic_init(uintptr_t addr) { - u_int32_t value; /* Map the local APIC and setup the spurious interrupt handler. */ KASSERT(trunc_page(addr) == addr, @@ -177,10 +175,7 @@ GSEL(GCODE_SEL, SEL_KPL)); /* Perform basic initialization of the BSP's local APIC. */ - value = lapic->svr; - value &= ~(APIC_SVR_VECTOR | APIC_SVR_FOCUS); - value |= (APIC_SVR_FEN | APIC_SVR_SWEN | APIC_SPURIOUS_INT); - lapic->svr = value; + lapic_enable(); /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); @@ -233,6 +228,9 @@ lapic->id, lapic->version, lapic->ldr, lapic->dfr); printf(" lint0: 0x%08x lint1: 0x%08x TPR: 0x%08x SVR: 0x%08x\n", lapic->lvt_lint0, lapic->lvt_lint1, lapic->tpr, lapic->svr); + printf(" timer: 0x%08x therm: 0x%08x err: 0x%08x pcm: 0x%08x\n", + lapic->lvt_timer, lapic->lvt_thermal, lapic->lvt_error, + lapic->lvt_pcint); } void @@ -260,12 +258,6 @@ eflags = intr_disable(); maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; - /* Program LINT[01] LVT entries. */ - lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); - lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); - - /* XXX: more LVT entries */ - /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); @@ -283,10 +275,14 @@ lapic->ldr = value; /* Setup spurious vector and enable the local APIC. */ - value = lapic->svr; - value &= ~(APIC_SVR_VECTOR | APIC_SVR_FOCUS); - value |= (APIC_SVR_FEN | APIC_SVR_SWEN | APIC_SPURIOUS_INT); - lapic->svr = value; + lapic_enable(); + + /* Program LINT[01] LVT entries. */ + lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); + lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); + + /* XXX: more LVT entries */ + intr_restore(eflags); } @@ -301,6 +297,18 @@ lapic->svr = value; } +static void +lapic_enable(void) +{ + u_int32_t value; + + /* Program the spurious vector to enable the local APIC. */ + value = lapic->svr; + value &= ~(APIC_SVR_VECTOR | APIC_SVR_FOCUS); + value |= (APIC_SVR_FEN | APIC_SVR_SWEN | APIC_SPURIOUS_INT); + lapic->svr = value; +} + int lapic_id(void) { ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#78 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.242 2004/12/07 20:15:01 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.243 2004/12/23 20:35:51 jhb Exp $"); #include "opt_apic.h" #include "opt_cpu.h" @@ -1135,8 +1135,8 @@ ipi_selected(map, IPI_HARDCLOCK); } - -void ipi_bitmap_handler(struct clockframe frame) +void +ipi_bitmap_handler(struct clockframe frame) { int cpu = PCPU_GET(cpuid); u_int ipi_bitmap; @@ -1170,7 +1170,6 @@ critical_exit(); } - /* * send an IPI to a set of cpus. */ ==== //depot/projects/smpng/sys/i386/i386/pmap.c#80 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.519 2004/12/15 19:55:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.520 2004/12/23 20:16:10 alc Exp $"); /* * Manages physical address maps. @@ -2050,7 +2050,6 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 5. Tlbflush is deferred to calling procedure. * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ @@ -2061,7 +2060,8 @@ pt_entry_t *pte; vm_paddr_t pa; - vm_page_lock_queues(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); /* @@ -2153,7 +2153,6 @@ else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); out: - vm_page_unlock_queues(); PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/smpng/sys/i386/include/apicreg.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.26 2003/12/10 21:33:07 jhb Exp $ + * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.27 2004/12/23 20:35:07 jhb Exp $ */ #ifndef _MACHINE_APICREG_H_ @@ -330,8 +330,13 @@ #define APIC_LVTT_DS 0x00001000 #define APIC_LVTT_M 0x00010000 #define APIC_LVTT_TM 0x00020000 +# define APIC_LVTT_TM_ONE_SHOT 0x00000000 +# define APIC_LVTT_TM_PERIODIC 0x00020000 +/* APIC timer current count */ +#define APIC_TIMER_MAX_COUNT 0xffffffff + /* fields in TDCR */ #define APIC_TDCR_2 0x00 #define APIC_TDCR_4 0x01 ==== //depot/projects/smpng/sys/i386/include/intr_machdep.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.5 2004/08/02 15:31:10 scottl Exp $ + * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.6 2004/12/23 20:34:18 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -100,6 +100,7 @@ int intr_remove_handler(void *cookie); void intr_resume(void); void intr_suspend(void); +void intrcnt_add(const char *name, u_long **countp); #endif /* !LOCORE */ #endif /* _KERNEL */ ==== //depot/projects/smpng/sys/ia64/ia64/pmap.c#67 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.156 2004/12/15 19:55:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.157 2004/12/23 20:16:10 alc Exp $"); #include #include @@ -1612,7 +1612,6 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 5. Tlbflush is deferred to calling procedure. * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ @@ -1624,7 +1623,8 @@ pmap_t oldpmap; boolean_t managed; - vm_page_lock_queues(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); oldpmap = pmap_install(pmap); @@ -1666,7 +1666,6 @@ pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m), FALSE, managed); reinstall: - vm_page_unlock_queues(); pmap_install(oldpmap); PMAP_UNLOCK(pmap); return (NULL); ==== //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#49 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.91 2004/12/15 19:55:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.92 2004/12/23 20:16:11 alc Exp $"); /* * Manages physical address maps. @@ -1048,7 +1048,6 @@ pmap_enter_quick(pmap_t pm, vm_offset_t va, vm_page_t m, vm_page_t mpte) { - vm_page_lock_queues(); vm_page_busy(m); vm_page_unlock_queues(); VM_OBJECT_UNLOCK(m->object); @@ -1058,7 +1057,6 @@ VM_OBJECT_LOCK(m->object); vm_page_lock_queues(); vm_page_wakeup(m); - vm_page_unlock_queues(); return (NULL); } ==== //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#55 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.142 2004/12/15 19:55:05 alc Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.143 2004/12/23 20:16:11 alc Exp $ */ /* @@ -1401,7 +1401,6 @@ pmap_enter_quick(pmap_t pm, vm_offset_t va, vm_page_t m, vm_page_t mpte) { - vm_page_lock_queues(); vm_page_busy(m); vm_page_unlock_queues(); VM_OBJECT_UNLOCK(m->object); @@ -1411,7 +1410,6 @@ VM_OBJECT_LOCK(m->object); vm_page_lock_queues(); vm_page_wakeup(m); - vm_page_unlock_queues(); return (NULL); } ==== //depot/projects/smpng/sys/vm/vm_fault.c#44 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.199 2004/12/15 19:55:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.200 2004/12/23 20:16:11 alc Exp $"); #include #include @@ -977,12 +977,11 @@ (m->busy == 0) && (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - if ((m->queue - m->pc) == PQ_CACHE) { - vm_page_lock_queues(); + vm_page_lock_queues(); + if ((m->queue - m->pc) == PQ_CACHE) vm_page_deactivate(m); - vm_page_unlock_queues(); - } mpte = pmap_enter_quick(pmap, addr, m, mpte); + vm_page_unlock_queues(); } VM_OBJECT_UNLOCK(lobject); } ==== //depot/projects/smpng/sys/vm/vm_map.c#69 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.362 2004/12/15 19:55:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.363 2004/12/23 20:16:11 alc Exp $"); #include #include @@ -1369,6 +1369,7 @@ vm_offset_t tmpidx; int psize; vm_page_t p, mpte; + boolean_t are_queues_locked; if ((prot & VM_PROT_READ) == 0 || object == NULL) return; @@ -1392,6 +1393,7 @@ psize = object->size - pindex; } + are_queues_locked = FALSE; mpte = NULL; if ((p = TAILQ_FIRST(&object->memq)) != NULL) { @@ -1420,15 +1422,18 @@ if ((p->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL && (p->busy == 0) && (p->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - if ((p->queue - p->pc) == PQ_CACHE) { + if (!are_queues_locked) { + are_queues_locked = TRUE; vm_page_lock_queues(); + } + if ((p->queue - p->pc) == PQ_CACHE) vm_page_deactivate(p); - vm_page_unlock_queues(); - } mpte = pmap_enter_quick(map->pmap, addr + ptoa(tmpidx), p, mpte); } } + if (are_queues_locked) + vm_page_unlock_queues(); unlock_return: VM_OBJECT_UNLOCK(object); } From owner-p4-projects@FreeBSD.ORG Sat Dec 25 06:41:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7FF716A4D0; Sat, 25 Dec 2004 06:41:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8946416A4CE for ; Sat, 25 Dec 2004 06:41:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0706F43D41 for ; Sat, 25 Dec 2004 06:41:19 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBP6fIoh007873 for ; Sat, 25 Dec 2004 06:41:19 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBP6fHsP007870 for perforce@freebsd.org; Sat, 25 Dec 2004 06:41:17 GMT (envelope-from julian@freebsd.org) Date: Sat, 25 Dec 2004 06:41:17 GMT Message-Id: <200412250641.iBP6fHsP007870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 67662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 06:41:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=67662 Change 67662 by julian@julian_ref on 2004/12/25 06:40:46 IFC@67661 Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/pmap.c#13 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/nsched/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/intr.c#5 integrate .. //depot/projects/nsched/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/nsched/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/nsched/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/nsched/sys/arm/include/atomic.h#3 integrate .. //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/nsched/sys/boot/Makefile#5 integrate .. //depot/projects/nsched/sys/boot/alpha/boot1/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/alpha/cdboot/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/alpha/common/Makefile.common#3 integrate .. //depot/projects/nsched/sys/boot/alpha/netboot/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/arc/loader/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/i386/boot0/Makefile#4 integrate .. //depot/projects/nsched/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/i386/cdboot/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/i386/mbr/Makefile#4 integrate .. //depot/projects/nsched/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/pc98/boot0/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/pc98/btx/btx/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/pc98/btx/btxldr/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/powerpc/loader/Makefile#4 integrate .. //depot/projects/nsched/sys/boot/sparc64/boot1/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/nsched/sys/conf/NOTES#25 integrate .. //depot/projects/nsched/sys/conf/files.amd64#12 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/fil.c#5 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/nsched/sys/crypto/rijndael/Makefile#3 integrate .. //depot/projects/nsched/sys/dev/aac/aac_pci.c#7 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cmbat.c#10 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci_link.c#11 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/nsched/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/nsched/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/nsched/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/nsched/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/nsched/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/nsched/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_card.h#3 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_tuner.c#3 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/nsched/sys/dev/bktr/msp34xx.c#3 integrate .. //depot/projects/nsched/sys/dev/cp/if_cp.c#9 integrate .. //depot/projects/nsched/sys/dev/drm/drm_sysctl.h#2 integrate .. //depot/projects/nsched/sys/dev/fb/vga.c#6 integrate .. //depot/projects/nsched/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/nsched/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/nsched/sys/dev/ida/ida.c#3 integrate .. //depot/projects/nsched/sys/dev/ida/ida_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/ida/idavar.h#3 integrate .. //depot/projects/nsched/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/nsched/sys/dev/kbd/atkbdreg.h#2 integrate .. //depot/projects/nsched/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/nsched/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#10 integrate .. //depot/projects/nsched/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/nsched/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/nsched/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/pccbb/pccbbdevid.h#3 integrate .. //depot/projects/nsched/sys/dev/random/randomdev.c#9 integrate .. //depot/projects/nsched/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/nsched/sys/dev/snp/snp.c#8 integrate .. //depot/projects/nsched/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/nsched/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/nsched/sys/dev/twe/twe.c#4 integrate .. //depot/projects/nsched/sys/dev/twe/tweio.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/ugen.c#10 integrate .. //depot/projects/nsched/sys/dev/usb/uhid.c#9 integrate .. //depot/projects/nsched/sys/dev/usb/ums.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/usb.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/nsched/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/nsched/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/nsched/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/nsched/sys/geom/bde/g_bde_lock.c#3 integrate .. //depot/projects/nsched/sys/geom/geom.h#8 integrate .. //depot/projects/nsched/sys/geom/mirror/g_mirror.c#13 integrate .. //depot/projects/nsched/sys/geom/mirror/g_mirror.h#5 integrate .. //depot/projects/nsched/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/nsched/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/nsched/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/nsched/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/nsched/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/nsched/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/nsched/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/nsched/sys/i386/isa/isa.c#4 integrate .. //depot/projects/nsched/sys/ia64/ia64/pmap.c#16 integrate .. //depot/projects/nsched/sys/isa/isa_common.c#2 integrate .. //depot/projects/nsched/sys/isa/isa_common.h#2 integrate .. //depot/projects/nsched/sys/isa/pnp.c#2 integrate .. //depot/projects/nsched/sys/isa/pnpvar.h#2 integrate .. //depot/projects/nsched/sys/kern/init_sysent.c#9 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/nsched/sys/kern/kern_exec.c#16 integrate .. //depot/projects/nsched/sys/kern/kern_fork.c#19 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#43 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#48 integrate .. //depot/projects/nsched/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#63 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#45 integrate .. //depot/projects/nsched/sys/kern/syscalls.c#9 integrate .. //depot/projects/nsched/sys/kern/syscalls.master#9 integrate .. //depot/projects/nsched/sys/kern/tty.c#16 integrate .. //depot/projects/nsched/sys/kern/tty_pty.c#12 integrate .. //depot/projects/nsched/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/nsched/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#12 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/nsched/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/nsched/sys/modules/Makefile#17 integrate .. //depot/projects/nsched/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/nsched/sys/modules/cp/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/ipfilter/Makefile#4 integrate .. //depot/projects/nsched/sys/modules/netgraph/Makefile#6 integrate .. //depot/projects/nsched/sys/modules/netgraph/fec/sample_startup#2 delete .. //depot/projects/nsched/sys/modules/pf/Makefile#6 integrate .. //depot/projects/nsched/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/nsched/sys/net/bpf.c#11 integrate .. //depot/projects/nsched/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/nsched/sys/net/if_tap.c#8 integrate .. //depot/projects/nsched/sys/net/if_tun.c#8 integrate .. //depot/projects/nsched/sys/net/ppp_tty.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/nsched/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/nsched/sys/netgraph/ng_sample.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/nsched/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/nsched/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/nsched/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_nfsiod.c#6 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/nsched/sys/nfsclient/nfsnode.h#7 integrate .. //depot/projects/nsched/sys/pc98/pc98/fd.c#9 integrate .. //depot/projects/nsched/sys/pci/if_sk.c#9 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/pmap.c#12 integrate .. //depot/projects/nsched/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/identcpu.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/nsched/sys/sys/filedesc.h#6 integrate .. //depot/projects/nsched/sys/sys/proc.h#43 integrate .. //depot/projects/nsched/sys/sys/syscall.h#9 integrate .. //depot/projects/nsched/sys/sys/syscall.mk#9 integrate .. //depot/projects/nsched/sys/sys/sysproto.h#9 integrate .. //depot/projects/nsched/sys/sys/umtx.h#3 integrate .. //depot/projects/nsched/sys/sys/vnode.h#12 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/nsched/sys/vm/vm_fault.c#9 integrate .. //depot/projects/nsched/sys/vm/vm_map.c#10 integrate .. //depot/projects/nsched/sys/vm/vm_meter.c#6 integrate .. //depot/projects/nsched/sys/vm/vm_object.c#9 integrate .. //depot/user/julian/julian_ipi/sys/dev/usb/usbdevs#7 edit Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/pmap.c#13 (text+ko) ==== @@ -148,11 +148,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.174 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.176 2004/12/23 20:16:09 alc Exp $"); #include #include #include +#include #include #include #include @@ -334,7 +335,7 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); -static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); +static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags); static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); #ifdef SMP @@ -1038,24 +1039,28 @@ * mapped correctly. */ static vm_page_t -_pmap_allocpte(pmap, ptepindex) - pmap_t pmap; - unsigned ptepindex; +_pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags) { pt_entry_t* pte; vm_offset_t ptepa; vm_page_t m; + KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || + (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, + ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); + /* * Find or fabricate a new pagetable page */ if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { - PMAP_UNLOCK(pmap); - vm_page_unlock_queues(); - VM_WAIT; - vm_page_lock_queues(); - PMAP_LOCK(pmap); + if (flags & M_WAITOK) { + PMAP_UNLOCK(pmap); + vm_page_unlock_queues(); + VM_WAIT; + vm_page_lock_queues(); + PMAP_LOCK(pmap); + } /* * Indicate the need to retry. While waiting, the page table @@ -1082,7 +1087,8 @@ pt_entry_t* l1pte = &pmap->pm_lev1[l1index]; pt_entry_t* l2map; if (!pmap_pte_v(l1pte)) { - if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) { + if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index, + flags) == NULL) { --m->wire_count; vm_page_free(m); return (NULL); @@ -1146,7 +1152,7 @@ * Here if the pte page isn't mapped, or if it has been * deallocated. */ - m = _pmap_allocpte(pmap, ptepindex); + m = _pmap_allocpte(pmap, ptepindex, M_WAITOK); if (m == NULL) goto retry; } @@ -1793,7 +1799,6 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 5. Tlbflush is deferred to calling procedure. * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ @@ -1804,7 +1809,8 @@ register pt_entry_t *pte; int managed; - vm_page_lock_queues(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); /* @@ -1842,9 +1848,20 @@ } mpte->wire_count++; } else { - mpte = _pmap_allocpte(pmap, ptepindex); - if (mpte == NULL) + mpte = _pmap_allocpte(pmap, ptepindex, + M_NOWAIT); + if (mpte == NULL) { + PMAP_UNLOCK(pmap); + vm_page_busy(m); + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(m->object); + VM_WAIT; + VM_OBJECT_LOCK(m->object); + vm_page_lock_queues(); + vm_page_wakeup(m); + PMAP_LOCK(pmap); goto retry; + } } } } else { @@ -1888,7 +1905,6 @@ *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed; out: alpha_pal_imb(); /* XXX overkill? */ - vm_page_unlock_queues(); PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#27 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.511 2004/12/04 22:02:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.514 2004/12/23 20:16:09 alc Exp $"); /* * Manages physical address maps. @@ -858,7 +858,7 @@ if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) { pa = DMAP_TO_PHYS(va); } else { - pde = pmap_pde(kernel_pmap, va); + pde = vtopde(va); if (*pde & PG_PS) { pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); } else { @@ -2007,7 +2007,6 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 5. Tlbflush is deferred to calling procedure. * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ @@ -2018,7 +2017,8 @@ pt_entry_t *pte; vm_paddr_t pa; - vm_page_lock_queues(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); /* @@ -2053,9 +2053,19 @@ mpte->wire_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex, - M_WAITOK); - if (mpte == NULL) + M_NOWAIT); + if (mpte == NULL) { + PMAP_UNLOCK(pmap); + vm_page_busy(m); + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(m->object); + VM_WAIT; + VM_OBJECT_LOCK(m->object); + vm_page_lock_queues(); + vm_page_wakeup(m); + PMAP_LOCK(pmap); goto retry; + } } } } else { @@ -2100,7 +2110,6 @@ else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); out: - vm_page_unlock_queues(); PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/nsched/sys/amd64/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.146 2004/03/17 21:45:55 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.147 2004/12/24 23:03:17 imp Exp $"); /* * Modifications for Intel architecture by Garrett A. Wollman. @@ -59,7 +59,9 @@ #include #include +#include #include +#include #include #include @@ -157,3 +159,8 @@ { return (BUS_TEARDOWN_INTR(device_get_parent(bus), child, r, cookie)); } + +/* + * On this platform, isa can also attach to the legacy bus. + */ +DRIVER_MODULE(isa, legacy, isa_driver, isa_devclass, 0, 0); ==== //depot/projects/nsched/sys/arm/arm/intr.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.5 2004/11/23 16:31:16 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.6 2004/12/14 18:57:21 cognet Exp $"); #include #include #include @@ -122,7 +122,7 @@ arm_handler_execute(void *frame, int irqnb) { struct ithd *ithd; - int i, oldirqstate; + int i; struct intrhand *ih; struct thread *td = curthread; @@ -130,6 +130,7 @@ if (irqnb == 0) irqnb = arm_get_irqnb(frame); arm_mask_irqs(irqnb); + enable_interrupts(I32_bit|F32_bit); while (irqnb != 0) { i = ffs(irqnb) - 1; intrcnt[intrcnt_tab[i]]++; @@ -139,13 +140,11 @@ continue; ih = TAILQ_FIRST(&ithd->it_handlers); if (ih && ih->ih_flags & IH_FAST) { - oldirqstate = disable_interrupts(I32_bit); TAILQ_FOREACH(ih, &ithd->it_handlers, ih_next) { ih->ih_handler(ih->ih_argument ? ih->ih_argument : frame); } - restore_interrupts(oldirqstate); arm_unmask_irqs(1 << i); } else if (ih) ithread_schedule(ithd); ==== //depot/projects/nsched/sys/arm/arm/pmap.c#10 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.20 2004/12/05 22:47:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.22 2004/12/23 20:16:10 alc Exp $"); #include #include #include @@ -3409,7 +3409,6 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 5. Tlbflush is deferred to calling procedure. * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ @@ -3417,8 +3416,17 @@ vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { + + vm_page_busy(m); + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(m->object); + mtx_lock(&Giant); pmap_enter(pmap, va, m, VM_PROT_READ|VM_PROT_EXECUTE, FALSE); pmap_dcache_wbinv_all(pmap); /* XXX: shouldn't be needed */ + mtx_unlock(&Giant); + VM_OBJECT_LOCK(m->object); + vm_page_lock_queues(); + vm_page_wakeup(m); return (NULL); } ==== //depot/projects/nsched/sys/arm/arm/swtch.S#6 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.9 2004/12/12 19:21:58 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.10 2004/12/14 18:45:05 cognet Exp $"); /* @@ -205,7 +205,7 @@ ldr r6, .Lcurpcb str r7, [r6] - ldmfd sp, {r4-r7, pc} + ldmfd sp!, {r4-r7, pc} ENTRY(cpu_switch) stmfd sp!, {r4-r7, lr} ==== //depot/projects/nsched/sys/arm/conf/SIMICS#5 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.6 2004/11/07 23:02:15 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.7 2004/12/18 17:58:49 cognet Exp $ machine arm ident SIMICS @@ -40,7 +40,6 @@ options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=65535 options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server ==== //depot/projects/nsched/sys/arm/include/atomic.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.3 2004/11/05 23:48:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.4 2004/12/18 17:43:01 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -75,7 +75,7 @@ __swp(uint32_t val, volatile uint32_t *ptr) { __asm __volatile("swp %0, %1, [%2]" - : "=r" (val) : "r" (val) , "r" (ptr) : "memory"); + : "=&r" (val) : "r" (val) , "r" (ptr) : "memory"); return (val); } ==== //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#8 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.7 2004/11/20 16:51:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.8 2004/12/18 17:58:49 cognet Exp $"); #include "opt_md.h" @@ -134,7 +134,7 @@ struct pcpu *pcpup = &__pcpu; #ifndef MD_ROOT_SIZE -#error SIMICS needs MD_ROOT and MD_ROOT_SIZE +#define MD_ROOT_SIZE 65535 #endif /* Physical and virtual addresses for some global pages */ @@ -400,14 +400,14 @@ pmap_curmaxkvaddr = freemempos + KERNEL_PT_VMDATA_NUM * 0x400000; - pmap_bootstrap(KERNEL_VM_BASE, + pmap_bootstrap(freemempos, 0xd0000000, &kernel_l1pt); mutex_init(); - phys_avail[0] = round_page(freemempos); + phys_avail[0] = round_page(virtual_avail); phys_avail[1] = 0xc0000000 + 0x02000000 - 1; phys_avail[2] = 0; phys_avail[3] = 0; ==== //depot/projects/nsched/sys/arm/sa11x0/sa11x0_irqhandler.c#3 (text+ko) ==== @@ -76,7 +76,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.2 2004/09/23 22:33:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.3 2004/12/18 17:58:49 cognet Exp $"); #include #include @@ -115,16 +115,26 @@ return(bus_space_read_4(sc->sc_iot, sc->sc_ioh, SAIPIC_IP)); } +static uint32_t sa11x0_irq_mask = 0xfffffff; + +extern vm_offset_t saipic_base; + void arm_mask_irqs(int irq) { - /* XXX */ + + sa11x0_irq_mask &= ~irq; + __asm __volatile("str %0, [%1, #0x04]" /* SAIPIC_MR */ + : : "r" (sa11x0_irq_mask), "r" (saipic_base)); } void arm_unmask_irqs(int irq) { - /* XXX */ + + sa11x0_irq_mask |= irq; + __asm __volatile("str %0, [%1, #0x04]" /* SAIPIC_MR */ + : : "r" (sa11x0_irq_mask), "r" (saipic_base)); } void stray_irqhandler(void *); ==== //depot/projects/nsched/sys/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.1 2004/09/23 22:45:36 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.2 2004/12/21 11:36:09 cognet Exp $"); #include #include @@ -236,7 +236,7 @@ struct i80321_pci_softc *sc = device_get_softc(dev); uint32_t addr; - if (i80321_pci_conf_setup(sc, bus, slot, func, reg, &addr)) + if (i80321_pci_conf_setup(sc, bus, slot, func, reg & ~3, &addr)) return; @@ -244,10 +244,12 @@ addr); switch (bytes) { case 1: - bus_space_write_1(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data); + bus_space_write_1(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR + + (reg & 3), data); break; case 2: - bus_space_write_2(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data); + bus_space_write_2(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR + + (reg & 3), data); break; case 4: bus_space_write_4(sc->sc_st, sc->sc_atu_sh, ATU_OCCDR, data); @@ -266,7 +268,6 @@ int func; uint32_t busno; struct i80321_pci_softc *sc = device_get_softc(pcib); - bus = pci_get_bus(dev); device = pci_get_slot(dev); func = pci_get_function(dev); @@ -293,6 +294,10 @@ goto no_mapping; /* IQ80321 PCI */ case 4: /* i82544 Gig-E */ + case 8: /* + * Apparently you can set the device for the ethernet adapter + * to 8 with a jumper, so handle that as well + */ if (pin == 1) return (ICU_INT_XINT(0)); goto no_mapping; @@ -362,7 +367,10 @@ case SYS_RES_MEMORY: rm = &sc->sc_mem_rman; bt = sc->sc_pcimem; - bh = sc->sc_mem; + bh = (start >= 0x80000000 && start < 0x84000000) ? 0x80000000 : + sc->sc_mem; + start &= (0x1000000 - 1); + end &= (0x1000000 - 1); break; case SYS_RES_IOPORT: rm = &sc->sc_io_rman; ==== //depot/projects/nsched/sys/boot/Makefile#5 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.25 2004/11/23 05:52:00 marcel Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.26 2004/12/21 12:32:13 ru Exp $ -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Build the add-in FORTH interpreter. SUBDIR+= ficl .endif ==== //depot/projects/nsched/sys/boot/alpha/boot1/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.17 2004/02/11 22:01:17 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.18 2004/12/21 08:47:11 ru Exp $ PROG= boot1.sym INTERNALPROG= -NOMAN= +NO_MAN= LINKS= ${BINDIR}/boot1 ${BINDIR}/boot .PATH: ${.CURDIR}/../libalpha ==== //depot/projects/nsched/sys/boot/alpha/cdboot/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.9 2004/12/21 08:47:12 ru Exp $ BOOT= cdboot -NOMAN= +NO_MAN= NEWVERSWHAT= "SRM CD9660 boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} ==== //depot/projects/nsched/sys/boot/alpha/common/Makefile.common#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.19 2004/08/22 00:26:01 marcel Exp $ +# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.20 2004/12/21 12:32:13 ru Exp $ # # Common Alpha loader build rules @@ -15,7 +15,7 @@ .PATH: ${.CURDIR}/../libalpha -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH ==== //depot/projects/nsched/sys/boot/alpha/netboot/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.11 2004/02/11 22:01:17 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.12 2004/12/21 08:47:12 ru Exp $ # $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $ BOOT= netboot -NOMAN= +NO_MAN= NEWVERSWHAT= "SRM net boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} ==== //depot/projects/nsched/sys/boot/arc/loader/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $ -# $FreeBSD: src/sys/boot/arc/loader/Makefile,v 1.7 2002/05/10 09:26:30 obrien Exp $ +# $FreeBSD: src/sys/boot/arc/loader/Makefile,v 1.8 2004/12/21 08:47:12 ru Exp $ BASE= loader PROG= ${BASE}.exe -NOMAN= +NO_MAN= NEWVERSWHAT= "ARC disk boot" ${MACHINE_ARCH} .PATH: ${.CURDIR}/../common ==== //depot/projects/nsched/sys/boot/i386/boot0/Makefile#4 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.30 2004/08/27 00:18:03 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.31 2004/12/21 08:47:13 ru Exp $ PROG?= boot0 STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.S # The default set of flags compiled into boot0. This enables update (writing ==== //depot/projects/nsched/sys/boot/i386/btx/btx/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.18 2004/04/27 19:45:15 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.19 2004/12/21 08:47:13 ru Exp $ PROG= btx INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btx.S .if defined(PAGING) ==== //depot/projects/nsched/sys/boot/i386/btx/btxldr/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.17 2004/04/27 19:45:16 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.18 2004/12/21 08:47:13 ru Exp $ PROG= btxldr INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxldr.S CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS} ==== //depot/projects/nsched/sys/boot/i386/btx/lib/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.12 2004/02/09 14:11:57 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $ PROG= crt0.o INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxcsu.s btxsys.s btxv86.s LDFLAGS=-Wl,-r ==== //depot/projects/nsched/sys/boot/i386/cdboot/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.12 2004/04/28 21:31:20 ru Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $ PROG= cdboot STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.s ORG= 0x7c00 ==== //depot/projects/nsched/sys/boot/i386/kgzldr/Makefile#2 (text+ko) ==== @@ -1,15 +1,15 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.20 2004/02/12 22:06:33 ru Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.22 2004/12/21 09:59:44 ru Exp $ PROG= kgzldr.o STRIP= BINMODE=${LIBMODE} BINDIR= ${LIBDIR} -NOMAN= +NO_MAN= SRCS= start.s boot.c inflate.c lib.c crt.s sio.s CFLAGS= -Os CFLAGS+=-DKZIP -NOSHARED= +NO_SHARED= LDFLAGS=-Wl,-r .PATH: ${.CURDIR}/../../../kern ==== //depot/projects/nsched/sys/boot/i386/loader/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.78 2004/11/29 09:31:04 ru Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.79 2004/12/21 12:32:14 ru Exp $ PROG= loader.sym INTERNALPROG= @@ -18,7 +18,7 @@ HAVE_PNP= yes HAVE_ISABUS= yes -.if !defined(NOFORTH) +.if !defined(NO_FORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 ==== //depot/projects/nsched/sys/boot/i386/mbr/Makefile#4 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.14 2004/08/28 08:39:35 yar Exp $ +# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.15 2004/12/21 08:47:15 ru Exp $ PROG= mbr STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.s # MBR flags: 0x80 -- try packet interface (also known as EDD or LBA) ==== //depot/projects/nsched/sys/boot/ia64/efi/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.24 2004/11/28 00:26:11 marcel Exp $ +# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.26 2004/12/21 12:32:14 ru Exp $ PROG= loader.sym INTERNALPROG= SRCS= conf.c dev_net.c efimd.c main.c start.S vers.c -NOMAN= +NO_MAN= CFLAGS+= -DLOADER CFLAGS+= -I${.CURDIR}/../../efi/include @@ -11,7 +11,7 @@ CFLAGS+= -I${.CURDIR}/../../efi/libefi CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -.if !defined(NOFORTH) +.if !defined(NO_FORTH) BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl ==== //depot/projects/nsched/sys/boot/ia64/ski/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.16 2004/09/24 04:06:22 marcel Exp $ +# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.18 2004/12/21 12:32:14 ru Exp $ PROG= skiload -NOMAN= +NO_MAN= NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} STRIP= # We must not strip skiload at install time. @@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} LDFLAGS= -Wl,-T${.CURDIR}/ldscript.ia64 -.if !defined(NOFORTH) +.if !defined(NO_FORTH) CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_ARCH} ==== //depot/projects/nsched/sys/boot/pc98/boot0.5/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.3 2004/02/09 16:01:45 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} -NOMAN= +NO_MAN= SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s CLEANFILES= ${BOOT} ${BOOT}.bin ==== //depot/projects/nsched/sys/boot/pc98/boot0/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/pc98/boot0/Makefile,v 1.3 2004/02/09 16:01:45 nyan Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 25 08:29:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D458F16A4D0; Sat, 25 Dec 2004 08:29:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DF1216A4CE for ; Sat, 25 Dec 2004 08:29:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57DBF43D1D for ; Sat, 25 Dec 2004 08:29:30 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBP8TUrh011477 for ; Sat, 25 Dec 2004 08:29:30 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBP8TUht011474 for perforce@freebsd.org; Sat, 25 Dec 2004 08:29:30 GMT (envelope-from julian@freebsd.org) Date: Sat, 25 Dec 2004 08:29:30 GMT Message-Id: <200412250829.iBP8TUht011474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 67664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 08:29:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=67664 Change 67664 by julian@julian_ref on 2004/12/25 08:29:25 catch up with changes in -current Affected files ... .. //depot/projects/nsched/sys/kern/kern_kse.c#37 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_kse.c#37 (text+ko) ==== @@ -1041,7 +1041,7 @@ } else { spare = thread_alloc(); bzero(&spare->td_startzero, - (unsigned)RANGEOF(struct thread, td_startzero, td_endzero)); + __rangeof(struct thread, td_startzero, td_endzero)); spare->td_proc = td->td_proc; spare->td_ucred = crhold(td->td_ucred); } From owner-p4-projects@FreeBSD.ORG Sat Dec 25 09:04:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 501F516A4D0; Sat, 25 Dec 2004 09:04:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 294E216A4CE for ; Sat, 25 Dec 2004 09:04:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8F2F43D2D for ; Sat, 25 Dec 2004 09:04:22 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBP94Mvg019263 for ; Sat, 25 Dec 2004 09:04:22 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBP94MBZ019260 for perforce@freebsd.org; Sat, 25 Dec 2004 09:04:22 GMT (envelope-from julian@freebsd.org) Date: Sat, 25 Dec 2004 09:04:22 GMT Message-Id: <200412250904.iBP94MBZ019260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 67668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 09:04:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=67668 Change 67668 by julian@julian_ref on 2004/12/25 09:03:54 IFC@67667 to get these changes Affected files ... .. //depot/projects/nsched/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/nsched/sys/dev/sound/usb/uaudio_pcm.c#5 integrate Differences ... ==== //depot/projects/nsched/sys/dev/sound/usb/uaudio.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.9 2004/12/25 06:20:49 julian Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.12 2004/12/25 08:55:52 julian Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -143,8 +143,11 @@ u_int mul; #if defined(__FreeBSD__) /* XXXXX */ unsigned ctl; -#else +#define MAX_SELECTOR_INPUT_PIN 256 + u_int8_t slctrtype[MAX_SELECTOR_INPUT_PIN]; +#endif u_int8_t class; +#if !defined(__FreeBSD__) char ctlname[MAX_AUDIO_DEV_LEN]; char *ctlunit; #endif @@ -262,13 +265,17 @@ #define UAC_EQUAL 2 #define UAC_RECORD 3 #define UAC_NCLASSES 4 -#if !defined(__FreeBSD__) #ifdef USB_DEBUG +#if defined(__FreeBSD__) +#define AudioCinputs "inputs" +#define AudioCoutputs "outputs" +#define AudioCrecord "record" +#define AudioCequalization "equalization" +#endif Static const char *uac_names[] = { AudioCoutputs, AudioCinputs, AudioCequalization, AudioCrecord, }; #endif -#endif Static usbd_status uaudio_identify_ac (struct uaudio_softc *, const usb_config_descriptor_t *); @@ -306,9 +313,12 @@ #ifdef USB_DEBUG Static const char *uaudio_get_terminal_name(int); #endif -#if !defined(__FreeBSD__) Static int uaudio_determine_class (const struct io_terminal *, struct mixerctl *); +#if defined(__FreeBSD__) +Static const int uaudio_feature_name(const struct io_terminal *, + struct mixerctl *); +#else Static const char *uaudio_feature_name (const struct io_terminal *, struct mixerctl *); #endif @@ -737,7 +747,14 @@ size_t len; struct mixerctl *nmc; -#if !defined(__FreeBSD__) +#if defined(__FreeBSD__) + if (mc->class < UAC_NCLASSES) { + DPRINTF(("%s: adding %s.%d\n", + __func__, uac_names[mc->class], mc->ctl)); + } else { + DPRINTF(("%s: adding %d\n", __func__, mc->ctl)); + } +#else if (mc->class < UAC_NCLASSES) { DPRINTF(("%s: adding %s.%s\n", __func__, uac_names[mc->class], mc->ctlname)); @@ -946,9 +963,7 @@ bm = d1->bmControls; mix.wIndex = MAKE(d->bUnitId, sc->sc_ac_iface); -#if !defined(__FreeBSD__) uaudio_determine_class(&iot[id], &mix); -#endif mix.type = MIX_SIGNED_16; #if !defined(__FreeBSD__) /* XXXXX */ mix.ctlunit = AudioNvolume; @@ -996,24 +1011,34 @@ Static void uaudio_add_selector(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { -#if !defined(__FreeBSD__) || defined(USB_DEBUG) const struct usb_audio_selector_unit *d = iot[id].d.su; -#endif + struct mixerctl mix; #if !defined(__FreeBSD__) - struct mixerctl mix; int i, wp; +#else + int i; + struct mixerctl dummy; #endif DPRINTFN(2,("uaudio_add_selector: bUnitId=%d bNrInPins=%d\n", d->bUnitId, d->bNrInPins)); -#if defined(__FreeBSD__) - printf("uaudio_add_selector: NOT IMPLEMENTED\n"); -#else mix.wIndex = MAKE(d->bUnitId, sc->sc_ac_iface); mix.wValue[0] = MAKE(0, 0); uaudio_determine_class(&iot[id], &mix); mix.nchan = 1; mix.type = MIX_SELECTOR; +#if defined(__FreeBSD__) + mix.ctl = SOUND_MIXER_NRDEVICES; /* XXXXX */ + mix.minval = 1; + mix.maxval = d->bNrInPins; + mix.mul = mix.maxval - mix.minval; + for (i = 0; i < MAX_SELECTOR_INPUT_PIN; i++) { + mix.slctrtype[i] = SOUND_MIXER_NRDEVICES; + } + for (i = mix.minval; i <= mix.maxval; i++) { + mix.slctrtype[i - 1] = uaudio_feature_name(&iot[d->baSourceId[i - 1]], &dummy); + } +#else mix.ctlunit = ""; mix.minval = 1; mix.maxval = d->bNrInPins; @@ -1025,8 +1050,8 @@ if (wp > MAX_AUDIO_DEV_LEN - 1) break; } +#endif uaudio_mixer_add_ctl(sc, &mix); -#endif } #ifdef USB_DEBUG @@ -1106,7 +1131,6 @@ } #endif -#if !defined(__FreeBSD__) Static int uaudio_determine_class(const struct io_terminal *iot, struct mixerctl *mix) { @@ -1157,6 +1181,108 @@ return terminal_type; } +#if defined(__FreeBSD__) +const int +uaudio_feature_name(const struct io_terminal *iot, struct mixerctl *mix) +{ + int terminal_type; + + terminal_type = uaudio_determine_class(iot, mix); + if (mix->class == UAC_RECORD && terminal_type == 0) + return SOUND_MIXER_IMIX; + DPRINTF(("%s: terminal_type=%s\n", __func__, + uaudio_get_terminal_name(terminal_type))); + switch (terminal_type) { + case UAT_STREAM: + return SOUND_MIXER_PCM; + + case UATI_MICROPHONE: + case UATI_DESKMICROPHONE: + case UATI_PERSONALMICROPHONE: + case UATI_OMNIMICROPHONE: + case UATI_MICROPHONEARRAY: + case UATI_PROCMICROPHONEARR: + return SOUND_MIXER_MIC; + + case UATO_SPEAKER: + case UATO_DESKTOPSPEAKER: + case UATO_ROOMSPEAKER: + case UATO_COMMSPEAKER: + return SOUND_MIXER_SPEAKER; + + case UATE_ANALOGCONN: + case UATE_LINECONN: + case UATE_LEGACYCONN: + return SOUND_MIXER_LINE; + + case UATE_DIGITALAUIFC: + case UATE_SPDIF: + case UATE_1394DA: + case UATE_1394DV: + return SOUND_MIXER_ALTPCM; + + case UATF_CDPLAYER: + return SOUND_MIXER_CD; + + case UATF_SYNTHESIZER: + return SOUND_MIXER_SYNTH; + + case UATF_VIDEODISCAUDIO: + case UATF_DVDAUDIO: + case UATF_TVTUNERAUDIO: + return SOUND_MIXER_VIDEO; + +/* telephony terminal types */ + case UATT_UNDEFINED: + case UATT_PHONELINE: + case UATT_TELEPHONE: + case UATT_DOWNLINEPHONE: + return SOUND_MIXER_PHONEIN; +/* return SOUND_MIXER_PHONEOUT;*/ + + case UATF_RADIORECV: + case UATF_RADIOXMIT: + return SOUND_MIXER_RADIO; + + case UAT_UNDEFINED: + case UAT_VENDOR: + case UATI_UNDEFINED: +/* output terminal types */ + case UATO_UNDEFINED: + case UATO_DISPLAYAUDIO: + case UATO_SUBWOOFER: + case UATO_HEADPHONES: +/* bidir terminal types */ + case UATB_UNDEFINED: + case UATB_HANDSET: + case UATB_HEADSET: + case UATB_SPEAKERPHONE: + case UATB_SPEAKERPHONEESUP: + case UATB_SPEAKERPHONEECANC: +/* external terminal types */ + case UATE_UNDEFINED: +/* embedded function terminal types */ + case UATF_UNDEFINED: + case UATF_CALIBNOISE: + case UATF_EQUNOISE: + case UATF_DAT: + case UATF_DCC: + case UATF_MINIDISK: + case UATF_ANALOGTAPE: + case UATF_PHONOGRAPH: + case UATF_VCRAUDIO: + case UATF_SATELLITE: + case UATF_CABLETUNER: + case UATF_DSS: + case UATF_MULTITRACK: + case 0xffff: + default: + DPRINTF(("%s: 'master' for 0x%.4x\n", __func__, terminal_type)); + return SOUND_MIXER_VOLUME; + } + return SOUND_MIXER_VOLUME; +} +#else Static const char * uaudio_feature_name(const struct io_terminal *iot, struct mixerctl *mix) { @@ -1270,7 +1396,9 @@ u_int fumask, mmask, cmask; struct mixerctl mix; int chan, ctl, i, unit; -#if !defined(__FreeBSD__) +#if defined(__FreeBSD__) + int mixernumber; +#else const char *mixername; #endif @@ -1315,7 +1443,9 @@ } #undef GET -#if !defined(__FreeBSD__) +#if defined(__FreeBSD__) + mixernumber = uaudio_feature_name(&iot[id], &mix); +#else mixername = uaudio_feature_name(&iot[id], &mix); #endif switch (ctl) { @@ -1332,8 +1462,7 @@ case VOLUME_CONTROL: mix.type = MIX_SIGNED_16; #if defined(__FreeBSD__) - /* mix.ctl = SOUND_MIXER_VOLUME; */ - mix.ctl = SOUND_MIXER_PCM; + mix.ctl = mixernumber; #else mix.ctlunit = AudioNvolume; strlcpy(mix.ctlname, mixername, sizeof(mix.ctlname)); @@ -1441,9 +1570,7 @@ mix.wIndex = MAKE(d->bUnitId, sc->sc_ac_iface); mix.nchan = 1; mix.wValue[0] = MAKE(UD_MODE_SELECT_CONTROL, 0); -#if !defined(__FreeBSD__) uaudio_determine_class(&iot[id], &mix); -#endif mix.type = MIX_ON_OFF; /* XXX */ #if !defined(__FreeBSD__) mix.ctlunit = ""; @@ -1474,9 +1601,7 @@ mix.wIndex = MAKE(d->bUnitId, sc->sc_ac_iface); mix.nchan = 1; mix.wValue[0] = MAKE(XX_ENABLE_CONTROL, 0); -#if !defined(__FreeBSD__) uaudio_determine_class(&iot[id], &mix); -#endif mix.type = MIX_ON_OFF; #if !defined(__FreeBSD__) mix.ctlunit = ""; @@ -1522,9 +1647,7 @@ mix.wIndex = MAKE(d->bUnitId, sc->sc_ac_iface); mix.nchan = 1; mix.wValue[0] = MAKE(UA_EXT_ENABLE, 0); -#if !defined(__FreeBSD__) uaudio_determine_class(&iot[id], &mix); -#endif mix.type = MIX_ON_OFF; #if !defined(__FreeBSD__) mix.ctlunit = ""; @@ -3523,6 +3646,9 @@ int i, j, enc; int samples_per_frame, sample_size; + if ((sc->sc_playchan.pipe != NULL) || (sc->sc_recchan.pipe != NULL)) + return (-1); + switch(ch->format & 0x0000FFFF) { case AFMT_U8: enc = AUDIO_ENCODING_ULINEAR_LE; @@ -3569,7 +3695,6 @@ } /* for (mode = ...... */ -/*But this function is used for output only */ for (i = 0; i < sc->sc_nalts; i++) { const struct usb_audio_streaming_type1_descriptor *a1d = sc->sc_alts[i].asf1desc; @@ -3611,7 +3736,10 @@ } } /* return (EINVAL); */ - printf("uaudio: This device can't play in rate=%d.\n", ch->sample_rate); + if (mode == AUMODE_PLAY) + printf("uaudio: This device can't play in rate=%d.\n", ch->sample_rate); + else + printf("uaudio: This device can't record in rate=%d.\n", ch->sample_rate); return (-1); found: @@ -3842,6 +3970,65 @@ } int +uaudio_halt_in_dma(device_t dev) +{ + struct uaudio_softc *sc; + + sc = device_get_softc(dev); + + if (sc->sc_dying) + return (EIO); + + DPRINTF(("uaudio_halt_in_dma: enter\n")); + if (sc->sc_recchan.pipe != NULL) { + uaudio_chan_close(sc, &sc->sc_recchan); + sc->sc_recchan.pipe = NULL; + uaudio_chan_free_buffers(sc, &sc->sc_recchan); +/* sc->sc_recchan.intr = NULL; */ + } + return (0); +} + +int +uaudio_trigger_input(device_t dev) +{ + struct uaudio_softc *sc; + struct chan *ch; + usbd_status err; + int i, s; + + sc = device_get_softc(dev); + ch = &sc->sc_recchan; + + if (sc->sc_dying) + return (EIO); + +/* uaudio_chan_set_param(ch, start, end, blksize) */ + if (uaudio_init_params(sc, ch, AUMODE_RECORD)) + return (EIO); + + err = uaudio_chan_alloc_buffers(sc, ch); + if (err) + return (EIO); + + err = uaudio_chan_open(sc, ch); + if (err) { + uaudio_chan_free_buffers(sc, ch); + return (EIO); + } + +/* ch->intr = intr; + ch->arg = arg; */ + + s = splusb(); + for (i = 0; i < UAUDIO_NCHANBUFS-1; i++) /* XXX -1 shouldn't be needed */ + uaudio_chan_rtransfer(ch); + splx(s); + + return (0); +} + +int uaudio_trigger_output(device_t dev) { struct uaudio_softc *sc; @@ -3896,6 +4083,39 @@ return mask; } +u_int32_t +uaudio_query_recsrc_info(device_t dev) +{ + int i, rec_selector_id; + u_int32_t mask = 0; + struct uaudio_softc *sc; + struct mixerctl *mc; + + sc = device_get_softc(dev); + rec_selector_id = -1; + for (i=0; i < sc->sc_nctls; i++) { + mc = &sc->sc_ctls[i]; + if (mc->ctl == SOUND_MIXER_NRDEVICES && + mc->type == MIX_SELECTOR && mc->class == UAC_RECORD) { + if (rec_selector_id == -1) { + rec_selector_id = i; + } else { + printf("There are many selectors. Can't recognize which selector is a record source selector.\n"); + return mask; + } + } + } + if (rec_selector_id == -1) + return mask; + mc = &sc->sc_ctls[rec_selector_id]; + for (i = mc->minval; i <= mc->maxval; i++) { + if (mc->slctrtype[i - 1] == SOUND_MIXER_NRDEVICES) + continue; + mask |= 1 << mc->slctrtype[i - 1]; + } + return mask; +} + void uaudio_mixer_set(device_t dev, unsigned type, unsigned left, unsigned right) { @@ -3918,6 +4138,39 @@ return; } +u_int32_t +uaudio_mixer_setrecsrc(device_t dev, u_int32_t src) +{ + int i, rec_selector_id; + struct uaudio_softc *sc; + struct mixerctl *mc; + + sc = device_get_softc(dev); + rec_selector_id = -1; + for (i=0; i < sc->sc_nctls; i++) { + mc = &sc->sc_ctls[i]; + if (mc->ctl == SOUND_MIXER_NRDEVICES && + mc->type == MIX_SELECTOR && mc->class == UAC_RECORD) { + if (rec_selector_id == -1) { + rec_selector_id = i; + } else { + return src; /* Can't recognize which selector is record source selector */ + } + } + } + if (rec_selector_id == -1) + return src; + mc = &sc->sc_ctls[rec_selector_id]; + for (i = mc->minval; i <= mc->maxval; i++) { + if (src != (1 << mc->slctrtype[i - 1])) + continue; + uaudio_ctl_set(sc, SET_CUR, mc, 0, i); + return (1 << mc->slctrtype[i - 1]); + } + uaudio_ctl_set(sc, SET_CUR, mc, 0, mc->minval); + return (1 << mc->slctrtype[mc->minval - 1]); +} + Static int audio_attach_mi(device_t dev) { ==== //depot/projects/nsched/sys/dev/sound/usb/uaudio.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.2 2004/12/25 06:20:49 julian Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.4 2004/12/25 08:55:52 julian Exp $ */ /* * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -25,7 +25,9 @@ * SUCH DAMAGE. */ +#if 0 #define NO_RECORDING /* XXX: some routines missing from uaudio.c */ +#endif /* Defined in uaudio.c, used in uaudio_pcm,c */ @@ -44,5 +46,7 @@ int uaudio_chan_getptr(device_t dev, int); void uaudio_mixer_set(device_t dev, unsigned type, unsigned left, unsigned right); +u_int32_t uaudio_mixer_setrecsrc(device_t dev, u_int32_t src); u_int32_t uaudio_query_mix_info(device_t dev); +u_int32_t uaudio_query_recsrc_info(device_t dev); void uaudio_query_formats(device_t dev, u_int32_t *pfmt, u_int32_t *rfmt); ==== //depot/projects/nsched/sys/dev/sound/usb/uaudio_pcm.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.6 2004/12/25 06:20:49 julian Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.8 2004/12/25 08:55:52 julian Exp $ */ /* * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -73,6 +73,7 @@ ch->parent = sc; ch->channel = c; ch->buffer = b; + ch->dir = dir; pa_dev = device_get_parent(sc->sc_dev); /* Create ua_playfmt[] & ua_recfmt[] */ @@ -235,6 +236,9 @@ mask = uaudio_query_mix_info(pa_dev); mix_setdevs(m, mask); + mask = uaudio_query_recsrc_info(pa_dev); + mix_setrecdevs(m, mask); + return 0; } @@ -253,7 +257,11 @@ static int ua_mixer_setrecsrc(struct snd_mixer *m, u_int32_t src) { - return src; + device_t pa_dev; + struct ua_info *ua = mix_getdevinfo(m); + + pa_dev = device_get_parent(ua->sc_dev); + return uaudio_mixer_setrecsrc(pa_dev, src); } static kobj_method_t ua_mixer_methods[] = { @@ -320,7 +328,11 @@ snprintf(status, SND_STATUSLEN, "at addr ?"); +#ifndef NO_RECORDING + if (pcm_register(dev, ua, 1, 1)) { +#else if (pcm_register(dev, ua, 1, 0)) { +#endif return(ENXIO); } From owner-p4-projects@FreeBSD.ORG Sat Dec 25 13:08:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B13616A4D0; Sat, 25 Dec 2004 13:08:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1700B16A4CE for ; Sat, 25 Dec 2004 13:08:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF6AC43D4C for ; Sat, 25 Dec 2004 13:08:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPD8Jro036524 for ; Sat, 25 Dec 2004 13:08:19 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPD8Jgu036515 for perforce@freebsd.org; Sat, 25 Dec 2004 13:08:19 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 25 Dec 2004 13:08:19 GMT Message-Id: <200412251308.iBPD8Jgu036515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 67675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 13:08:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=67675 Change 67675 by davidxu@davidxu_tiger on 2004/12/25 13:08:08 Refine simple mutex type locking code. The simple mutex has already ability to be shared among processes, but because pthread_mutex_t was defined as a pointer, current it can not be shared by processes. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#5 (text+ko) ==== @@ -66,7 +66,6 @@ #define THR_IN_MUTEXQ(thr) (((thr)->sflags & THR_FLAGS_IN_SYNCQ) != 0) #define MUTEX_DESTROY(m) do { \ - _UMTX_DESTROY(&(m)->m_lock); \ free(m); \ } while (0) @@ -103,7 +102,7 @@ int -_pthread_mutex_init(pthread_mutex_t *mutex, +__pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutex_attr) { struct pthread_mutex *pmutex; @@ -151,7 +150,7 @@ malloc(sizeof(struct pthread_mutex))) == NULL) { ret = ENOMEM; } else { - _UMTX_INIT(&pmutex->m_lock); + umtx_init(&pmutex->m_lock); /* Set the mutex flags: */ pmutex->m_flags = flags; @@ -201,10 +200,26 @@ return (ret); } +int +_pthread_mutex_init(pthread_mutex_t *mutex, + const pthread_mutexattr_t *mutex_attr) +{ + struct pthread_mutex_attr mattr, *mattrp; + + if ((mutex_attr == NULL) || (*mutex_attr == NULL)) + return (__pthread_mutex_init(mutex, &static_mattr)); + else { + mattr = **mutex_attr; + mattr.m_flags |= MUTEX_FLAGS_PRIVATE; + mattrp = &mattr; + return (__pthread_mutex_init(mutex, &mattrp)); + } +} + void _thr_mutex_reinit(pthread_mutex_t *mutex) { - _UMTX_REINIT(&(*mutex)->m_lock); + umtx_init(&(*mutex)->m_lock); TAILQ_INIT(&(*mutex)->m_queue); MUTEX_INIT_LINK(*mutex); (*mutex)->m_owner = NULL; @@ -217,6 +232,7 @@ int _pthread_mutex_destroy(pthread_mutex_t *mutex) { + struct pthread *curthread = _get_curthread(); pthread_mutex_t m; int ret = 0; @@ -224,11 +240,22 @@ ret = EINVAL; else { /* - * Check to see if this mutex is in use: + * Try to lock the mutex structure, we only need to + * try once, if failed, the mutex is in used. + */ + ret = umtx_trylock(&(*mutex)->m_lock, curthread->tid); + if (ret) + return (ret); + + /* + * Check mutex other fields to see if this mutex is + * in use. Mostly for prority mutex types, or there + * are condition variables referencing it. */ if (((*mutex)->m_owner != NULL) || (TAILQ_FIRST(&(*mutex)->m_queue) != NULL) || ((*mutex)->m_refcount != 0)) { + umtx_unlock(&(*mutex)->m_lock, curthread->tid); ret = EBUSY; } else { /* @@ -238,6 +265,9 @@ m = *mutex; *mutex = NULL; + /* Unlock the mutex structure: */ + umtx_unlock(&m->m_lock, curthread->tid); + /* * Free the memory allocated for the mutex * structure: @@ -276,7 +306,7 @@ THR_LOCK_ACQUIRE(thread, &_mutex_static_lock); if (*mutex == NULL) - ret = pthread_mutex_init(mutex, &static_mattr); + ret = _pthread_mutex_init(mutex, &static_mattr); else ret = 0; @@ -291,15 +321,17 @@ int ret = 0; THR_ASSERT((mutex != NULL) && (*mutex != NULL), - "Uninitialized mutex in pthread_mutex_trylock_basic"); + "Uninitialized mutex in pthread_mutex_trylock"); + /* Short cut for simple mutex. */ if ((*mutex)->m_protocol == PTHREAD_PRIO_NONE) { ret = umtx_trylock(&(*mutex)->m_lock, curthread->tid); if (ret == 0) { (*mutex)->m_owner = curthread; /* - * XXX there should be a separated list for owned mutex, - * separated it from priority mutex list + * XXX there should be a separated list for + * owned mutex, separated it from priority + * mutex list */ #if 0 /* Add to the list of owned mutexes: */ @@ -307,14 +339,15 @@ TAILQ_INSERT_TAIL(&curthread->mutexq, (*mutex), m_qe); #endif - } else if ((*mutex)->m_owner == curthread) + } else if (umtx_owner(&(*mutex)->m_lock) == curthread->tid) { ret = mutex_self_trylock(curthread, *mutex); - else - ret = EBUSY; + } /* else {} */ return (ret); } + /* Code for priority mutex */ + /* Lock the mutex structure: */ THR_LOCK_ACQUIRE(curthread, &(*mutex)->m_lock); @@ -462,14 +495,17 @@ THR_ASSERT((m != NULL) && (*m != NULL), "Uninitialized mutex in mutex_lock_common"); + /* Short cut for simple mutex. */ + if ((*m)->m_protocol == PTHREAD_PRIO_NONE) { /* Default POSIX mutex: */ ret = umtx_trylock(&(*m)->m_lock, curthread->tid); if (ret == 0) { (*m)->m_owner = curthread; /* - * XXX there should be a separated list for owned mutex, - * separated it from priority mutex list + * XXX there should be a separated list for + * owned mutex, separated it from priority + * mutex list */ #if 0 /* Add to the list of owned mutexes: */ @@ -477,18 +513,21 @@ TAILQ_INSERT_TAIL(&curthread->mutexq, (*m), m_qe); #endif - } else if ((*m)->m_owner == curthread && - !((*m)->m_type == PTHREAD_MUTEX_NORMAL && - abstime != NULL)) { + } else if (umtx_owner(&(*m)->m_lock) == curthread->tid && + (*m)->m_type != PTHREAD_MUTEX_NORMAL) { ret = mutex_self_lock(curthread, *m); } else { - if (abstime != NULL) { - ret = umtx_timedlock(&(*m)->m_lock, curthread->tid, - (struct timespec *)abstime); + if (abstime == NULL) { + ret = UMTX_LOCK(&(*m)->m_lock, curthread->tid); + } else { + ret = umtx_timedlock(&(*m)->m_lock, + curthread->tid, abstime); + /* + * Timed out wait is not restarted if + * it was interrupted, not worth to do it. + */ if (ret == EAGAIN || ret == EINTR) ret = ETIMEDOUT; - } else { - ret = _UMTX_LOCK(&(*m)->m_lock, curthread->tid); } if (ret == 0) { (*m)->m_owner = curthread; @@ -503,6 +542,8 @@ return (ret); } + /* Code for priority mutex */ + if (abstime != NULL && (abstime->tv_sec < 0 || abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)) return (EINVAL); @@ -884,7 +925,7 @@ static inline int mutex_self_trylock(struct pthread *curthread, pthread_mutex_t m) { - int ret = 0; + int ret; switch (m->m_type) { /* case PTHREAD_MUTEX_DEFAULT: */ @@ -896,6 +937,7 @@ case PTHREAD_MUTEX_RECURSIVE: /* Increment the lock count: */ m->m_count++; + ret = 0; break; default: @@ -909,7 +951,7 @@ static inline int mutex_self_lock(struct pthread *curthread, pthread_mutex_t m) { - int ret = 0; + int ret; switch (m->m_type) { /* case PTHREAD_MUTEX_DEFAULT: */ @@ -935,6 +977,7 @@ /* Schedule the next thread: */ _thr_sched_switch_unlocked(curthread); + ret = 0; break; case PTHREAD_MUTEX_RECURSIVE: @@ -960,15 +1003,19 @@ if (m == NULL || *m == NULL) ret = EINVAL; else { + /* Short cut for simple mutex. */ + if ((*m)->m_protocol == PTHREAD_PRIO_NONE) { /* * Check if the running thread is not the owner of the * mutex: */ - if ((*m)->m_owner != curthread) + if (__predict_false(umtx_owner(&(*m)->m_lock) != + curthread->tid)) { ret = EPERM; - else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) && - ((*m)->m_count > 0)) { + } else if (__predict_false( + (*m)->m_type == PTHREAD_MUTEX_RECURSIVE && + (*m)->m_count > 0)) { /* Decrement the count: */ (*m)->m_count--; if (add_reference) @@ -996,15 +1043,15 @@ (*m)->m_refcount++; /* * Hand off the mutex to the next waiting - * thread: + * thread, XXX ignore return value. */ - ret = umtx_unlock(&(*m)->m_lock, - curthread->tid); - /* XXX decrease refcount if failed ? */ + umtx_unlock(&(*m)->m_lock, curthread->tid); } return (ret); } + /* Code for priority mutex */ + /* Lock the mutex structure: */ THR_LOCK_ACQUIRE(curthread, &(*m)->m_lock); From owner-p4-projects@FreeBSD.ORG Sat Dec 25 13:12:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10AF316A4D0; Sat, 25 Dec 2004 13:12:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0CE716A4CE for ; Sat, 25 Dec 2004 13:12:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85DF943D46 for ; Sat, 25 Dec 2004 13:12:25 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPDCPxX037109 for ; Sat, 25 Dec 2004 13:12:25 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPDCP35037106 for perforce@freebsd.org; Sat, 25 Dec 2004 13:12:25 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 25 Dec 2004 13:12:25 GMT Message-Id: <200412251312.iBPDCP35037106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 67676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 13:12:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=67676 Change 67676 by davidxu@davidxu_tiger on 2004/12/25 13:11:56 Use new umtx's condition variable feature to implement pthread condition variable, we only need a few of lines to implement it. The condition variable has already ablitity to be shared among processes, but because current pthread_cond_t is defined as a pointer, it can not be shared until pthread.h is changed, that needs version bump. Cancellation point does not work, will be added later. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#4 (text+ko) ==== @@ -35,22 +35,20 @@ #include #include #include +#include + #include "thr_private.h" -#define THR_IN_CONDQ(thr) (((thr)->sflags & THR_FLAGS_IN_SYNCQ) != 0) -#define THR_CONDQ_SET(thr) (thr)->sflags |= THR_FLAGS_IN_SYNCQ -#define THR_CONDQ_CLEAR(thr) (thr)->sflags &= ~THR_FLAGS_IN_SYNCQ - /* * Prototypes */ -static inline void cond_queue_remove(pthread_cond_t, pthread_t); -static inline void cond_queue_enq(pthread_cond_t, pthread_t); -static void cond_wait_backout(void *); -static inline void check_continuation(struct pthread *, - struct pthread_cond *, pthread_mutex_t *); -static int init_static(struct pthread *thread, - pthread_cond_t *cond); +static inline void check_continuation(struct pthread *, + struct pthread_cond *, pthread_mutex_t *); +static int init_static(struct pthread *thread, + pthread_cond_t *cond); +static int cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, + const struct timespec *abstime); +static int cond_signal_common(pthread_cond_t *cond, int broadcast); /* * Double underscore versions are cancellation points. Single underscore @@ -69,61 +67,24 @@ int _pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *cond_attr) { - enum pthread_cond_type type; pthread_cond_t pcond; - int flags; int rval = 0; if (cond == NULL) rval = EINVAL; else { - /* - * Check if a pointer to a condition variable attribute - * structure was passed by the caller: - */ - if (cond_attr != NULL && *cond_attr != NULL) { - /* Default to a fast condition variable: */ - type = (*cond_attr)->c_type; - flags = (*cond_attr)->c_flags; + if ((pcond = (pthread_cond_t) + malloc(sizeof(struct pthread_cond))) == NULL) { + rval = ENOMEM; } else { - /* Default to a fast condition variable: */ - type = COND_TYPE_FAST; - flags = 0; - } - - /* Process according to condition variable type: */ - switch (type) { - /* Fast condition variable: */ - case COND_TYPE_FAST: - /* Nothing to do here. */ - break; - - /* Trap invalid condition variable types: */ - default: - /* Return an invalid argument error: */ - rval = EINVAL; - break; + /* + * Initialise the condition variable structure: + */ + umtx_init(&pcond->c_lock); + pcond->c_count = 0; + pcond->c_flags = 0; + *cond = pcond; } - - /* Check for no errors: */ - if (rval == 0) { - if ((pcond = (pthread_cond_t) - malloc(sizeof(struct pthread_cond))) == NULL) { - rval = ENOMEM; - } else { - /* - * Initialise the condition variable - * structure: - */ - _UMTX_INIT(&pcond->c_lock); - TAILQ_INIT(&pcond->c_queue); - pcond->c_flags = COND_FLAGS_INITED; - pcond->c_type = type; - pcond->c_mutex = NULL; - pcond->c_seqno = 0; - *cond = pcond; - } - } } /* Return the completion status: */ return (rval); @@ -155,8 +116,15 @@ rval = EINVAL; else { /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); - + rval = UMTX_LOCK(&(*cond)->c_lock, curthread->tid); + if (rval) + return (rval); + while ((*cond)->c_count) { + rval = umtx_wake(&(*cond)->c_count, (*cond)->c_count); + if (rval <= 0) + break; + (*cond)->c_count -= rval; + } /* * NULL the caller's pointer now that the condition * variable has been destroyed: @@ -165,7 +133,7 @@ *cond = NULL; /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &cv->c_lock); + umtx_unlock(&cv->c_lock, curthread->tid); /* Free the cond lock structure: */ @@ -180,186 +148,56 @@ return (rval); } -int -_pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) +static int +cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, + const struct timespec *abstime) { struct pthread *curthread = _get_curthread(); int rval = 0; - int done = 0; - int mutex_locked = 1; - int seqno; - - if (cond == NULL) - return (EINVAL); /* * If the condition variable is statically initialized, * perform the dynamic initialization: */ - if (*cond == NULL && - (rval = init_static(curthread, cond)) != 0) + if (__predict_false(*cond == NULL && + (rval = init_static(curthread, cond)) != 0)) return (rval); - /* - * Enter a loop waiting for a condition signal or broadcast - * to wake up this thread. A loop is needed in case the waiting - * thread is interrupted by a signal to execute a signal handler. - * It is not (currently) possible to remain in the waiting queue - * while running a handler. Instead, the thread is interrupted - * and backed out of the waiting queue prior to executing the - * signal handler. - */ - - /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); - seqno = (*cond)->c_seqno; - do { - /* - * If the condvar was statically allocated, properly - * initialize the tail queue. - */ - if (((*cond)->c_flags & COND_FLAGS_INITED) == 0) { - TAILQ_INIT(&(*cond)->c_queue); - (*cond)->c_flags |= COND_FLAGS_INITED; + if ((rval = UMTX_LOCK(&(*cond)->c_lock, curthread->tid)) == 0) { + rval = _mutex_cv_unlock(mutex); + if (__predict_false(rval)) { + umtx_unlock(&(*cond)->c_lock, curthread->tid); + return (rval); } - /* Process according to condition variable type: */ - switch ((*cond)->c_type) { - /* Fast condition variable: */ - case COND_TYPE_FAST: - if ((mutex == NULL) || (((*cond)->c_mutex != NULL) && - ((*cond)->c_mutex != *mutex))) { - /* Return invalid argument error: */ - rval = EINVAL; - } else { - /* Reset the timeout and interrupted flags: */ - curthread->timeout = 0; - curthread->interrupted = 0; + /* I don't think you may have INIT_MAX threads. */ + if ((*cond)->c_count != INT_MAX) + (*cond)->c_count++; - /* - * Queue the running thread for the condition - * variable: - */ - cond_queue_enq(*cond, curthread); + rval = umtx_timedwait(&(*cond)->c_lock, curthread->tid, + &(*cond)->c_count, abstime); + if (rval == EINTR) + rval = 0; + else if (rval == EAGAIN) /* POSIX needs ETIMEDOUT */ + rval = ETIMEDOUT; - /* Remember the mutex: */ - (*cond)->c_mutex = *mutex; - curthread->sigbackout = cond_wait_backout; - - /* Wait forever: */ - curthread->wakeup_time.tv_sec = -1; - - /* Unlock the mutex: */ - if (mutex_locked && - ((rval = _mutex_cv_unlock(mutex)) != 0)) { - /* - * Cannot unlock the mutex, so remove - * the running thread from the condition - * variable queue: - */ - cond_queue_remove(*cond, curthread); - curthread->sigbackout = NULL; - - /* Check for no more waiters: */ - if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) - (*cond)->c_mutex = NULL; - } - else { - /* - * Don't unlock the mutex the next - * time through the loop (if the - * thread has to be requeued after - * handling a signal). - */ - mutex_locked = 0; - - /* - * This thread is active and is in a - * critical region (holding the cv - * lock); we should be able to safely - * set the state. - */ - THR_LOCK_SWITCH(curthread); - THR_SET_STATE(curthread, PS_COND_WAIT); - - /* Remember the CV: */ - curthread->data.cond = *cond; - - /* Unlock the CV structure: */ - THR_LOCK_RELEASE(curthread, - &(*cond)->c_lock); - - /* Schedule the next thread: */ - _thr_sched_switch_unlocked(curthread); - - /* - * XXX - This really isn't a good check - * since there can be more than one - * thread waiting on the CV. Signals - * sent to threads waiting on mutexes - * or CVs should really be deferred - * until the threads are no longer - * waiting, but POSIX says that signals - * should be sent "as soon as possible". - */ - done = (seqno != (*cond)->c_seqno); - if (done && !THR_IN_CONDQ(curthread)) { - /* - * The thread is dequeued, so - * it is safe to clear this. - */ - curthread->data.cond = NULL; - curthread->sigbackout = NULL; - check_continuation(curthread, - NULL, mutex); - return (_mutex_cv_lock(mutex)); - } - - /* Relock the CV structure: */ - THR_LOCK_ACQUIRE(curthread, - &(*cond)->c_lock); - - /* - * Clear these after taking the lock to - * prevent a race condition where a - * signal can arrive before dequeueing - * the thread. - */ - curthread->data.cond = NULL; - curthread->sigbackout = NULL; - done = (seqno != (*cond)->c_seqno); - - if (THR_IN_CONDQ(curthread)) { - cond_queue_remove(*cond, - curthread); - - /* Check for no more waiters: */ - if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) - (*cond)->c_mutex = NULL; - } - } - } - break; - - /* Trap invalid condition variable types: */ - default: - /* Return an invalid argument error: */ - rval = EINVAL; - break; - } - - check_continuation(curthread, *cond, - mutex_locked ? NULL : mutex); - } while ((done == 0) && (rval == 0)); - - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - - if (mutex_locked == 0) + /* + * Note! we don't touch condition variable after resuming! + * this makes it possible that waker can destroy the condition + * variable after calling pthread_cond_broadcast(), please + * see Single UNIX Specification Version 3 of + * pthread_cond_destroy(). + */ + check_continuation(curthread, NULL, mutex); _mutex_cv_lock(mutex); + } + return (rval); +} - /* Return the completion status: */ - return (rval); +int +_pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) +{ + return cond_wait_common(cond, mutex, NULL); } __strong_reference(_pthread_cond_wait, _thr_cond_wait); @@ -371,7 +209,7 @@ int ret; _thr_cancel_enter(curthread); - ret = _pthread_cond_wait(cond, mutex); + ret = cond_wait_common(cond, mutex, NULL); _thr_cancel_leave(curthread, 1); return (ret); } @@ -380,192 +218,9 @@ _pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex, const struct timespec * abstime) { - struct pthread *curthread = _get_curthread(); - int rval = 0; - int done = 0; - int mutex_locked = 1; - int seqno; - - THR_ASSERT(curthread->locklevel == 0, - "cv_timedwait: locklevel is not zero!"); - - if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 || - abstime->tv_nsec >= 1000000000) + if (abstime == NULL) return (EINVAL); - /* - * If the condition variable is statically initialized, perform dynamic - * initialization. - */ - if (*cond == NULL && (rval = init_static(curthread, cond)) != 0) - return (rval); - - /* - * Enter a loop waiting for a condition signal or broadcast - * to wake up this thread. A loop is needed in case the waiting - * thread is interrupted by a signal to execute a signal handler. - * It is not (currently) possible to remain in the waiting queue - * while running a handler. Instead, the thread is interrupted - * and backed out of the waiting queue prior to executing the - * signal handler. - */ - - /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); - seqno = (*cond)->c_seqno; - do { - /* - * If the condvar was statically allocated, properly - * initialize the tail queue. - */ - if (((*cond)->c_flags & COND_FLAGS_INITED) == 0) { - TAILQ_INIT(&(*cond)->c_queue); - (*cond)->c_flags |= COND_FLAGS_INITED; - } - - /* Process according to condition variable type: */ - switch ((*cond)->c_type) { - /* Fast condition variable: */ - case COND_TYPE_FAST: - if ((mutex == NULL) || (((*cond)->c_mutex != NULL) && - ((*cond)->c_mutex != *mutex))) { - /* Return invalid argument error: */ - rval = EINVAL; - } else { - /* Set the wakeup time: */ - curthread->wakeup_time.tv_sec = abstime->tv_sec; - curthread->wakeup_time.tv_nsec = - abstime->tv_nsec; - - /* Reset the timeout and interrupted flags: */ - curthread->timeout = 0; - curthread->interrupted = 0; - - /* - * Queue the running thread for the condition - * variable: - */ - cond_queue_enq(*cond, curthread); - - /* Remember the mutex and sequence number: */ - (*cond)->c_mutex = *mutex; - curthread->sigbackout = cond_wait_backout; - - /* Unlock the mutex: */ - if (mutex_locked && - ((rval = _mutex_cv_unlock(mutex)) != 0)) { - /* - * Cannot unlock the mutex; remove the - * running thread from the condition - * variable queue: - */ - cond_queue_remove(*cond, curthread); - curthread->sigbackout = NULL; - - /* Check for no more waiters: */ - if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) - (*cond)->c_mutex = NULL; - } else { - /* - * Don't unlock the mutex the next - * time through the loop (if the - * thread has to be requeued after - * handling a signal). - */ - mutex_locked = 0; - - /* - * This thread is active and is in a - * critical region (holding the cv - * lock); we should be able to safely - * set the state. - */ - THR_LOCK_SWITCH(curthread); - THR_SET_STATE(curthread, PS_COND_WAIT); - - /* Remember the CV: */ - curthread->data.cond = *cond; - - /* Unlock the CV structure: */ - THR_LOCK_RELEASE(curthread, - &(*cond)->c_lock); - - /* Schedule the next thread: */ - _thr_sched_switch_unlocked(curthread); - - /* - * XXX - This really isn't a good check - * since there can be more than one - * thread waiting on the CV. Signals - * sent to threads waiting on mutexes - * or CVs should really be deferred - * until the threads are no longer - * waiting, but POSIX says that signals - * should be sent "as soon as possible". - */ - done = (seqno != (*cond)->c_seqno); - if (done && !THR_IN_CONDQ(curthread)) { - /* - * The thread is dequeued, so - * it is safe to clear this. - */ - curthread->data.cond = NULL; - curthread->sigbackout = NULL; - check_continuation(curthread, - NULL, mutex); - return (_mutex_cv_lock(mutex)); - } - - /* Relock the CV structure: */ - THR_LOCK_ACQUIRE(curthread, - &(*cond)->c_lock); - - /* - * Clear these after taking the lock to - * prevent a race condition where a - * signal can arrive before dequeueing - * the thread. - */ - curthread->data.cond = NULL; - curthread->sigbackout = NULL; - - done = (seqno != (*cond)->c_seqno); - - if (THR_IN_CONDQ(curthread)) { - cond_queue_remove(*cond, - curthread); - - /* Check for no more waiters: */ - if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) - (*cond)->c_mutex = NULL; - } - - if (curthread->timeout != 0) { - /* The wait timedout. */ - rval = ETIMEDOUT; - } - } - } - break; - - /* Trap invalid condition variable types: */ - default: - /* Return an invalid argument error: */ - rval = EINVAL; - break; - } - - check_continuation(curthread, *cond, - mutex_locked ? NULL : mutex); - } while ((done == 0) && (rval == 0)); - - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - - if (mutex_locked == 0) - _mutex_cv_lock(mutex); - - /* Return the completion status: */ - return (rval); + return cond_wait_common(cond, mutex, abstime); } int @@ -575,74 +230,59 @@ struct pthread *curthread = _get_curthread(); int ret; + if (abstime == NULL) + return (EINVAL); _thr_cancel_enter(curthread); ret = _pthread_cond_timedwait(cond, mutex, abstime); _thr_cancel_leave(curthread, 1); return (ret); } - -int -_pthread_cond_signal(pthread_cond_t * cond) +static int +cond_signal_common(pthread_cond_t *cond, int broadcast) { struct pthread *curthread = _get_curthread(); - struct pthread *pthread; - long tid = -1; int rval = 0; - THR_ASSERT(curthread->locklevel == 0, - "cv_timedwait: locklevel is not zero!"); - if (cond == NULL) - rval = EINVAL; - /* - * If the condition variable is statically initialized, perform dynamic - * initialization. - */ - else if (*cond != NULL || (rval = init_static(curthread, cond)) == 0) { - /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); + /* + * If the condition variable is statically initialized, perform dynamic + * initialization. + */ + if (__predict_false(*cond == NULL && + (rval = init_static(curthread, cond)) != 0)) + return (rval); - /* Process according to condition variable type: */ - switch ((*cond)->c_type) { - /* Fast condition variable: */ - case COND_TYPE_FAST: - /* Increment the sequence number: */ - (*cond)->c_seqno++; + /* Lock the condition variable structure */ + rval = UMTX_LOCK(&(*cond)->c_lock, curthread->tid); + if (__predict_false(rval)) + return (rval); - /* - * Wakeups have to be done with the CV lock held; - * otherwise there is a race condition where the - * thread can timeout, run on another KSE, and enter - * another blocking state (including blocking on a CV). - */ - if ((pthread = TAILQ_FIRST(&(*cond)->c_queue)) - != NULL) { - THR_THREAD_LOCK(curthread, pthread); - cond_queue_remove(*cond, pthread); - pthread->sigbackout = NULL; - tid = _thr_setrunnable_unlocked(pthread); - THR_THREAD_UNLOCK(curthread, pthread); - } - /* Check for no more waiters: */ - if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) - (*cond)->c_mutex = NULL; + while ((*cond)->c_count) { + /* umtx_wake returns number of threads resumed */ + rval = umtx_wake(&(*cond)->c_count, + broadcast ? (*cond)->c_count : 1); + if (rval > 0) { + /* some threads were resumed. */ + (*cond)->c_count -= rval; + rval = 0; + } else if (rval == 0) { + (*cond)->c_count = 0; break; - - /* Trap invalid condition variable types: */ - default: - /* Return an invalid argument error: */ - rval = EINVAL; + } else { + rval = errno; break; } - - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - if (tid != -1) - thr_wake(tid); + if (!broadcast) + break; } + umtx_unlock(&(*cond)->c_lock, curthread->tid); + return (rval); +} - /* Return the completion status: */ - return (rval); +int +_pthread_cond_signal(pthread_cond_t * cond) +{ + return cond_signal_common(cond, 0); } __strong_reference(_pthread_cond_signal, _thr_cond_signal); @@ -650,62 +290,7 @@ int _pthread_cond_broadcast(pthread_cond_t * cond) { - struct pthread *curthread = _get_curthread(); - struct pthread *pthread; - long tid = -1; - int rval = 0; - - THR_ASSERT(curthread->locklevel == 0, - "cv_timedwait: locklevel is not zero!"); - if (cond == NULL) - rval = EINVAL; - /* - * If the condition variable is statically initialized, perform dynamic - * initialization. - */ - else if (*cond != NULL || (rval = pthread_cond_init(cond, NULL)) == 0) { - /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); - - /* Process according to condition variable type: */ - switch ((*cond)->c_type) { - /* Fast condition variable: */ - case COND_TYPE_FAST: - /* Increment the sequence number: */ - (*cond)->c_seqno++; - - /* - * Enter a loop to bring all threads off the - * condition queue: - */ - while ((pthread = TAILQ_FIRST(&(*cond)->c_queue)) - != NULL) { - THR_THREAD_LOCK(curthread, pthread); - cond_queue_remove(*cond, pthread); - pthread->sigbackout = NULL; - tid = _thr_setrunnable_unlocked(pthread); - THR_THREAD_UNLOCK(curthread, pthread); - if (tid != -1) - thr_wake(tid); - } - - /* There are no more waiting threads: */ - (*cond)->c_mutex = NULL; - break; - - /* Trap invalid condition variable types: */ - default: - /* Return an invalid argument error: */ - rval = EINVAL; - break; - } - - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); - } - - /* Return the completion status: */ - return (rval); + return cond_signal_common(cond, 1); } __strong_reference(_pthread_cond_broadcast, _thr_cond_broadcast); @@ -714,101 +299,4 @@ check_continuation(struct pthread *curthread, struct pthread_cond *cond, pthread_mutex_t *mutex) { - if ((curthread->interrupted != 0) && - (curthread->continuation != NULL)) { - if (cond != NULL) - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &cond->c_lock); - /* - * Note that even though this thread may have been - * canceled, POSIX requires that the mutex be - * reaquired prior to cancellation. - */ - if (mutex != NULL) - _mutex_cv_lock(mutex); - curthread->continuation((void *) curthread); - PANIC("continuation returned in pthread_cond_wait.\n"); - } -} - -static void -cond_wait_backout(void *arg) -{ - struct pthread *curthread = (struct pthread *)arg; - pthread_cond_t cond; - - cond = curthread->data.cond; - if (cond != NULL) { - /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &cond->c_lock); - curthread->data.cond = NULL; - - /* Process according to condition variable type: */ - switch (cond->c_type) { - /* Fast condition variable: */ - case COND_TYPE_FAST: - cond_queue_remove(cond, curthread); - - /* Check for no more waiters: */ - if (TAILQ_FIRST(&cond->c_queue) == NULL) - cond->c_mutex = NULL; - break; - - default: - break; - } - - /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &cond->c_lock); - } - /* No need to call this again. */ - curthread->sigbackout = NULL; -} - -/* - * Remove a waiting thread from a condition queue in descending priority - * order. - */ -static inline void -cond_queue_remove(pthread_cond_t cond, struct pthread *pthread) -{ - /* - * Because pthread_cond_timedwait() can timeout as well - * as be signaled by another thread, it is necessary to - * guard against removing the thread from the queue if - * it isn't in the queue. - */ - if (THR_IN_CONDQ(pthread)) { - TAILQ_REMOVE(&cond->c_queue, pthread, sqe); - THR_CONDQ_CLEAR(pthread); - } -} - -/* - * Enqueue a waiting thread to a condition queue in descending priority - * order. - */ -static inline void -cond_queue_enq(pthread_cond_t cond, struct pthread *pthread) -{ - struct pthread *tid = TAILQ_LAST(&cond->c_queue, cond_head); - - THR_ASSERT(!THR_IN_SYNCQ(pthread), - "cond_queue_enq: thread already queued!"); - - /* - * For the common case of all threads having equal priority, - * we perform a quick check against the priority of the thread - * at the tail of the queue. - */ - if ((tid == NULL) || (pthread->active_priority <= tid->active_priority)) - TAILQ_INSERT_TAIL(&cond->c_queue, pthread, sqe); - else { - tid = TAILQ_FIRST(&cond->c_queue); - while (pthread->active_priority <= tid->active_priority) - tid = TAILQ_NEXT(tid, sqe); - TAILQ_INSERT_BEFORE(tid, pthread, sqe); - } - THR_CONDQ_SET(pthread); - pthread->data.cond = cond; } From owner-p4-projects@FreeBSD.ORG Sat Dec 25 13:13:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDAF616A4D0; Sat, 25 Dec 2004 13:13:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91FA216A4CE for ; Sat, 25 Dec 2004 13:13:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DCE043D53 for ; Sat, 25 Dec 2004 13:13:27 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPDDRrS037217 for ; Sat, 25 Dec 2004 13:13:27 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPDDR3V037214 for perforce@freebsd.org; Sat, 25 Dec 2004 13:13:27 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 25 Dec 2004 13:13:27 GMT Message-Id: <200412251313.iBPDDR3V037214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 67677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 13:13:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=67677 Change 67677 by davidxu@davidxu_tiger on 2004/12/25 13:13:11 Fix some ugly MACRO/funcion names. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/Makefile#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/sys/lock.h#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/Makefile#6 (text+ko) ==== @@ -13,6 +13,7 @@ LIB=thread .endif SHLIB_MAJOR= 1 +CFLAGS= CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include @@ -20,9 +21,9 @@ CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} -CFLAGS+=-fno-builtin +CFLAGS+=-fno-builtin -Winline -#CFLAGS+= -g +CFLAGS+= -g # Uncomment this if you want to build a 1:1 threading mode library # however it is no longer strictly conformed to POSIX ==== //depot/projects/davidxu_thread/src/lib/libthread/sys/lock.h#5 (text+ko) ==== @@ -39,25 +39,8 @@ #define _UMTX_INITIALIZER(lck) { {UMTX_UNOWNED} } -static inline void -_UMTX_INIT(struct umtx *m) -{ - m->u_owner = UMTX_UNOWNED; -} - -static inline void -_UMTX_REINIT(struct umtx *m) -{ - m->u_owner = UMTX_UNOWNED; -} - -static inline void -_UMTX_DESTROY(struct umtx *m __unused) -{ -} - static inline int -_UMTX_LOCK(struct umtx *m, long tid) +UMTX_LOCK(struct umtx *m, long tid) { int err; @@ -69,7 +52,7 @@ } static inline void -_UMTX_ACQUIRE(struct umtx *m, long tid) +UMTX_ACQUIRE(struct umtx *m, long tid) { int err; @@ -80,7 +63,7 @@ } static inline void -_UMTX_RELEASE(struct umtx *m, long tid) +UMTX_RELEASE(struct umtx *m, long tid) { if (umtx_unlock(m, tid)) _thr_exit(__FILE__, __LINE__, "umtx_unlock failed.\n"); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#4 (text+ko) ==== @@ -388,21 +388,21 @@ TAILQ_INIT(&_thr_atfork_list); - _UMTX_INIT(&_thread_signal_lock); - _UMTX_INIT(&_mutex_static_lock); - _UMTX_INIT(&_cond_static_lock); - _UMTX_INIT(&_rwlock_static_lock); - _UMTX_INIT(&_keytable_lock); - _UMTX_INIT(&_thread_list_lock); + umtx_init(&_thread_signal_lock); + umtx_init(&_mutex_static_lock); + umtx_init(&_cond_static_lock); + umtx_init(&_rwlock_static_lock); + umtx_init(&_keytable_lock); + umtx_init(&_thread_list_lock); _thr_spinlock_init(); _pthread_mutex_init(&_thr_atfork_mutex, NULL); } else { - _UMTX_REINIT(&_thread_signal_lock); - _UMTX_REINIT(&_mutex_static_lock); - _UMTX_REINIT(&_cond_static_lock); - _UMTX_REINIT(&_rwlock_static_lock); - _UMTX_REINIT(&_keytable_lock); - _UMTX_REINIT(&_thread_list_lock); + umtx_init(&_thread_signal_lock); + umtx_init(&_mutex_static_lock); + umtx_init(&_cond_static_lock); + umtx_init(&_rwlock_static_lock); + umtx_init(&_keytable_lock); + umtx_init(&_thread_list_lock); /* reinitialized in thr_fork.c */ #if 0 _thr_spinlock_init(); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#5 (text+ko) ==== @@ -126,7 +126,7 @@ { curthread->cancelflags &= ~THR_CANCELLING; /* clear aother thread locked us. */ - _UMTX_REINIT(&curthread->lock); + umtx_init(&curthread->lock); thr_self(&curthread->tid); /* reinitialize libc spinlocks, this includes __malloc_lock. */ _thr_spinlock_init(); @@ -151,12 +151,12 @@ TAILQ_INIT(&free_threadq); _gc_count = 0; if (inited == 0) { - _UMTX_INIT(&free_thread_lock); - _UMTX_INIT(&tcb_lock); + umtx_init(&free_thread_lock); + umtx_init(&tcb_lock); inited = 1; } else { - _UMTX_REINIT(&free_thread_lock); - _UMTX_REINIT(&tcb_lock); + umtx_init(&free_thread_lock); + umtx_init(&tcb_lock); } } @@ -581,10 +581,10 @@ /* * Initialize thread locking. */ - _UMTX_INIT(&thread->lock); + umtx_init(&thread->lock); } } else if (thread != NULL) { - _UMTX_REINIT(&thread->lock); + umtx_init(&thread->lock); } return (thread); } @@ -611,7 +611,6 @@ static void thr_destroy(struct pthread *curthread, struct pthread *thread) { - _UMTX_DESTROY(&thread->lock); if (curthread) { THR_LOCK_ACQUIRE(curthread, &tcb_lock); _tcb_dtor(thread->tcb); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#7 (text+ko) ==== @@ -40,6 +40,7 @@ /* * Include files. */ +#include #include #include #include @@ -166,7 +167,7 @@ #define PTHREAD_MUTEXATTR_STATIC_INITIALIZER \ { PTHREAD_MUTEX_DEFAULT, PTHREAD_PRIO_NONE, 0, MUTEX_FLAGS_PRIVATE } -/* +/* * Condition variable definitions. */ enum pthread_cond_type { @@ -178,12 +179,9 @@ /* * Lock for accesses to this structure. */ - struct umtx c_lock; - enum pthread_cond_type c_type; - TAILQ_HEAD(cond_head, pthread) c_queue; - struct pthread_mutex *c_mutex; - long c_flags; - long c_seqno; + struct umtx c_lock; + long c_flags; + int c_count; }; struct pthread_cond_attr { @@ -255,7 +253,7 @@ /* * Miscellaneous definitions. */ -#define THR_STACK_DEFAULT 65536 +#define THR_STACK_DEFAULT 0x100000 /* * Maximum size of initial thread's stack. This perhaps deserves to be larger @@ -597,13 +595,13 @@ #define THR_LOCK_ACQUIRE(thrd, lck) \ do { \ (thrd)->locklevel++; \ - _UMTX_ACQUIRE((lck), (thrd)->tid); \ + UMTX_ACQUIRE((lck), (thrd)->tid); \ } while (0) #define THR_LOCK_RELEASE(thrd, lck) \ do { \ if ((thrd)->locklevel > 0) { \ - _UMTX_RELEASE((lck), (thrd)->tid); \ + UMTX_RELEASE((lck), (thrd)->tid); \ (thrd)->locklevel--; \ if ((thrd)->locklevel == 0) \ THR_YIELD_CHECK(thrd); \ @@ -655,10 +653,10 @@ /* Take the scheduling lock with the intent to call the scheduler. */ #define THR_LOCK_SWITCH(curthr) do { \ curthread->lock_switch++; \ - _UMTX_ACQUIRE(&(curthr->lock), (curthr)->tid); \ + UMTX_ACQUIRE(&(curthr->lock), (curthr)->tid); \ } while (0) #define THR_UNLOCK_SWITCH(curthr) do { \ - _UMTX_RELEASE(&(curthr->lock), (curthr)->tid); \ + UMTX_RELEASE(&(curthr->lock), (curthr)->tid); \ curthread->lock_switch--; \ THR_YIELD_CHECK(curthr); \ } while (0) ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#4 (text+ko) ==== @@ -50,7 +50,7 @@ else if ((lck = malloc(sizeof(struct pthread_spinlock))) == NULL) ret = ENOMEM; else { - _UMTX_INIT(&lck->s_lock); + UMTX_INIT(&lck->s_lock); *lock = lck; ret = 0; } @@ -66,7 +66,6 @@ if (lock == NULL || *lock == NULL) ret = EINVAL; else { - _UMTX_DESTROY(&(*lock)->s_lock); free(*lock); *lock = NULL; ret = 0; ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#4 (text+ko) ==== @@ -65,7 +65,7 @@ struct spinlock_extra *extra; extra = (struct spinlock_extra *)lck->fname; - pthread_mutex_unlock(&extra->lock); + _pthread_mutex_unlock(&extra->lock); } /* @@ -90,7 +90,7 @@ if (lck->fname == NULL) init_spinlock(lck); extra = (struct spinlock_extra *)lck->fname; - pthread_mutex_lock(&extra->lock); + _pthread_mutex_lock(&extra->lock); } /* @@ -112,13 +112,13 @@ static void init_spinlock(spinlock_t *lck) { - pthread_mutex_lock(&spinlock_static_lock); + _pthread_mutex_lock(&spinlock_static_lock); if ((lck->fname == NULL) && (spinlock_count < MAX_SPINLOCKS)) { lck->fname = (char *)&extra[spinlock_count]; extra[spinlock_count].owner = lck; spinlock_count++; } - pthread_mutex_unlock(&spinlock_static_lock); + _pthread_mutex_unlock(&spinlock_static_lock); if (lck->fname == NULL) PANIC("Exceeded max spinlocks"); } @@ -133,10 +133,10 @@ for (i = 0; i < spinlock_count; i++) _thr_mutex_reinit(&extra[i].lock); } else { - if (pthread_mutex_init(&spinlock_static_lock, NULL)) + if (_pthread_mutex_init(&spinlock_static_lock, NULL)) PANIC("Cannot initialize spinlock_static_lock"); for (i = 0; i < MAX_SPINLOCKS; i++) { - if (pthread_mutex_init(&extra[i].lock, NULL)) + if (_pthread_mutex_init(&extra[i].lock, NULL)) PANIC("Cannot initialize spinlock extra"); } initialized = 1; From owner-p4-projects@FreeBSD.ORG Sat Dec 25 14:08:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 791E916A4D0; Sat, 25 Dec 2004 14:08:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 334E316A4CE for ; Sat, 25 Dec 2004 14:08:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A736043D1D for ; Sat, 25 Dec 2004 14:08:34 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPE8Ywt039239 for ; Sat, 25 Dec 2004 14:08:34 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPE8XJH039236 for perforce@freebsd.org; Sat, 25 Dec 2004 14:08:33 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 25 Dec 2004 14:08:33 GMT Message-Id: <200412251408.iBPE8XJH039236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 67678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 14:08:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=67678 Change 67678 by davidxu@davidxu_alona on 2004/12/25 14:08:12 IFC Affected files ... .. //depot/projects/davidxu_thread/src/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/Makefile.inc1#5 integrate .. //depot/projects/davidxu_thread/src/UPDATING#4 integrate .. //depot/projects/davidxu_thread/src/bin/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/bin/ed/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/bin/ps/ps.1#3 integrate .. //depot/projects/davidxu_thread/src/bin/rmail/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/davidxu_thread/src/etc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/etc/defaults/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/etc/devd.conf#4 integrate .. //depot/projects/davidxu_thread/src/etc/isdn/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/etc/mtree/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/etc/namedb/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/etc/pam.d/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/etc/periodic/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/named#3 integrate .. //depot/projects/davidxu_thread/src/games/factor/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/davidxu_thread/src/games/fortune/unstr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/games/ppt/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/games/primes/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/gnu/lib/libdialog/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/lib/libg2c/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/lib/libgcov/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/lib/libobjc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/binutils/ar/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/binutils/gdb/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/binutils/gdbreplay/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/c++/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/c++filt/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/cc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/cc1/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/cc1plus/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/collect2/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/f771/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cc/protoize/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cvs/cvs/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/dialog/TESTS/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/Makefile.inc#3 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/font/devX100-12/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/font/devX100/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/font/devX75-12/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/font/devX75/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/src/devices/grohtml/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/src/preproc/html/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/include/arpa/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/include/protocols/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/libexec/ipropd-master/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/libexec/ipropd-slave/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/tools/asn1_compile/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/tools/make-print-version/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/tools/make-roken/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/bind/config.mk#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/davidxu_thread/src/lib/libbsnmp/modules/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/gen/signal.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/acct.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/adjtime.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/recv.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/select.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc_r/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libcompat/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libcrypt/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libdisk/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libdisk/disk.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libfetch/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libio/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libipsec/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libmilter/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libncp/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libncurses/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpam/modules/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpam/modules/modules.inc#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpcap/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpcap/config.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpthread/thread/thr_sigsuspend.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libradius/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libsm/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libsmb/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libstand/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libtelnet/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/libwrap/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/lib/liby/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/bootpd/bootpgw/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/ftpd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/lukemftpd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/pt_chown/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/save-entropy/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/tcpd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/libexec/telnetd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/build/picobsd#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/aps/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/help/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/msg/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/ns/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/oinit/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/passwd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/sps/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/view/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/release/picobsd/tinyware/vm/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/rescue/rescue/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/sbin/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/sbin/devd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/dhclient/dhcpctl/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/dhclient/omapip/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/core/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/gvinum/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/init/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mca/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount_msdosfs/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount_ntfs/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount_udf/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount_ufs/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/rtsol/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/secure/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libcrypto/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/secure/lib/libssl/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/dict/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/doc/IPv6/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/doc/bind9/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/FreeBSD_version/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/autofs/driver/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/etc/make.conf#3 integrate .. //depot/projects/davidxu_thread/src/share/examples/find_interface/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/ipfilter/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/isdn/v21/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/kld/cdev/test/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/kld/syscall/test/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/libvgl/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/perfmon/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/pf/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/ppi/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/smbfs/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/examples/smbfs/print/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/info/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/man/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man3/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/Makefile#5 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/aac.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/altq.4#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ata.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/aue.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/bpf.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/de.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ef.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/lp.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/man4.i386/cs.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/man4.i386/ray.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/man4.i386/wl.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ng_etf.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ng_source.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/pccbb.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/random.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/wi.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/xl.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man5/make.conf.5#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man8/picobsd.8#2 integrate .. //depot/projects/davidxu_thread/src/share/misc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.README#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.compat.mk#1 branch .. //depot/projects/davidxu_thread/src/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.doc.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.info.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.init.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.man.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.obj.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.pkg.mk#1 branch .. //depot/projects/davidxu_thread/src/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/sys.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/security/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/sendmail/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/skel/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/snmp/mibs/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/syscons/fonts/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/boot/alpha/boot1/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/alpha/cdboot/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/alpha/netboot/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/arc/loader/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/boot0/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/sparc64/boot1/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/NOTES#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.amd64#4 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/patm/genrtab/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ums.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usb.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/isa/isa_common.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/isa/pnp.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/isa/pnpvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/tty.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/modules/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/modules/ipfilter/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/netgraph/fec/sample_startup#2 delete .. //depot/projects/davidxu_thread/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/net/bpf.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_tap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_tun.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net/ppp_tty.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/pc98/fd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_sk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/pmap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/sys/syscall.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/umtx.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/vnode.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/davidxu_thread/src/tools/KSE/ksetest/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/KSE/rr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/diag/dumpvfscache/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/diag/localeck/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/fsx/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/gaithrstress/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom/ConfCmp/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom/MdLoad/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom_mirror/test-1.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom_mirror/test-2.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom_mirror/test-3.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom_mirror/test-4.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom_mirror/test-5.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom_mirror/test-6.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom_mirror/test-7.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/geom_raid3/test-12.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/ia64_unaligned/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/include/tgmath/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/netatalk/simple_send/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/netinet/ipsockopt/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/netinet/tcpconnect/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/netinet/tcpstream/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/nfsmmap/test1/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/nfsmmap/test2/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/p1003_1b/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/pipe/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/security/access/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/security/proc_to_proc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/sockets/accf_data_attach/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/sockets/kqueue/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/sockets/listenclose/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/sysvmsg/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/sysvsem/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/sysvshm/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/tls/libxx/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/tls/libyy/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/tls/ttls1/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/tls/ttls2/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/test/malloc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/test/ppsapi/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/aac/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/find-sb/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/gdb_regofs/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/ifinfo/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/ministat/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/make.conf#3 integrate .. //depot/projects/davidxu_thread/src/tools/tools/netrate/Makefile.inc#1 branch .. //depot/projects/davidxu_thread/src/tools/tools/netrate/netblast/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/netrate/netreceive/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/netrate/netsend/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/netrate/netsend/netsend.c#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/pirtool/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/syscall_timing/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/alias/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/bzip2recover/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/davidxu_thread/src/usr.bin/catman/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/catman/catman.1#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/catman/catman.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/dirname/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/elf2aout/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/fetch/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/lessecho/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/limits/limits.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/locate/bigram/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/locate/code/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/job.c#5 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/configure.ac.in#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/fts.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/matching.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/telnet/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/unexpand/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/uudecode/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/vgrind/RETEST/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/xlint/lint2/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/bluetooth/bthidd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/bootparamd/callbootd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/burncd/burncd.8#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/crunch/examples/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ctm/mkCTM/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/lpr/filters.ru/koi2855/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/lpr/filters.ru/koi2alt/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/lpr/filters/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/lpr/lpd/printjob.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/mount_smbfs/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/mrouted/testrsrr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/nologin/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/ntpd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/ntpdate/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/ntpdc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/ntpq/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/ntptime/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/ntptrace/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ntp/sntp/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pccard/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pcvt/Misc/Doc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pcvt/Misc/Etc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pcvt/Misc/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pcvt/demo/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pcvt/kbdio/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pkg_install/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/main.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pppd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/rpc.ypupdated/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/sendmail/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/sysinstall/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/tcpdchk/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/tcpdmatch/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/traceroute/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/vnconfig/Makefile#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.313 2004/12/16 19:55:57 ru Exp $ +# $FreeBSD: src/Makefile,v 1.315 2004/12/21 09:59:39 ru Exp $ # # The user-driven targets are: # @@ -232,7 +232,7 @@ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} make \ -D_UPGRADING \ - -DNOMAN -DNOSHARED \ + -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR make: .PHONY ==== //depot/projects/davidxu_thread/src/Makefile.inc1#5 (text+ko) ==== @@ -1,19 +1,19 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.460 2004/12/17 10:11:33 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.471 2004/12/22 22:00:01 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNO_RESCUE do not build rescue binaries -# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir -# -DNOCLEAN do not clean at all -# -DNOCRYPT will prevent building of crypt versions -# -DNOMAN do not build the manual pages -# -DNOPROFILE do not build profiled libraries -# -DNOGAMES do not go into games subdir -# -DNOSHARE do not go into share subdir -# -DNOINFO do not make or install info files -# -DNOLIBC_R do not build libc_r. +# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir +# -DNO_CLEAN do not clean at all +# -DNO_CRYPT will prevent building of crypt versions +# -DNO_MAN do not build the manual pages +# -DNO_PROFILE do not build profiled libraries +# -DNO_GAMES do not go into games subdir +# -DNO_SHARE do not go into share subdir +# -DNO_INFO do not make or install info files +# -DNO_LIBC_R do not build libc_r. # -DNO_FORTRAN do not build g77 and related libraries. # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel @@ -45,21 +45,21 @@ # We must do etc last for install/distribute to work. # SUBDIR= share/info include lib libexec bin -.if !defined(NOGAMES) +.if !defined(NO_GAMES) SUBDIR+=games .endif SUBDIR+=gnu -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) SUBDIR+=kerberos5 .endif .if !defined(NO_RESCUE) SUBDIR+=rescue .endif SUBDIR+=sbin -.if !defined(NOCRYPT) +.if !defined(NO_CRYPT) SUBDIR+=secure .endif -.if !defined(NOSHARE) +.if !defined(NO_SHARE) SUBDIR+=share .endif SUBDIR+=sys usr.bin usr.sbin etc @@ -76,7 +76,7 @@ SUBDIR= ${SUBDIR_OVERRIDE} .endif -.if defined(NOCLEANDIR) +.if defined(NO_CLEANDIR) CLEANDIR= clean cleandepend .else CLEANDIR= cleandir @@ -112,8 +112,8 @@ .else _TARGET_CPUTYPE=dummy .endif -_CPUTYPE!= MAKEFLAGS= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \ - CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE +_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ + -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE .if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif @@ -182,14 +182,14 @@ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \ - -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS + -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PIC -DNO_PROFILE \ + -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ - BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS + BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -231,7 +231,7 @@ SHLIBDIR=/usr/lib32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ + -DNO_BIND -DNO_MAN -DNO_INFO -DNO_HTML \ CC="cc ${LIB32CC}" \ CXX="c++ ${LIB32CXX}" \ OBJC="cc ${LIB32OBJC}" \ @@ -273,7 +273,7 @@ @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @echo "--------------------------------------------------------------" -.if !defined(NOCLEAN) +.if !defined(NO_CLEAN) rm -rf ${WORLDTMP} .else rm -rf ${WORLDTMP}/legacy/usr/include @@ -327,7 +327,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools _cleanobj: -.if !defined(NOCLEAN) +.if !defined(NO_CLEAN) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @@ -364,7 +364,7 @@ @echo ">>> stage 4.2: building libraries" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ - ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPROFILE \ + ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PROFILE \ libraries _depend: @echo @@ -393,7 +393,7 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t} @@ -406,11 +406,11 @@ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} cd ${.CURDIR}/gnu/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} -.if !defined(NOCRYPT) +.if !defined(NO_CRYPT) cd ${.CURDIR}/secure/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) cd ${.CURDIR}/kerberos5/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif @@ -434,7 +434,7 @@ mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree cd ${.CURDIR}/lib; ${LIB32MAKE} install cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install -.if !defined(NOCRYPT) +.if !defined(NO_CRYPT) cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install .endif cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install @@ -664,7 +664,7 @@ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ ${KERNCONFDIR}/${_kernel} .endif -.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) +.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @@ -798,7 +798,7 @@ # # bootstrap-tools: Build tools needed for compatibility # -.if !defined(NOGAMES) +.if !defined(NO_GAMES) _strfile= games/fortune/strfile .endif @@ -876,11 +876,11 @@ _aicasm= sys/modules/aic7xxx/aicasm .endif -.if !defined(NOSHARE) +.if !defined(NO_SHARE) _share= share/syscons/scrnmaps .endif -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) _kerberos5_tools= kerberos5/tools .endif @@ -994,7 +994,7 @@ _generic_libs= gnu/lib -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 @@ -1021,7 +1021,7 @@ _generic_libs+= lib -.if !defined(NOCRYPT) +.if !defined(NO_CRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl lib/libradius__L: secure/lib/libssl__L @@ -1039,7 +1039,7 @@ _generic_libs+= secure/lib .endif -.if defined(NOCRYPT) || defined(NO_OPENSSL) +.if defined(NO_CRYPT) || defined(NO_OPENSSL) lib/libradius__L: lib/libmd__L .endif ==== //depot/projects/davidxu_thread/src/UPDATING#4 (text+ko) ==== @@ -23,6 +23,22 @@ developers choose to disable these features on build machines to maximize performance. +20041221: + By a popular demand, a lot of NOFOO options were renamed + to NO_FOO (see bsd.compat.mk for a full list). The old + spellings are still supported, but will cause annoying + warnings on stderr. Make sure you upgrade properly (see + the COMMON ITEMS: section later in this file). + +20041219: + Auto-loading of ancillary wlan modules such as wlan_wep has + been temporarily disabled; you need to statically configure + the modules you need into your kernel or explicitly load them + prior to use. Specifically, if you intend to use WEP encryption + with an 802.11 device load/configure wlan_wep; if you want to + use WPA with the ath driver load/configure wlan_tkip, wlan_ccmp, + and wlan_xauth as required. + 20041213: The behaviour of ppp(8) has changed slightly. If lqr is enabled (``enable lqr''), older versions would revert to LCP ECHO mode on @@ -1984,4 +2000,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.383 2004/12/13 17:52:10 brian Exp $ +$FreeBSD: src/UPDATING,v 1.385 2004/12/23 16:03:08 ru Exp $ ==== //depot/projects/davidxu_thread/src/bin/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile.inc,v 1.21 2004/08/06 00:07:26 gordon Exp $ +# $FreeBSD: src/bin/Makefile.inc,v 1.22 2004/12/21 09:59:40 ru Exp $ BINDIR?= /bin WARNS?= 6 .if defined(NO_DYNAMICROOT) -NOSHARED?= YES +NO_SHARED?= YES .endif ==== //depot/projects/davidxu_thread/src/bin/ed/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.30 2004/08/06 07:27:03 cperciva Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.31 2004/12/21 10:15:59 ru Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DDES WARNS?= 2 DPADD= ${LIBCRYPTO} ==== //depot/projects/davidxu_thread/src/bin/ps/ps.1#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.80 2004/11/29 12:00:24 rwatson Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.81 2004/12/22 09:04:47 rwatson Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -603,7 +603,6 @@ .El .Sh FILES .Bl -tag -width ".Pa /boot/kernel/kernel" -compact -KLD .It Pa /boot/kernel/kernel default system namelist .It Pa /proc ==== //depot/projects/davidxu_thread/src/bin/rmail/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rmail/Makefile,v 1.20 2004/03/22 03:17:36 obrien Exp $ +# $FreeBSD: src/bin/rmail/Makefile,v 1.21 2004/12/21 09:59:40 ru Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail # Not much point this being static. It calls a shared sendmail... -NOSHARED?= NO +NO_SHARED?= NO PROG= rmail SRCS= rmail.c ==== //depot/projects/davidxu_thread/src/contrib/bind9/FREEBSD-Upgrade#2 (text+ko) ==== @@ -51,7 +51,7 @@ Note that we intentionally disable IPv6 support on the configure command line; src/lib/bind/config.mk will re-enable it at compile - time if NOINET6 is not defined. + time if NO_INET6 is not defined. 8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and commit it. Do not commit any other file that was modified or @@ -96,4 +96,4 @@ -- des@FreeBSD.org -$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.2 2004/09/27 00:25:56 des Exp $ +$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.3 2004/12/21 10:49:25 ru Exp $ ==== //depot/projects/davidxu_thread/src/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.335 2004/10/08 00:14:27 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.337 2004/12/21 10:15:59 ru Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -23,7 +23,7 @@ BIN1+= printcap .endif -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) .if !defined(NO_OPENSSH) SSH= ${.CURDIR}/../crypto/openssh/ssh_config \ ${.CURDIR}/../crypto/openssh/sshd_config \ @@ -65,7 +65,7 @@ FREEBSD=COPYRIGHT afterinstall: -.if !defined(NOMAN) +.if !defined(NO_MAN) cd ${.CURDIR}/../share/man; ${MAKE} makedb .endif ==== //depot/projects/davidxu_thread/src/etc/defaults/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.4 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.5 2004/12/21 08:46:49 ru Exp $ FILES= devfs.rules pccard.conf periodic.conf rc.conf -NOOBJ= +NO_OBJ= FILESDIR= /etc/defaults FILESMODE= 444 ==== //depot/projects/davidxu_thread/src/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.20 2004/12/19 00:50:07 brueffer Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.21 2004/12/25 00:12:27 brueffer Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -48,7 +48,7 @@ # An entry like this might be in a different file, but is included here # as an example of how to override things. Normally 'ed50' would match # the above attach/detach stuff, but the value of 100 makes it -# ed50 is hard wired to 1.2.3.4 +# hard wired to 1.2.3.4. attach 100 { device-name "ed50"; action "ifconfig $device-name inet 1.2.3.4 netmask 0xffff0000"; @@ -57,7 +57,7 @@ device-name "ed50"; }; -# When a USB keyboard arrives, attach it as the console keyboard +# When a USB keyboard arrives, attach it as the console keyboard. attach 100 { device-name "ukbd0"; action "test -c /dev/kbd1 && kbdcontrol -k /dev/kbd1 < /dev/console"; @@ -84,12 +84,12 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the -# moment, as pnpinfo isn't set in devd yet +# moment, as pnpinfo isn't set in devd yet. nomatch 0 { # action "logger Unknown device: $pnpinfo $location $bus"; }; -# Switch power profiles when the AC line state changes +# Switch power profiles when the AC line state changes. notify 10 { match "system" "ACPI"; match "subsystem" "ACAD"; ==== //depot/projects/davidxu_thread/src/etc/isdn/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/isdn/Makefile,v 1.12 2004/01/19 13:40:50 ru Exp $ +# $FreeBSD: src/etc/isdn/Makefile,v 1.13 2004/12/21 08:46:50 ru Exp $ -NOOBJ= +NO_OBJ= SCRIPTS= answer \ isdntel.sh \ ==== //depot/projects/davidxu_thread/src/etc/mtree/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/Makefile,v 1.4 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/etc/mtree/Makefile,v 1.5 2004/12/21 08:46:50 ru Exp $ FILES= ${_BIND.chroot.dist} \ ${_BIND.include.dist} \ @@ -17,7 +17,7 @@ .endif .endif -NOOBJ= +NO_OBJ= FILESDIR= /etc/mtree .include ==== //depot/projects/davidxu_thread/src/etc/namedb/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/etc/namedb/Makefile,v 1.3 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/etc/namedb/Makefile,v 1.4 2004/12/21 08:46:50 ru Exp $ FILES= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ make-localhost -NOOBJ= +NO_OBJ= FILESDIR= /etc/namedb FILESMODE= 644 ==== //depot/projects/davidxu_thread/src/etc/pam.d/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/pam.d/Makefile,v 1.11 2004/10/24 15:32:24 ru Exp $ +# $FreeBSD: src/etc/pam.d/Makefile,v 1.12 2004/12/21 08:46:50 ru Exp $ -NOOBJ= +NO_OBJ= FILES= README ftpd gdm imap kde login other passwd pop3 \ rexecd rsh sshd su system telnetd xdm FILESDIR= /etc/pam.d ==== //depot/projects/davidxu_thread/src/etc/periodic/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.6 2002/07/18 12:32:57 ru Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 25 14:15:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7348716A4D0; Sat, 25 Dec 2004 14:15:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 447AB16A4CE for ; Sat, 25 Dec 2004 14:15:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B75843D1F for ; Sat, 25 Dec 2004 14:15:44 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPEFhZk039517 for ; Sat, 25 Dec 2004 14:15:44 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPEFhfs039514 for perforce@freebsd.org; Sat, 25 Dec 2004 14:15:43 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 25 Dec 2004 14:15:43 GMT Message-Id: <200412251415.iBPEFhfs039514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 67679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 14:15:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=67679 Change 67679 by davidxu@davidxu_alona on 2004/12/25 14:15:10 Remove COND_WAIT state, no longer need it. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_info.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sig.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#3 (text+ko) ==== @@ -95,7 +95,6 @@ case PS_SUSPENDED: case PS_MUTEX_WAIT: - case PS_COND_WAIT: /* * Threads in these states may be in queues. * In order to preserve queue integrity, the ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_info.c#3 (text+ko) ==== @@ -57,7 +57,6 @@ static const struct s_thread_info thread_info[] = { {PS_RUNNING , "Running"}, {PS_MUTEX_WAIT , "Waiting on a mutex"}, - {PS_COND_WAIT , "Waiting on a condition variable"}, {PS_JOIN , "Waiting to join"}, {PS_SUSPENDED , "Suspended"}, {PS_DEAD , "Dead"}, ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#6 (text+ko) ==== @@ -217,7 +217,6 @@ */ switch (curthread->state) { case PS_MUTEX_WAIT: - case PS_COND_WAIT: if (THR_NEED_CANCEL(curthread)) { curthread->interrupted = 1; curthread->continuation = _thr_finish_cancellation; ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#8 (text+ko) ==== @@ -309,7 +309,6 @@ enum pthread_state { PS_RUNNING, PS_MUTEX_WAIT, - PS_COND_WAIT, PS_JOIN, PS_SUSPENDED, PS_DEAD, ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sig.c#3 (text+ko) ==== @@ -288,7 +288,6 @@ * States which cannot be interrupted but still require the * signal handler to run: */ - case PS_COND_WAIT: case PS_MUTEX_WAIT: break; From owner-p4-projects@FreeBSD.ORG Sat Dec 25 19:28:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3C0816A4D0; Sat, 25 Dec 2004 19:28:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 921D116A4CE for ; Sat, 25 Dec 2004 19:28:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BC9C43D5C for ; Sat, 25 Dec 2004 19:28:03 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPJS3sV056155 for ; Sat, 25 Dec 2004 19:28:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPJS3HH056152 for perforce@freebsd.org; Sat, 25 Dec 2004 19:28:03 GMT (envelope-from sam@freebsd.org) Date: Sat, 25 Dec 2004 19:28:03 GMT Message-Id: <200412251928.iBPJS3HH056152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 19:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=67687 Change 67687 by sam@sam_ebb on 2004/12/25 19:27:40 remove code to purge any node references held by buffers on the tx queues; this is no longer needed with the revised node table management Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#45 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#45 (text+ko) ==== @@ -2304,43 +2304,14 @@ return &an->an_node; } -/* - * Clear any references to a node in a transmit queue. - * This happens when the node is cleaned so we don't - * need to worry about the reference count going to zero; - * we just reclaim the reference w/o dropping the txq lock. - * Then we null the pointer and the right thing happens - * when the buffer is cleaned in ath_tx_processq. - */ static void -ath_tx_cleanq(struct ieee80211com *ic, struct ath_txq *txq, - struct ieee80211_node *ni) -{ - struct ath_buf *bf; - - ATH_TXQ_LOCK(txq); - STAILQ_FOREACH(bf, &txq->axq_q, bf_list) { - if (bf->bf_node == ni) { - /* NB: this clears the pointer too */ - ieee80211_unref_node(&bf->bf_node); - } - } - ATH_TXQ_UNLOCK(txq); -} - -static void ath_node_free(struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; struct ath_softc *sc = ic->ic_ifp->if_softc; - int i; DPRINTF(sc, ATH_DEBUG_NODE, "%s: ni %p\n", __func__, ni); - /* XXX can this happen since refcnt must be zero for us to be called? */ - for (i = 0; i < HAL_NUM_TX_QUEUES; i++) - if (ATH_TXQ_SETUP(sc, i)) - ath_tx_cleanq(ic, &sc->sc_txq[i], ni); ath_rate_node_cleanup(sc, ATH_NODE(ni)); sc->sc_node_free(ni); } From owner-p4-projects@FreeBSD.ORG Sat Dec 25 19:31:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EF8216A4D0; Sat, 25 Dec 2004 19:31:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE12816A4CE for ; Sat, 25 Dec 2004 19:31:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9A1C43D2D for ; Sat, 25 Dec 2004 19:31:07 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPJV7qh056318 for ; Sat, 25 Dec 2004 19:31:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPJV7tK056315 for perforce@freebsd.org; Sat, 25 Dec 2004 19:31:07 GMT (envelope-from sam@freebsd.org) Date: Sat, 25 Dec 2004 19:31:07 GMT Message-Id: <200412251931.iBPJV7tK056315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 19:31:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=67688 Change 67688 by sam@sam_ebb on 2004/12/25 19:30:46 Fixup beacon timer calculations: o lintval is specified in ms and must be converted to TU's o roundup when calculating the nexttbtt to insure things are multiple of the beacon interval o remove bogus use of HAL_BEACON_RESET_TSF when setting station timers; there's an implicit reset done and setting the flag screwed up the sleep timer calculations (though all of this turned into a noop because of masking done by the hal) Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#46 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#46 (text+ko) ==== @@ -1975,6 +1975,7 @@ static void ath_beacon_config(struct ath_softc *sc) { +#define MS_TO_TU(x) (((x) * 1000) / 1024) struct ath_hal *ah = sc->sc_ah; struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni = ic->ic_bss; @@ -1984,20 +1985,15 @@ (LE_READ_4(ni->ni_tstamp.data) >> 10); DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt %u intval %u\n", __func__, nexttbtt, ni->ni_intval); - nexttbtt += ni->ni_intval; - intval = ni->ni_intval & HAL_BEACON_PERIOD; + intval = MS_TO_TU(ni->ni_intval) & HAL_BEACON_PERIOD; + nexttbtt = roundup(nexttbtt, intval); if (ic->ic_opmode == IEEE80211_M_STA) { HAL_BEACON_STATE bs; u_int32_t bmisstime; /* NB: no PCF support right now */ memset(&bs, 0, sizeof(bs)); - /* - * Reset our tsf so the hardware will update the - * tsf register to reflect timestamps found in - * received beacons. - */ - bs.bs_intval = intval | HAL_BEACON_RESET_TSF; + bs.bs_intval = intval; bs.bs_nexttbtt = nexttbtt; bs.bs_dtimperiod = bs.bs_intval; bs.bs_nextdtim = nexttbtt; @@ -2016,8 +2012,8 @@ * TU's and then calculate based on the beacon interval. * Note that we clamp the result to at most 10 beacons. */ - bmisstime = (ic->ic_bmisstimeout * 1000) / 1024; - bs.bs_bmissthreshold = howmany(bmisstime,ni->ni_intval); + bmisstime = MS_TO_TU(ic->ic_bmisstimeout); + bs.bs_bmissthreshold = howmany(bmisstime, intval); if (bs.bs_bmissthreshold > 10) bs.bs_bmissthreshold = 10; else if (bs.bs_bmissthreshold <= 0) @@ -2032,8 +2028,7 @@ * * XXX fixed at 100ms */ - bs.bs_sleepduration = - roundup((100 * 1000) / 1024, bs.bs_intval); + bs.bs_sleepduration = roundup(MS_TO_TU(100), bs.bs_intval); if (bs.bs_sleepduration > bs.bs_dtimperiod) bs.bs_sleepduration = roundup(bs.bs_sleepduration, bs.bs_dtimperiod); @@ -2057,7 +2052,7 @@ ath_hal_intrset(ah, sc->sc_imask); } else { ath_hal_intrset(ah, 0); - if (nexttbtt == ni->ni_intval) + if (nexttbtt == intval) intval |= HAL_BEACON_RESET_TSF; if (ic->ic_opmode == IEEE80211_M_IBSS) { /* @@ -2088,6 +2083,7 @@ if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol) ath_beacon_proc(sc, 0); } +#undef MS_TO_TU } static void From owner-p4-projects@FreeBSD.ORG Sat Dec 25 19:32:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B714716A4D0; Sat, 25 Dec 2004 19:32:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9427D16A4CE for ; Sat, 25 Dec 2004 19:32:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D1DD43D1F for ; Sat, 25 Dec 2004 19:32:09 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPJW9gP056338 for ; Sat, 25 Dec 2004 19:32:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPJW9O3056335 for perforce@freebsd.org; Sat, 25 Dec 2004 19:32:09 GMT (envelope-from sam@freebsd.org) Date: Sat, 25 Dec 2004 19:32:09 GMT Message-Id: <200412251932.iBPJW9O3056335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 19:32:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=67689 Change 67689 by sam@sam_ebb on 2004/12/25 19:31:16 allow the deftxkey to be set to "undefined" Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#30 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#30 (text+ko) ==== @@ -1972,7 +1972,8 @@ break; case IEEE80211_IOC_WEPTXKEY: kid = (u_int) ireq->i_val; - if (kid >= IEEE80211_WEP_NKID) + if (kid >= IEEE80211_WEP_NKID && + (u_int16_t) kid != IEEE80211_KEYIX_NONE) return EINVAL; ic->ic_def_txkey = kid; error = ENETRESET; /* push to hardware */ From owner-p4-projects@FreeBSD.ORG Sat Dec 25 19:33:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FA2516A4D0; Sat, 25 Dec 2004 19:33:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B38316A4CE for ; Sat, 25 Dec 2004 19:33:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2567643D1F for ; Sat, 25 Dec 2004 19:33:11 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBPJXBHF056356 for ; Sat, 25 Dec 2004 19:33:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPJXAbY056353 for perforce@freebsd.org; Sat, 25 Dec 2004 19:33:10 GMT (envelope-from sam@freebsd.org) Date: Sat, 25 Dec 2004 19:33:10 GMT Message-Id: <200412251933.iBPJXAbY056353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Dec 2004 19:33:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=67690 Change 67690 by sam@sam_ebb on 2004/12/25 19:32:12 o accept turboG as well as g when doing erp station management o fix some pointer comparisons to check NULL instead of 0 Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#28 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#28 (text+ko) ==== @@ -1024,7 +1024,7 @@ if (ni != NULL) { /* XXX no rate negotiation; just dup */ ni->ni_rates = ic->ic_bss->ni_rates; - if (ic->ic_newassoc) + if (ic->ic_newassoc != NULL) ic->ic_newassoc(ic, ni, 1); /* XXX not right for 802.1x/WPA */ ieee80211_node_authorize(ic, ni); @@ -1599,7 +1599,8 @@ IEEE80211_AID_SET(ni->ni_associd, ic->ic_aid_bitmap); ic->ic_sta_assoc++; newassoc = 1; - if (ic->ic_curmode == IEEE80211_MODE_11G) + if (ic->ic_curmode == IEEE80211_MODE_11G || + ic->ic_curmode == IEEE80211_MODE_TURBO_G) ieee80211_node_join_11g(ic, ni); } else newassoc = 0; @@ -1615,7 +1616,7 @@ ); /* give driver a chance to setup state like ni_txrate */ - if (ic->ic_newassoc) + if (ic->ic_newassoc != NULL) ic->ic_newassoc(ic, ni, newassoc); ni->ni_inact_reload = ic->ic_inact_auth; ni->ni_inact = ni->ni_inact_reload; @@ -1633,7 +1634,8 @@ ieee80211_node_leave_11g(struct ieee80211com *ic, struct ieee80211_node *ni) { - KASSERT(ic->ic_curmode == IEEE80211_MODE_11G, + KASSERT(ic->ic_curmode == IEEE80211_MODE_11G || + ic->ic_curmode == IEEE80211_MODE_TURBO_G, ("not in 11g, curmode %x", ic->ic_curmode)); /* @@ -1721,7 +1723,8 @@ ni->ni_associd = 0; ic->ic_sta_assoc--; - if (ic->ic_curmode == IEEE80211_MODE_11G) + if (ic->ic_curmode == IEEE80211_MODE_11G || + ic->ic_curmode == IEEE80211_MODE_TURBO_G) ieee80211_node_leave_11g(ic, ni); /* * Cleanup station state. In particular clear various