Date: Sun, 12 Dec 2004 23:29:13 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 66920 for review Message-ID: <200412122329.iBCNTDKU083858@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=66920 Change 66920 by peter@peter_daintree on 2004/12/12 23:28:22 IFC @66919 Affected files ... .. //depot/projects/hammer/UPDATING#69 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#16 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#15 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#32 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvsbug/Makefile#5 integrate .. //depot/projects/hammer/include/string.h#7 integrate .. //depot/projects/hammer/include/unistd.h#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/hammer/lib/libc/string/swab.3#3 integrate .. //depot/projects/hammer/lib/libc/string/swab.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#13 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_atfork.c#1 branch .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fork.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#8 integrate .. //depot/projects/hammer/lib/libsdp/search.c#4 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#23 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#15 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#22 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#8 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#33 integrate .. //depot/projects/hammer/share/man/man4/ath.4#19 integrate .. //depot/projects/hammer/share/man/man4/mac_portacl.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cp.4#5 integrate .. //depot/projects/hammer/share/man/man4/udav.4#3 integrate .. //depot/projects/hammer/share/man/man4/wlan_acl.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan_ccmp.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan_tkip.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan_xauth.4#2 integrate .. //depot/projects/hammer/share/man/man4/xe.4#6 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#12 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#27 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#9 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#7 integrate .. //depot/projects/hammer/sys/conf/files#97 integrate .. //depot/projects/hammer/sys/conf/files.i386#47 integrate .. //depot/projects/hammer/sys/conf/files.pc98#37 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#11 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#28 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#10 integrate .. //depot/projects/hammer/sys/dev/aac/aac_debug.c#7 integrate .. //depot/projects/hammer/sys/dev/aac/aac_disk.c#11 integrate .. //depot/projects/hammer/sys/dev/aac/aac_ioctl.h#3 delete .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/hammer/sys/dev/ata/ata-all.h#24 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#49 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#27 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#23 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#23 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.h#3 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#12 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#14 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#21 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#25 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#23 integrate .. //depot/projects/hammer/sys/dev/mse/mse.c#1 branch .. //depot/projects/hammer/sys/dev/mse/mse_cbus.c#1 branch .. //depot/projects/hammer/sys/dev/mse/mse_isa.c#1 branch .. //depot/projects/hammer/sys/dev/mse/msevar.h#1 branch .. //depot/projects/hammer/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#53 integrate .. //depot/projects/hammer/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#19 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#26 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#18 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#15 integrate .. //depot/projects/hammer/sys/geom/geom.h#32 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#24 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#29 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#28 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#23 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#8 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#18 integrate .. //depot/projects/hammer/sys/i386/acpica/genwakecode.sh#3 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/longrun.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/mse.c#9 delete .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#19 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#40 integrate .. //depot/projects/hammer/sys/ia64/include/fpu.h#3 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#46 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#44 integrate .. //depot/projects/hammer/sys/modules/Makefile#62 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#18 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_ibm/Makefile#1 branch .. //depot/projects/hammer/sys/modules/mse/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_sppp.h#2 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#9 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#9 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#46 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#27 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#31 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#11 integrate .. //depot/projects/hammer/sys/pc98/pc98/mse.c#8 delete .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#29 integrate .. //depot/projects/hammer/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/hammer/sys/sys/mouse.h#3 integrate .. //depot/projects/hammer/sys/sys/param.h#50 integrate .. //depot/projects/hammer/sys/sys/vnode.h#39 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#17 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#28 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#39 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#25 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#10 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#7 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#7 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#7 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#19 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#9 integrate .. //depot/projects/hammer/usr.bin/make/var.c#15 integrate .. //depot/projects/hammer/usr.bin/whois/whois.1#5 integrate .. //depot/projects/hammer/usr.bin/whois/whois.c#10 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.c#12 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#11 integrate Differences ... ==== //depot/projects/hammer/UPDATING#69 (text+ko) ==== @@ -23,6 +23,18 @@ developers choose to disable these features on build machines to maximize performance. +20041201: + The wlan support has been updated to split the crypto support + into separate modules. For static WEP you must configure the + wlan_wep module in your system or build and install the module + in place where it can be loaded (the kernel will auto-load + the module when a wep key is configured). + +20041201: + The ath driver has been updated to split the tx rate control + algorithm into a separate module. You need to include either + ath_rate_onoe or ath_rate_amrr when configuring the kernel. + 20041116: Support for systems with an 80386 CPU has been removed. Please use FreeBSD 5.x or earlier on systems with an 80386. @@ -45,14 +57,6 @@ userland programs that read kmem for tcp sockets directly (netstat, sockstat, etc.) -20041018: - A major sweep over the tty drivers to elimnate approx 3100 - lines of copy&pasted code have been performed. As a part of - this change some tty devices have changed names: - sio devices are now named: {tty,cua}d%d[.init,.lock] - ucom devices are now named: {tty,cua}U%d[.init,.lock] - For other drivers see the commit logs. - 20041007: The FreeBSD keyword is no longer a requirement for a valid rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check @@ -67,6 +71,14 @@ changed, thus breaking ABI compatibility. Make sure you rebuild this library with the kernel. +20041004: + A major sweep over the tty drivers to elimnate approx 3100 + lines of copy&pasted code have been performed. As a part of + this change some tty devices have changed names: + sio devices are now named: {tty,cua}d%d[.init,.lock] + ucom devices are now named: {tty,cua}U%d[.init,.lock] + For other drivers see the commit logs. + 20041001: The following libraries had their version number bumped up: /lib/libm.so.2 -> libm.so.3 @@ -266,9 +278,11 @@ The console initialization on Alpha has been reworked and is now identical to other platforms. This means that the hardcoding of the serial console and the debug port has been removed. As such, - hints are now required for the sio(4) driver to become a console - or debug port. The NO_SIO option has been decommissioned because - of this. + hints (hint.sio.0.flags="0x10") are now required for the sio(4) + driver to become a console or debug port. The NO_SIO option has + been decommissioned because of this. + Running mergemaster is the easiest way to ensure your + 'boot/device.hints' has the needed line. 20040710: A revamp of the debugging code in the kernel with some visible @@ -1963,4 +1977,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.380 2004/12/08 04:08:33 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.382 2004/12/12 07:22:16 obrien Exp $ ==== //depot/projects/hammer/etc/defaults/pccard.conf#16 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.270 2004/11/08 16:59:01 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.271 2004/12/09 22:27:11 rsm Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -2247,7 +2247,14 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison) +# Intel EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter (Ethernet part) +card "Intel" "EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter" + config 0x27 "xe" ? +# config auto "sio" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + +# Intel EtherExpress PRO/100 Mobile Adapter (16-bit version) card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16" config auto "xe" ? insert /etc/pccard_ether $device start ==== //depot/projects/hammer/etc/rc.d/initdiskless#15 (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.d/initdiskless,v 1.40 2004/11/05 07:35:31 mtm Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.41 2004/12/12 08:04:26 obrien Exp $ # # PROVIDE: initdiskless # REQUIRE: preseedrandom @@ -305,7 +305,7 @@ if [ -f $j ]; then create_md $subdir echo "Loading /$subdir from cpio archive $j" - (cd / ; /stand/gzip -d < $j | /stand/cpio --extract -d ) + (cd / ; /rescue/pax -x cpio -r -z -p e -f $j) fi done for j in /conf/$i/*.remove ; do ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#32 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.147 2004/11/27 08:28:58 dds Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.148 2004/12/11 21:57:27 dds Exp $ % -- Gifts for Children -- @@ -1249,6 +1249,11 @@ why there are more Jews named Miller than Katz? Fat Chance. -- Arthur Naiman, "Every Goy's Guide to Yiddish" % + There are wavelengths that people cannot see, there are +sounds that people cannot hear, and maybe computers have thoughts +that people cannot think. + -- Richard W. Hamming +% Thompson, if he is to be believed, has sampled the entire rainbow of legal and illegal drugs in heroic efforts to feel better than he does. ==== //depot/projects/hammer/gnu/usr.bin/cvs/cvsbug/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.21 2004/09/28 21:19:31 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.22 2004/12/10 18:16:52 kensmith Exp $ MAINTAINER= peter@FreeBSD.org @@ -21,6 +21,7 @@ -e "s,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g" \ -e "s,@SENDMAIL@,/usr/sbin/sendmail,g" \ -e "s,@MKTEMP_FUNCTION@,," \ + -e "s,@MKTEMP_SH_FUNCTION@,," \ ${.ALLSRC} > ${.TARGET} .include <bsd.prog.mk> ==== //depot/projects/hammer/include/string.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.20 2004/07/23 02:20:05 tjr Exp $ + * $FreeBSD: src/include/string.h,v 1.21 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _STRING_H_ @@ -108,8 +108,19 @@ #endif size_t strxfrm(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -void swab(const void *, void *, size_t); -#endif + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED + +#ifndef _SSIZE_T_DECLARED +typedef __ssize_t ssize_t; +#define _SSIZE_T_DECLARED +#endif /* _SIZE_T_DECLARED */ + +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* _STRING_H_ */ ==== //depot/projects/hammer/include/unistd.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.74 2004/12/07 07:10:39 phk Exp $ + * $FreeBSD: src/include/unistd.h,v 1.75 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _UNISTD_H_ @@ -436,7 +436,12 @@ int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */ int setregid(gid_t, gid_t); int setreuid(uid_t, uid_t); -/* void swab(const void * __restrict, void * __restrict, ssize_t); */ + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + void sync(void); useconds_t ualarm(useconds_t, useconds_t); int usleep(useconds_t); ==== //depot/projects/hammer/lib/libarchive/archive_entry.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.23 2004/08/08 07:39:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.24 2004/12/11 07:11:42 kientzle Exp $"); #include <sys/stat.h> #include <sys/types.h> @@ -609,7 +609,7 @@ dev_t d; d = entry->ae_stat.st_rdev; - entry->ae_stat.st_rdev = makedev(m, minor(d)); + entry->ae_stat.st_rdev = makedev(major(m), minor(d)); } void @@ -618,7 +618,7 @@ dev_t d; d = entry->ae_stat.st_rdev; - entry->ae_stat.st_rdev = makedev( major(d), m); + entry->ae_stat.st_rdev = makedev(major(d), minor(m)); } void ==== //depot/projects/hammer/lib/libc/string/swab.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)swab.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.7 2002/08/30 21:18:39 robert Exp $ +.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.9 2004/12/10 15:27:06 trhodes Exp $ .\" -.Dd June 4, 1993 +.Dd December 10, 2004 .Dt SWAB 3 .Os .Sh NAME @@ -41,9 +41,9 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In unistd.h .Ft void -.Fn swab "const void * restrict src" "void * restrict dst" "size_t len" +.Fn swab "const void * restrict src" "void * restrict dst" "ssize_t len" .Sh DESCRIPTION The function .Fn swab ==== //depot/projects/hammer/lib/libc/string/swab.c#3 (text+ko) ==== @@ -38,12 +38,12 @@ static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.5 2002/08/30 20:33:05 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.6 2004/12/10 15:24:40 trhodes Exp $"); -#include <string.h> +#include <unistd.h> void -swab(const void * __restrict from, void * __restrict to, size_t len) +swab(const void * __restrict from, void * __restrict to, ssize_t len) { unsigned long temp; int n; ==== //depot/projects/hammer/lib/libc_r/uthread/Makefile.inc#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.37 2003/07/25 17:02:33 mp Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.38 2004/12/10 03:36:45 grog Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -10,6 +10,7 @@ uthread_acl_set_fd.c \ uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ + uthread_atfork.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ uthread_attr_getdetachstate.c \ ==== //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.84 2004/12/10 03:36:45 grog Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -451,6 +451,13 @@ void *routine_arg; }; +struct pthread_atfork { + TAILQ_ENTRY(pthread_atfork) qe; + void (*prepare)(void); + void (*parent)(void); + void (*child)(void); +}; + struct pthread_attr { int sched_policy; int sched_inherit; @@ -1025,6 +1032,9 @@ ; #endif +SCLASS TAILQ_HEAD(atfork_head, pthread_atfork) _atfork_list; +SCLASS pthread_mutex_t _atfork_mutex; + /* Default thread attributes: */ SCLASS struct pthread_attr _pthread_attr_default #ifdef GLOBAL_PTHREAD_PRIVATE ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_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/libc_r/uthread/uthread_fork.c,v 1.27 2002/03/19 22:58:56 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.28 2004/12/10 03:36:45 grog Exp $ */ #include <sys/param.h> #include <errno.h> @@ -48,6 +48,7 @@ _fork(void) { struct pthread *curthread = _get_curthread(); + struct pthread_atfork *af; int i, flags, use_deadlist = 0; pid_t ret; pthread_t pthread; @@ -59,9 +60,23 @@ */ _thread_kern_sig_defer(); + _pthread_mutex_lock(&_atfork_mutex); + + /* Run down atfork prepare handlers. */ + TAILQ_FOREACH_REVERSE(af, &_atfork_list, atfork_head, qe) { + if (af->prepare != NULL) + af->prepare(); + } + /* Fork a new process: */ if ((ret = __sys_fork()) != 0) { - /* Parent process or error. Nothing to do here. */ + /* Run down atfork parent handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->parent != NULL) + af->parent(); + } + _pthread_mutex_unlock(&_atfork_mutex); + } else { /* Close the pthread kernel pipe: */ __sys_close(_thread_kern_pipe[0]); @@ -207,8 +222,15 @@ } } } + /* Run down atfork child handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->child != NULL) + af->child(); + } + _mutex_reinit(&_atfork_mutex); } + /* * Undefer and handle pending signals, yielding if necessary: */ ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#8 (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/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.48 2004/12/10 03:36:45 grog Exp $ */ /* Allocate space for global thread variables here: */ @@ -437,6 +437,8 @@ TAILQ_INIT(&_thread_list); TAILQ_INSERT_HEAD(&_thread_list, _thread_initial, tle); _set_curthread(_thread_initial); + TAILQ_INIT(&_atfork_list); + _pthread_mutex_init(&_atfork_mutex, NULL); /* Initialise the global signal action structure: */ sigfillset(&act.sa_mask); ==== //depot/projects/hammer/lib/libsdp/search.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: search.c,v 1.2 2003/09/04 22:12:13 max Exp $ - * $FreeBSD: src/lib/libsdp/search.c,v 1.6 2004/02/26 20:44:55 emax Exp $ + * $FreeBSD: src/lib/libsdp/search.c,v 1.7 2004/12/09 18:57:12 emax Exp $ */ #include <sys/uio.h> @@ -55,7 +55,8 @@ sdp_session_p ss = (sdp_session_p) xss; uint8_t *req = NULL, *rsp = NULL, *rsp_tmp = NULL; - int32_t type, len; + int32_t t, len; + uint16_t lo, hi; if (ss == NULL) return (-1); @@ -66,11 +67,29 @@ return (-1); } - /* Calculate length of the request */ req = ss->req; + + /* Calculate ServiceSearchPattern length */ plen = plen * (sizeof(pp[0]) + 1); - alen = alen * (sizeof(ap[0]) + 1); + + /* Calculate AttributeIDList length */ + for (len = 0, t = 0; t < alen; t ++) { + lo = (uint16_t) (ap[t] >> 16); + hi = (uint16_t) (ap[t]); + + if (lo > hi) { + ss->error = EINVAL; + return (-1); + } + + if (lo != hi) + len += (sizeof(ap[t]) + 1); + else + len += (sizeof(lo) + 1); + } + alen = len; + /* Calculate length of the request */ len = plen + sizeof(uint8_t) + sizeof(uint16_t) + /* ServiceSearchPattern */ sizeof(uint16_t) + @@ -97,9 +116,21 @@ /* Put AttributeIDList */ SDP_PUT8(SDP_DATA_SEQ16, req); SDP_PUT16(alen, req); - for (; alen > 0; ap ++, alen -= (sizeof(ap[0]) + 1)) { - SDP_PUT8(SDP_DATA_UINT32, req); - SDP_PUT32(*ap, req); + for (; alen > 0; ap ++) { + lo = (uint16_t) (*ap >> 16); + hi = (uint16_t) (*ap); + + if (lo != hi) { + /* Put attribute range */ + SDP_PUT8(SDP_DATA_UINT32, req); + SDP_PUT32(*ap, req); + alen -= (sizeof(ap[0]) + 1); + } else { + /* Put attribute */ + SDP_PUT8(SDP_DATA_UINT16, req); + SDP_PUT16(lo, req); + alen -= (sizeof(lo) + 1); + } } /* Submit ServiceSearchAttributeRequest and wait for response */ @@ -241,8 +272,8 @@ rsp_tmp = ss->rsp; /* Skip the first SEQ */ - SDP_GET8(type, rsp_tmp); - switch (type) { + SDP_GET8(t, rsp_tmp); + switch (t) { case SDP_DATA_SEQ8: SDP_GET8(len, rsp_tmp); break; @@ -263,8 +294,8 @@ for (; rsp_tmp < rsp && vlen > 0; ) { /* Get set of attributes for the next record */ - SDP_GET8(type, rsp_tmp); - switch (type) { + SDP_GET8(t, rsp_tmp); + switch (t) { case SDP_DATA_SEQ8: SDP_GET8(len, rsp_tmp); break; @@ -286,8 +317,8 @@ /* Now rsp_tmp points to list of (attr,value) pairs */ for (; len > 0 && vlen > 0; vp ++, vlen --) { /* Attribute */ - SDP_GET8(type, rsp_tmp); - if (type != SDP_DATA_UINT16) { + SDP_GET8(t, rsp_tmp); + if (t != SDP_DATA_UINT16) { ss->error = ENOATTR; return (-1); } ==== //depot/projects/hammer/libexec/ftpd/ftpd.c#23 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.197 2004/11/22 11:10:04 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.198 2004/12/12 17:30:28 yar Exp $"); /* * FTP server. @@ -273,6 +273,19 @@ LastArgv = envp[-1] + strlen(envp[-1]); #endif /* OLD_SETPROCTITLE */ + /* + * Prevent diagnostic messages from appearing on stderr. + * We run as a daemon or from inetd; in both cases, there's + * more reason in logging to syslog. + */ + (void) freopen(_PATH_DEVNULL, "w", stderr); + opterr = 0; + + /* + * LOG_NDELAY sets up the logging connection immediately, + * necessary for anonymous ftp's that chroot and can't do it later. + */ + openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, "46a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { @@ -367,7 +380,7 @@ val = strtol(optarg, &optarg, 8); if (*optarg != '\0' || val < 0) - warnx("bad value for -u"); + syslog(LOG_WARNING, "bad value for -u"); else defumask = val; break; @@ -385,7 +398,7 @@ break; default: - warnx("unknown flag -%c ignored", optopt); + syslog(LOG_WARNING, "unknown flag -%c ignored", optopt); break; } } @@ -393,13 +406,6 @@ #ifdef VIRTUAL_HOSTING inithosts(); #endif - (void) freopen(_PATH_DEVNULL, "w", stderr); - - /* - * LOG_NDELAY sets up the logging connection immediately, - * necessary for anonymous ftp's that chroot and can't do it later. - */ - openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); if (daemon_mode) { int *ctl_sock, fd, maxfd = -1, nfds, i; ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#15 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.72 2004/11/09 22:34:02 wilko Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.73 2004/12/11 20:41:57 wilko Exp $ --> <sect1 id="support-proc"> <sect1info> @@ -258,7 +258,11 @@ &os; run on a 16 Mbyte system but you will not enjoy that. Kernel build times halved when I went to 32 Mbytes. Note that the SRM console steals 2Mbyte from the total system memory (and keeps - it). For more serious work 64 Mbytes or more are recommended.</para> + it). For more serious work 64 Mbytes or more are recommended. + Although Alpha machines typically can accomodate large to very large + physical memory sizes, &os; is limited to 1 or 2 Gbytes (dependent + on the core chipset) of RAM. This restriction is due to the + current implementation of the VM system.</para> <para>While on the subject of memory: pay close attention to the type of memory your machine uses. There are very different memory ==== //depot/projects/hammer/sbin/fsck_ffs/main.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.42 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.43 2004/12/12 11:04:52 phk Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -304,6 +304,7 @@ if (bkgrdflag) { snprintf(snapname, sizeof snapname, "%s/.snap/fsck_snapshot", mntp->f_mntonname); + memset(&args, 0, sizeof args); args.fspec = snapname; while (mount("ffs", mntp->f_mntonname, mntp->f_flags | MNT_UPDATE | MNT_SNAPSHOT, ==== //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.17 2004/11/04 19:12:43 ceri Exp $ +.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.18 2004/12/09 12:26:47 pjd Exp $ .\" .Dd May 21, 2004 .Dt GSTRIPE 8 @@ -169,7 +169,7 @@ This can be set to a number between 0 and 3 inclusive. If set to 0 minimal debug information is printed, and if set to 3 the maximum amount of debug information in printed. -.It Va kern.geom.stripe.fast : No 1 +.It Va kern.geom.stripe.fast : No 0 If set to a non-zero value enable .Dq "fast mode" instead of the normal @@ -182,7 +182,7 @@ .Nm STRIPE will fall back to .Dq "economic mode" . -.It Va kern.geom.stripe.maxmem : No 1310720 +.It Va kern.geom.stripe.maxmem : No 13107200 Maximum amount of memory that can be consumed by .Dq "fast mode" (in bytes). @@ -204,7 +204,7 @@ create a file system on it, and mount it: .Bd -literal -offset indent -gstripe label -v -s 4096 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 +gstripe label -v -s 131072 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 newfs /dev/stripe/data mount /dev/stripe/data /mnt [...] ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.c#22 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.108 2004/12/08 19:18:07 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.109 2004/12/11 02:33:33 sam Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -446,6 +446,27 @@ #undef N } +struct callback { + callback_func *cb_func; + void *cb_arg; + struct callback *cb_next; +}; +static struct callback *callbacks = NULL; + +void +callback_register(callback_func *func, void *arg) +{ + struct callback *cb; + + cb = malloc(sizeof(struct callback)); + if (cb == NULL) + errx(1, "unable to allocate memory for callback"); + cb->cb_func = func; + cb->cb_arg = arg; + cb->cb_next = callbacks; + callbacks = cb; +} + /* specially-handled comamnds */ static void setifaddr(const char *, int, int, const struct afswtch *); static const struct cmd setifaddr_cmd = DEF_CMD("ifaddr", 0, setifaddr); @@ -457,6 +478,7 @@ static int ifconfig(int argc, char *const *argv, const struct afswtch *afp) { + struct callback *cb; int s; if (afp == NULL) @@ -541,6 +563,14 @@ if (ioctl(s, afp->af_aifaddr, afp->af_addreq) < 0) Perror("ioctl (SIOCAIFADDR)"); } + + /* + * Do deferred callbacks registered while processing + * command-line arguments. + */ + for (cb = callbacks; cb != NULL; cb = cb->cb_next) + cb->cb_func(s, cb->cb_arg); + close(s); return(0); } ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.13 2004/12/08 19:18:07 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.14 2004/12/11 02:33:33 sam Exp $ */ #define __constructor __attribute__((constructor)) @@ -56,6 +56,9 @@ }; void cmd_register(struct cmd *); +typedef void callback_func(int s, void *); +void callback_register(callback_func *, void *); + /* * Macros for declaring command functions and initializing entries. */ ==== //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.11 2004/12/08 19:18:07 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.12 2004/12/12 04:32:44 sam Exp $ */ /*- @@ -1382,9 +1382,10 @@ ireq.i_type = IEEE80211_IOC_WEP; if (ioctl(s, SIOCG80211, &ireq) != -1 && ireq.i_val != IEEE80211_WEP_NOSUP) { - int firstkey; + int firstkey, wepmode; - switch (ireq.i_val) { + wepmode = ireq.i_val; + switch (wepmode) { case IEEE80211_WEP_OFF: LINE_CHECK("%cprivacy OFF", spacer); break; @@ -1396,7 +1397,7 @@ break; default: LINE_CHECK("%cprivacy UNKNOWN (0x%x)", - spacer, ireq.i_val); + spacer, wepmode); break; } @@ -1412,7 +1413,7 @@ } if (ireq.i_val != -1) LINE_CHECK("%cdeftxkey %d", spacer, ireq.i_val+1); - else if (verbose) + else if (wepmode != IEEE80211_WEP_OFF || verbose) LINE_CHECK("%cdeftxkey UNDEF", spacer); ireq.i_type = IEEE80211_IOC_NUMWEPKEYS; ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#33 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.159 2004/11/03 21:51:34 ceri Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.160 2004/12/10 02:38:21 csjp Exp $ .\" .Dd October 22, 2004 .Dt IPFW 8 @@ -973,14 +973,10 @@ A .Ar group may be specified by name or number. -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm jail Ar prisonID Matches all TCP or UDP packets sent by or received for the jail whos prison ID is .Ar prisonID . -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm icmptypes Ar types Matches ICMP packets whose ICMP type is in the list .Ar types . @@ -1305,8 +1301,6 @@ A .Ar user may be matched by name or identification number. -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm verrevpath For incoming packets, a routing table lookup is done on the packet's source address. @@ -2342,10 +2336,6 @@ .Xr sysctl 8 , .Xr syslogd 8 .Sh BUGS -Lock ordering issues could result in system hard locks if rules which -contain UID, GID or jail ID constraints and used with debug.mpsafenet -set to 1. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412122329.iBCNTDKU083858>