From owner-p4-projects@FreeBSD.ORG Fri Sep 17 21:49:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA4CD16A4D0; Fri, 17 Sep 2004 21:49:10 +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 69A8716A4CE for ; Fri, 17 Sep 2004 21:49:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 428C543D41 for ; Fri, 17 Sep 2004 21:49:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8HLleHZ000174 for ; Fri, 17 Sep 2004 21:47:40 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8HLldO6000171 for perforce@freebsd.org; Fri, 17 Sep 2004 21:47:39 GMT (envelope-from peter@freebsd.org) Date: Fri, 17 Sep 2004 21:47:39 GMT Message-Id: <200409172147.i8HLldO6000171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61725 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: Fri, 17 Sep 2004 21:49:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=61725 Change 61725 by peter@peter_melody on 2004/09/17 21:47:33 IFC @61724 Affected files ... .. //depot/projects/hammer/etc/mtree/BSD.include.dist#25 integrate .. //depot/projects/hammer/etc/rc.d/ike#3 integrate .. //depot/projects/hammer/etc/rc.d/nsswitch#3 integrate .. //depot/projects/hammer/etc/rc.d/pf#4 integrate .. //depot/projects/hammer/etc/rc.d/pflog#3 integrate .. //depot/projects/hammer/etc/rc.d/swap1#5 integrate .. //depot/projects/hammer/gnu/lib/libregex/Makefile#6 integrate .. //depot/projects/hammer/include/Makefile#30 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#20 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#7 integrate .. //depot/projects/hammer/lib/libutil/humanize_number.3#3 integrate .. //depot/projects/hammer/lib/msun/src/math.h#22 integrate .. //depot/projects/hammer/release/Makefile#60 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/Makefile#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#61 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#13 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#78 integrate .. //depot/projects/hammer/release/doc/share/examples/Makefile.relnotesng#6 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#6 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#4 integrate .. //depot/projects/hammer/sbin/mdconfig/Makefile#2 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#15 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#12 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#14 integrate .. //depot/projects/hammer/share/man/man4/Makefile#49 integrate .. //depot/projects/hammer/share/man/man4/de.4#5 integrate .. //depot/projects/hammer/share/man/man4/ed.4#4 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ndis.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_netflow.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_ubt.4#9 integrate .. //depot/projects/hammer/share/man/man9/Makefile#38 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#15 integrate .. //depot/projects/hammer/share/man/man9/microtime.9#2 integrate .. //depot/projects/hammer/share/man/man9/microuptime.9#2 integrate .. //depot/projects/hammer/share/man/man9/time.9#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#11 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#12 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#19 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#19 integrate .. //depot/projects/hammer/sys/conf/NOTES#67 integrate .. //depot/projects/hammer/sys/conf/files#83 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#24 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#13 integrate .. //depot/projects/hammer/sys/conf/options#59 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#26 integrate .. //depot/projects/hammer/sys/dev/aac/aacreg.h#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#36 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#34 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#16 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_acpi.c#5 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#9 integrate .. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#6 integrate .. //depot/projects/hammer/sys/dev/md/md.c#39 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#15 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#20 integrate .. //depot/projects/hammer/sys/dev/si/si.c#15 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#41 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/umodem.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#11 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#14 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.S#5 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#41 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#30 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#49 integrate .. //depot/projects/hammer/sys/kern/tty.c#24 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#20 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/netgraph/netflow/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_tap.c#17 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#1 branch .. //depot/projects/hammer/sys/netgraph/netflow/netflow.h#1 branch .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.c#1 branch .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.h#1 branch .. //depot/projects/hammer/sys/netinet/ip_input.c#41 integrate .. //depot/projects/hammer/sys/pc98/pc98/ppc.c#7 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#30 integrate .. //depot/projects/hammer/sys/sys/conf.h#17 integrate .. //depot/projects/hammer/sys/sys/mdioctl.h#7 integrate .. //depot/projects/hammer/sys/sys/tty.h#15 integrate .. //depot/projects/hammer/sys/sys/ttydefaults.h#4 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#25 integrate .. //depot/projects/hammer/tools/lib32/build32.sh#5 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#26 integrate .. //depot/projects/hammer/usr.sbin/Makefile#53 integrate .. //depot/projects/hammer/usr.sbin/flowctl/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/flowctl/flowctl.c#1 branch Differences ... ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.89 2004/09/02 20:44:55 alfred Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.91 2004/09/16 21:33:56 glebius Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -140,6 +140,8 @@ include .. .. + netflow + .. .. netinet .. ==== //depot/projects/hammer/etc/rc.d/ike#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ike,v 1.2 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ike,v 1.3 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: ike -# REQUIRE: root beforenetlkm mountcritlocal +# REQUIRE: root mountcritlocal # BEFORE: DAEMON # KEYWORD: FreeBSD nojail ==== //depot/projects/hammer/etc/rc.d/nsswitch#3 (text+ko) ==== @@ -23,12 +23,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/nsswitch,v 1.3 2004/06/21 19:38:58 des Exp $ +# $FreeBSD: src/etc/rc.d/nsswitch,v 1.4 2004/09/16 17:03:12 keramida Exp $ # # PROVIDE: nsswitch # REQUIRE: root -# BEFORE: network +# BEFORE: NETWORK # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/pf#4 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.3 2004/06/23 01:42:06 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.4 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: pf -# REQUIRE: root beforenetlkm mountcritlocal netif pflog +# REQUIRE: root mountcritlocal netif pflog # BEFORE: DAEMON LOGIN # KEYWORD: FreeBSD nojail ==== //depot/projects/hammer/etc/rc.d/pflog#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pflog,v 1.2 2004/08/31 14:23:51 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/pflog,v 1.3 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: pflog -# REQUIRE: root beforenetlkm mountcritlocal netif +# REQUIRE: root mountcritlocal netif # BEFORE: DAEMON LOGIN # KEYWORD: FreeBSD nojail ==== //depot/projects/hammer/etc/rc.d/swap1#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.7 2004/09/17 17:58:19 pjd Exp $ # # PROVIDE: localswap @@ -12,27 +12,7 @@ name="swap1" start_cmd='swapon -a' -stop_cmd=':' - -# Add all block-type swap devices; these might be necessary -# during disk checks. -# -swap1_start() -{ - if ! checkyesno no_swap; then - swapctl -A -t blk - fi -} - -# Remove all block-type swap devices -# -swap1_stop() -{ - if checkyesno swapoff || [ -n "$rc_force" ]; then - echo "Removing block-type swap devices" - swapctl -U -t blk - fi -} +stop_cmd='swapoff -a' load_rc_config swap run_rc_command "$1" ==== //depot/projects/hammer/gnu/lib/libregex/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.28 2004/03/22 14:44:00 ache Exp $ +# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.29 2004/09/16 01:39:13 peter Exp $ SUBDIR+= doc @@ -16,7 +16,7 @@ PXINCSDIR= ${INCLUDEDIR}/gnu/posix NOMAN= noman -CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS -I${DESTDIR}/usr/include/gnu +CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS regex.h.patched: regex.h sed 's===g' \ ==== //depot/projects/hammer/include/Makefile#30 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.223 2004/09/02 20:44:55 alfred Exp $ +# $FreeBSD: src/include/Makefile,v 1.225 2004/09/17 09:17:33 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -41,8 +41,9 @@ geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ geom/stripe \ isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - netgraph/atm security/mac_biba security/mac_bsdextended \ - security/mac_lomac security/mac_mls security/mac_partition \ + netgraph/atm netgraph/netflow \ + security/mac_biba security/mac_bsdextended security/mac_lomac \ + security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs fs/autofs .if !defined(NO_BLUETOOTH) @@ -63,7 +64,7 @@ ${.CURDIR}/Makefile @${ECHO} creating osreldate.h from newvers.sh @setvar PARAMFILE ${.CURDIR}/../sys/sys/param.h; \ - . ${.CURDIR}/../sys/conf/newvers.sh; \ + MAKE=${MAKE} . ${.CURDIR}/../sys/conf/newvers.sh; \ echo "$$COPYRIGHT" > osreldate.h; \ echo "#ifdef _KERNEL" >> osreldate.h; \ echo '#error " cannot be used in the kernel, use "' >> osreldate.h; \ ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.17 2004/08/08 02:22:48 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.18 2004/09/17 04:39:07 kientzle Exp $"); #include #include @@ -414,7 +414,7 @@ } /* If numeric GID is too large, add 'gid' to pax extended attrs. */ - if (st_main->st_gid >= (1 << 20)) { + if (st_main->st_gid >= (1 << 18)) { add_pax_attr_int(&(pax->pax_header), "gid", st_main->st_gid); need_extension = 1; } @@ -429,7 +429,7 @@ } /* If numeric UID is too large, add 'uid' to pax extended attrs. */ - if (st_main->st_uid >= (1 << 20)) { + if (st_main->st_uid >= (1 << 18)) { add_pax_attr_int(&(pax->pax_header), "uid", st_main->st_uid); need_extension = 1; } @@ -636,7 +636,11 @@ archive_entry_set_pathname(pax_attr_entry, pax_attr_name); st.st_size = archive_strlen(&(pax->pax_header)); st.st_uid = st_main->st_uid; + if (st.st_uid >= 1 << 18) + st.st_uid = (1 << 18) - 1; st.st_gid = st_main->st_gid; + if (st.st_gid >= 1 << 18) + st.st_gid = (1 << 18) - 1; st.st_mode = st_main->st_mode; archive_entry_copy_stat(pax_attr_entry, &st); ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#20 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.40 2004/08/19 23:49:04 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.41 2004/09/16 13:55:46 mtm Exp $ */ #ifndef _THR_PRIVATE_H @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -833,6 +834,12 @@ int __sys_ioctl(int, unsigned long, ...); #endif +/* #include */ +#ifdef _SYS_MSG_H_ +int __sys_msgrcv(int, void *, size_t, long, int); +int __sys_msgsnd(int, const void *, size_t, int); +#endif + /* #include */ #ifdef _SYS_MMAN_H_ int __sys_msync(void *, size_t, int); @@ -852,6 +859,7 @@ int __sys_getsockname(int, struct sockaddr *, socklen_t *); int __sys_getsockopt(int, int, int, void *, socklen_t *); int __sys_listen(int, int); +ssize_t __sys_recv(int, void *, size_t, int); ssize_t __sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *); ssize_t __sys_recvmsg(int, struct msghdr *, int); int __sys_sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int); @@ -898,12 +906,23 @@ int __sys_poll(struct pollfd *, unsigned, int); #endif +/* #include */ +#ifdef _SEMAPHORE_H_ +int __sem_timedwait(sem_t * __restrict, const struct timespec * __restrict); +int __sem_wait(sem_t *); +#endif + /* #include */ #ifdef _SIGNAL_H_ int __sys_sigaction(int, const struct sigaction *, struct sigaction *); int __sys_sigaltstack(const struct sigaltstack *, struct sigaltstack *); int __sys_sigprocmask(int, const sigset_t *, sigset_t *); int __sys_sigreturn(ucontext_t *); +int __sys_sigsuspend(const sigset_t *); +int __sys_sigtimedwait(const sigset_t * __restrict, siginfo_t * __restrict, + const struct timespec * __restrict); +int __sys_sigwait(const sigset_t * __restrict, int * __restrict); +int __sys_sigwaitinfo(const sigset_t * __restrict, siginfo_t * __restrict); #endif /* #include */ @@ -918,6 +937,8 @@ long __sys_fpathconf(int, int); int __sys_fsync(int); int __sys_pipe(int *); +ssize_t __sys_pread(int, void *, size_t, off_t); +ssize_t __sys_pwrite(int, const void *, size_t, off_t); ssize_t __sys_read(int, void *, size_t); ssize_t __sys_write(int, const void *, size_t); #endif ==== //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.7 2004/06/27 10:01:35 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.8 2004/09/16 13:55:46 mtm Exp $ */ /* @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -80,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -103,6 +105,19 @@ extern pid_t __sys_wait4(pid_t, int *, int, struct rusage *); extern pid_t __waitpid(pid_t, int *, int); +__weak_reference(_accept, accept); + +int +_accept(int s, struct sockaddr *addr, socklen_t *addrlen) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_accept(s, addr, addrlen); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_aio_suspend, aio_suspend); int @@ -131,6 +146,20 @@ return ret; } + +__weak_reference(_connect, connect); + +int +_connect(int s, const struct sockaddr *n, socklen_t l) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_connect(s, n, l); + _thread_leave_cancellation_point(); + return ret; +} + __weak_reference(_creat, creat); int @@ -246,6 +275,32 @@ return ret; } +__weak_reference(_msgrcv, msgrcv); + +int +_msgrcv(int id, void *p, size_t sz, long t, int f) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_msgrcv(id, p, sz, t, f); + _thread_leave_cancellation_point(); + return ret; +} + +__weak_reference(_msgsnd, msgsnd); + +int +_msgsnd(int id, const void *p, size_t sz, int f) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_msgsnd(id, p, sz, f); + _thread_leave_cancellation_point(); + return ret; +} + __weak_reference(_msync, msync); int @@ -300,6 +355,22 @@ return ret; } +/* + * The implementation in libc calls sigpause(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_pause, pause); + +int +_pause(void) +{ + _thread_enter_cancellation_point(); + __pause(); + _thread_leave_cancellation_point(); +} +#endif + __weak_reference(_poll, poll); int @@ -314,6 +385,24 @@ return ret; } +/* XXXFix */ +#if 0 +__weak_reference(_pread, pread); + +ssize_t +_pread(int d, void *b, size_t n, off_t o) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_pread(d, b, n, o); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +/* The libc version calls select(), which is also a cancellation point. */ +#if 0 extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask); @@ -329,7 +418,24 @@ return (ret); } +#endif +/* XXXFix */ +#if 0 +__weak_reference(_pwrite, pwrite); + +ssize_t +_pwrite(int d, const void *b, size_t n, off_t o) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_pwrite(d, b, n, o); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + __weak_reference(_raise, raise); int @@ -373,6 +479,52 @@ return ret; } +/* + * The libc implementation of recv() calls recvfrom, which + * is also a cancellation point. + */ +#if 0 +__weak_reference(_recv, recv); + +ssize_t +_recv(int s, void *b, size_t l, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recv(s, b, l, f); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_recvfrom, recvfrom); + +ssize_t +_recvfrom(int s, void *b, size_t l, int f, struct sockaddr *from, + socklen_t *fl) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recvfrom(s, b, l, f, from, fl); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_recvmsg, recvmsg); + +ssize_t +_recvmsg(int s, struct msghdr *m, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recvmsg(s, m, f); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_select, select); int @@ -388,6 +540,123 @@ return ret; } +/* + * Libc implements this by calling _sendto(), which is also a + * cancellation point. + */ +#if 0 +__weak_reference(_send, send); + +ssize_t +_send(int s, const void *m, size_t l, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = _sendto(s, m, l, f, NULL, 0); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_sendmsg, sendmsg); + +ssize_t +_sendmsg(int s, const struct msghdr *m, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_sendmsg(s, m, f); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sendto, sendto); + +ssize_t +_sendto(int s, const void *m, size_t l, int f, const struct sockaddr *t, + socklen_t tl) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_sendto(s, m, l, f, t, tl); + _thread_leave_cancellation_point(); + return (ret); +} + +/* + * The implementation in libc calls sigsuspend(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_sigpause, sigpause); + +int +_sigpause(int m) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigpause(m); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_sigsuspend, sigsuspend); + +int +_sigsuspend(const sigset_t *m) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigsuspend(m); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigtimedwait, sigtimedwait); + +int +_sigtimedwait(const sigset_t *s, siginfo_t *i, const struct timespec *t) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigtimedwait(s, i, t); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigwait, sigwait); + +int +_sigwait(const sigset_t *s, int *i) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigwait(s, i); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigwaitinfo, sigwaitinfo); + +int +_sigwaitinfo(const sigset_t *s, siginfo_t *i) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigwaitinfo(s, i); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_sleep, sleep); unsigned int @@ -431,6 +700,25 @@ return ret; } +/* + * The usleep() implementation calls nanosleep(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_usleep, usleep); + +int +_usleep(useconds_t u) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_usleep(u); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + __weak_reference(_wait, wait); pid_t @@ -459,6 +747,10 @@ return ret; } +/* + * The libc implementation of waitpid calls wait4(). + */ +#if 0 __weak_reference(_waitpid, waitpid); pid_t @@ -472,6 +764,7 @@ return ret; } +#endif __weak_reference(_write, write); ==== //depot/projects/hammer/lib/libutil/humanize_number.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $ -.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.4 2004/07/07 20:25:54 ru Exp $ +.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.5 2004/09/16 18:32:58 pjd Exp $ .\" .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -141,8 +141,6 @@ If .Dv HN_GETSCALE is specified, the prefix index number will be returned instead. -.Sh SEE ALSO -.Xr humanize_number 9 .Sh HISTORY The .Fn humanize_number ==== //depot/projects/hammer/lib/msun/src/math.h#22 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.43 2004/07/19 08:16:10 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.44 2004/09/17 05:15:33 das Exp $ */ #ifndef _MATH_H_ @@ -34,11 +34,11 @@ float __uf; } __nan; -#if (defined(__GNUC__) && ((__GNUC__ >= 3 && __GNUC_MINOR__ >= 3) || __GNUC__ >= 4)) || defined(__INTEL_COMPILER) +#if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800) #define __MATH_BUILTIN_CONSTANTS #endif -#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER)) +#if __GNUC_PREREQ__(3, 0) && !defined(__INTEL_COMPILER) #define __MATH_BUILTIN_RELOPS #endif ==== //depot/projects/hammer/release/Makefile#60 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.861 2004/09/15 05:14:21 brooks Exp $ +# $FreeBSD: src/release/Makefile,v 1.862 2004/09/17 19:28:46 keramida Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -160,7 +160,7 @@ AUTO_KEYBOARD_DETECT?= 0 .if !defined(NODOC) -DIST_DOCS_ARCH_INDEP= readme errata early-adopter +DIST_DOCS_ARCH_INDEP= readme errata DIST_DOCS_ARCH_DEP= installation relnotes hardware .endif ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.5 2004/08/06 08:41:22 simon Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.6 2004/09/16 16:46:37 hrs Exp $ RELN_ROOT?= ${.CURDIR}/.. @@ -7,7 +7,7 @@ SUBDIR+= readme SUBDIR+= errata SUBDIR+= installation -SUBDIR+= early-adopter +#SUBDIR+= early-adopter COMPAT_SYMLINK = en ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#61 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.256 2004/09/14 01:46:27 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.257 2004/09/16 20:38:28 brueffer Exp $ Supported Devices @@ -261,236 +261,7 @@ SMC 83c17x (EPIC)-based Ethernet NICs (&man.tx.4; driver) - National Semiconductor DS8390-based Ethernet NICs, including - Novell NE2000 and clones - (&man.ed.4; driver) - - In kernel configuration, you need to set flag for non-PCI - device. - - - - 3C503 Etherlink II (&man.ed.4; driver) - - - DEC Etherworks DE305 - - - Hewlett-Packard PC Lan+ 27247B and 27252A - - - NetVin 5000 - - - Novell NE1000, NE2000, and NE2100 - - - RealTek 8029 - - - SMC Elite 16 WD8013 Ethernet interface - - - SMC Elite Ultra - - - SMC WD8003E, WD8003EBT, WD8003W, WD8013W, WD8003S, - WD8003SBT and WD8013EBT and clones - - - Surecom NE-34 - - - VIA VT86C926 - - - Winbond W89C940 - - - I-O DATA ET2/T-PCI - - - MELCO LGY-PCI-TR - - - PLANEX ENW-8300-T - - - Allied Telesis LA-98 (flags 0x000000) - - - Corega Ether98-T (flags 0x000000) - - - SMC EtherEZ98 (flags 0x000000) - - - ELECOM LD-BDN, LD-NW801G (flags 0x200000) - - - PLANEX EN-2298-C (flags 0x200000) - - - MELCO EGY-98 (flags 0x300000) - - - Contec C-NET(98)E-A, C-NET(98)L-A, C-NET(98)P (flags - 0x300000) - - - MELCO LGY-98, LGH-98, IND-SP, IND-SS, LGY-98-N - (110pin) (flags 0x400000) - - - MACNICA NE2098 (flags 0x400000) - - - ICM IF-2766ET, IF-2771ET, AD-ET2-T, DT-ET-25, DT-ET-T5, - NB-ET-T (110pin) (flags 0x500000) - - - D-Link DE-298, DE-298P (flags 0x500000) - - - ELECOM LD-98P (flags 0x500000) - - - PLANEX EN-2298-T, EN-2298P-T (flags 0x500000) - - - Allied Telesis SIC-98, SIU-98, SIC-98NOTE (110pin) (flags - 0x600000) - - - Allied Telesis SIU-98-D (flags 0x610000) - - - NEC PC-9801-107, 108 (flags 0x800000) - - - I-O DATA LA/T-98, LA/T-98SB, LA2/T-98, ET/T-98 (flags - 0x900000) >>> TRUNCATED FOR MAIL (1000 lines) <<<