Date: Tue, 9 Apr 2002 12:26:16 -0700 (PDT) From: Jake Burkholder <jake@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9458 for review Message-ID: <200204091926.g39JQGo63159@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9458 Change 9458 by jake@jake_sparc64 on 2002/04/09 12:25:16 Integ@9456 Affected files ... ... //depot/projects/sparc64/bin/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#4 integrate ... //depot/projects/sparc64/gnu/lib/Makefile#7 integrate ... //depot/projects/sparc64/gnu/lib/libreadline/readline/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/Makefile#10 integrate ... //depot/projects/sparc64/gnu/usr.bin/sort/sort.c#4 integrate ... //depot/projects/sparc64/lib/libc/gen/getobjformat.c#4 integrate ... //depot/projects/sparc64/lib/libc/gen/strtofflags.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#9 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_select.c#2 integrate ... //depot/projects/sparc64/lib/libedit/Makefile#2 integrate ... //depot/projects/sparc64/lib/libstand/Makefile#8 integrate ... //depot/projects/sparc64/release/Makefile#6 integrate ... //depot/projects/sparc64/sbin/Makefile#12 integrate ... //depot/projects/sparc64/sbin/dumpon/dumpon.c#5 integrate ... //depot/projects/sparc64/sbin/kget/Makefile#2 delete ... //depot/projects/sparc64/sbin/kget/kget.8#2 delete ... //depot/projects/sparc64/sbin/kget/kget.c#2 delete ... //depot/projects/sparc64/share/examples/etc/make.conf#5 integrate ... //depot/projects/sparc64/share/man/man4/ip.4#2 integrate ... //depot/projects/sparc64/share/mk/bsd.libnames.mk#6 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#26 integrate ... //depot/projects/sparc64/sys/boot/common/load_elf.c#11 integrate ... //depot/projects/sparc64/sys/boot/ficl/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/alpha/sysdep.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/dict.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/ficl.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/ficl.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/fileaccess.c#1 branch ... //depot/projects/sparc64/sys/boot/ficl/float.c#1 branch ... //depot/projects/sparc64/sys/boot/ficl/i386/sysdep.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/ia64/sysdep.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/loader.c#4 integrate ... //depot/projects/sparc64/sys/boot/ficl/math64.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/math64.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/prefix.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/search.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/ficlclass.fr#1 branch ... //depot/projects/sparc64/sys/boot/ficl/softwords/fileaccess.fr#1 branch ... //depot/projects/sparc64/sys/boot/ficl/softwords/forml.fr#1 branch ... //depot/projects/sparc64/sys/boot/ficl/softwords/ifbrack.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/marker.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/oo.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/prefix.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/softcore.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/stack.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/testmain.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/tools.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/vm.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/words.c#3 integrate ... //depot/projects/sparc64/sys/conf/NOTES#2 integrate ... //depot/projects/sparc64/sys/conf/files#51 integrate ... //depot/projects/sparc64/sys/conf/majors#8 integrate ... //depot/projects/sparc64/sys/conf/options#25 integrate ... //depot/projects/sparc64/sys/dev/eisa/eisaconf.c#2 integrate ... //depot/projects/sparc64/sys/dev/fb/vga.c#5 integrate ... //depot/projects/sparc64/sys/dev/kbd/atkbd.c#3 integrate ... //depot/projects/sparc64/sys/dev/null/null.c#4 integrate ... //depot/projects/sparc64/sys/dev/usb/usb.c#11 integrate ... //depot/projects/sparc64/sys/geom/geom.h#6 integrate ... //depot/projects/sparc64/sys/geom/geom_bsd.c#8 integrate ... //depot/projects/sparc64/sys/geom/geom_dev.c#8 integrate ... //depot/projects/sparc64/sys/geom/geom_disk.c#6 integrate ... //depot/projects/sparc64/sys/geom/geom_io.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_mbr.c#6 integrate ... //depot/projects/sparc64/sys/geom/geom_pc98.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.c#7 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.h#4 integrate ... //depot/projects/sparc64/sys/geom/geom_subr.c#5 integrate ... //depot/projects/sparc64/sys/geom/geom_sunlabel.c#6 integrate ... //depot/projects/sparc64/sys/i386/conf/GENERIC#18 integrate ... //depot/projects/sparc64/sys/i386/conf/NEWCARD#10 integrate ... //depot/projects/sparc64/sys/i386/conf/NOTES#38 integrate ... //depot/projects/sparc64/sys/i386/i386/machdep.c#28 integrate ... //depot/projects/sparc64/sys/i386/include/md_var.h#10 integrate ... //depot/projects/sparc64/sys/i386/include/uc_device.h#2 delete ... //depot/projects/sparc64/sys/i386/isa/isa_device.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#35 integrate ... //depot/projects/sparc64/sys/ia64/ia64/ssc.c#7 integrate ... //depot/projects/sparc64/sys/ia64/include/ia64_cpu.h#7 integrate ... //depot/projects/sparc64/sys/isa/pnpreg.h#2 integrate ... //depot/projects/sparc64/sys/kern/kern_intr.c#14 integrate ... //depot/projects/sparc64/sys/kern/subr_disk.c#11 integrate ... //depot/projects/sparc64/sys/kern/vfs_cache.c#12 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#27 integrate ... //depot/projects/sparc64/sys/kern/vfs_vnops.c#20 integrate ... //depot/projects/sparc64/sys/netinet/in.h#8 integrate ... //depot/projects/sparc64/sys/pc98/conf/GENERIC#15 integrate ... //depot/projects/sparc64/sys/pc98/i386/machdep.c#24 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/machdep.c#22 integrate ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#21 integrate ... //depot/projects/sparc64/sys/sparc64/include/frame.h#22 integrate ... //depot/projects/sparc64/sys/sparc64/include/reg.h#13 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/db_trace.c#28 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/emul.c#12 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#75 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/trap.c#70 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#49 integrate ... //depot/projects/sparc64/sys/sys/bio.h#8 integrate ... //depot/projects/sparc64/sys/sys/disk.h#6 integrate ... //depot/projects/sparc64/sys/sys/ioccom.h#4 integrate ... //depot/projects/sparc64/usr.bin/Makefile#19 integrate ... //depot/projects/sparc64/usr.bin/awk/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/colldef/parse.y#2 integrate ... //depot/projects/sparc64/usr.bin/colldef/scan.l#2 integrate ... //depot/projects/sparc64/usr.bin/xinstall/xinstall.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/closure.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/error.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/lalr.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/lr0.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/main.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/mkpar.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/output.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/reader.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/skeleton.c#2 integrate ... //depot/projects/sparc64/usr.bin/yacc/symtab.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/verbose.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/warshall.c#3 integrate ... //depot/projects/sparc64/usr.sbin/Makefile#12 integrate ... //depot/projects/sparc64/usr.sbin/wicontrol/wicontrol.8#2 integrate Differences ... ==== //depot/projects/sparc64/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.19 2002/02/11 18:38:54 mike Exp $ +# $FreeBSD: src/bin/Makefile,v 1.20 2002/04/09 18:25:37 bmilekic Exp $ SUBDIR= cat \ chio \ @@ -22,7 +22,6 @@ pax \ ps \ pwd \ - rcp \ realpath \ rm \ rmdir \ @@ -33,6 +32,10 @@ sync \ test +.if !defined(NO_RCMNDS) +SUBDIR+=rcp +.endif + .if !defined(NO_TCSH) SUBDIR+=csh .endif ==== //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.11 2002/04/06 17:53:06 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.12 2002/04/09 02:09:14 gshapiro Exp $ sendmail 8.12.2 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ @@ -51,6 +51,8 @@ etc/mtree/BSD.include.dist etc/mtree/BSD.usr.dist etc/mtree/BSD.var.dist + etc/periodic/daily/440.status-mailq + etc/periodic/daily/500.queuerun etc/rc etc/sendmail/Makefile etc/sendmail/freebsd.mc ==== //depot/projects/sparc64/gnu/lib/Makefile#7 (text+ko) ==== ==== //depot/projects/sparc64/gnu/lib/libreadline/readline/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.8 2001/04/21 22:05:33 ache Exp $ +# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.9 2002/04/09 13:02:26 ru Exp $ SUBDIR= doc @@ -14,8 +14,8 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h -DPADD+= $(LIBTERMCAP) -LDADD+= -ltermcap +DPADD= ${LIBNCURSES} +LDADD= -lncurses INCDIR= /usr/include/readline ==== //depot/projects/sparc64/gnu/usr.bin/Makefile#10 (text+ko) ==== ==== //depot/projects/sparc64/gnu/usr.bin/sort/sort.c#4 (text+ko) ==== @@ -19,7 +19,7 @@ The author may be reached (Email) at the address mike@gnu.ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* $FreeBSD: src/gnu/usr.bin/sort/sort.c,v 1.20 2002/04/08 12:12:06 ache Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/sort/sort.c,v 1.21 2002/04/08 22:00:28 ache Exp $ */ #include <config.h> @@ -198,6 +198,8 @@ static struct keyfield keyhead; #ifdef __FreeBSD__ +static unsigned char decimal_point; + static int COLLDIFF (int a, int b) { @@ -751,7 +753,11 @@ { register tmpa = UCHAR (*a), tmpb = UCHAR (*b); +#ifdef __FreeBSD__ + if (tmpa == decimal_point && tmpb == decimal_point) +#else if (tmpa == '.' && tmpb == '.') +#endif { do tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); @@ -776,7 +782,11 @@ } return 0; } +#ifdef __FreeBSD__ + else if (tmpa == decimal_point) +#else else if (tmpa == '.') +#endif { do tmpa = UCHAR (*++a); @@ -785,7 +795,11 @@ return 1; return 0; } +#ifdef __FreeBSD__ + else if (tmpb == decimal_point) +#else else if (tmpb == '.') +#endif { do tmpb = UCHAR (*++b); @@ -821,7 +835,11 @@ while (tmpa == '0'); if (tmpb != '-') { +#ifdef __FreeBSD__ + if (tmpa == decimal_point) +#else if (tmpa == '.') +#endif do tmpa = UCHAR (*++a); while (tmpa == '0'); @@ -829,7 +847,11 @@ return -1; while (tmpb == '0') tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if (tmpb == decimal_point) +#else if (tmpb == '.') +#endif do tmpb = UCHAR (*++b); while (tmpb == '0'); @@ -844,7 +866,12 @@ while (tmpa == tmpb && digits[tmpa]) tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if ((tmpa == decimal_point && !digits[tmpb]) || + (tmpb == decimal_point && !digits[tmpa])) +#else if ((tmpa == '.' && !digits[tmpb]) || (tmpb == '.' && !digits[tmpa])) +#endif return -fraccompare (a, b); if (digits[tmpa]) @@ -876,7 +903,11 @@ do tmpb = UCHAR (*++b); while (tmpb == '0'); +#ifdef __FreeBSD__ + if (tmpb == decimal_point) +#else if (tmpb == '.') +#endif do tmpb = UCHAR (*++b); while (tmpb == '0'); @@ -884,7 +915,11 @@ return 1; while (tmpa == '0') tmpa = UCHAR (*++a); +#ifdef __FreeBSD__ + if (tmpa == decimal_point) +#else if (tmpa == '.') +#endif do tmpa = UCHAR (*++a); while (tmpa == '0'); @@ -902,7 +937,12 @@ while (tmpa == tmpb && digits[tmpa]) tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if ((tmpa == decimal_point && !digits[tmpb]) || + (tmpb == decimal_point && !digits[tmpa])) +#else if ((tmpa == '.' && !digits[tmpb]) || (tmpb == '.' && !digits[tmpa])) +#endif return fraccompare (a, b); if (digits[tmpa]) @@ -1738,6 +1778,7 @@ #ifdef __FreeBSD__ (void) setlocale(LC_ALL, ""); + decimal_point = localeconv()->decimal_point[0]; #endif program_name = argv[0]; ==== //depot/projects/sparc64/lib/libc/gen/getobjformat.c#4 (text+ko) ==== @@ -25,9 +25,7 @@ */ #include <sys/cdefs.h> -#ifdef __FBSDID -__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.5 2002/02/08 09:34:17 ru Exp $"); -#endif +__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.6 2002/04/09 11:39:03 ru Exp $"); #include <sys/param.h> #include <objformat.h> ==== //depot/projects/sparc64/lib/libc/gen/strtofflags.c#4 (text+ko) ==== @@ -35,9 +35,7 @@ static char sccsid[] = "@(#)stat_flags.c 8.1 (Berkeley) 5/31/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -#ifdef __FBSDID -__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.20 2002/02/08 09:34:17 ru Exp $"); -#endif +__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.21 2002/04/09 11:39:03 ru Exp $"); #include <sys/types.h> #include <sys/stat.h> ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#9 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.3 2002/03/22 21:52:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.4 2002/04/09 00:57:23 jake Exp $"); #include <sys/param.h> ==== //depot/projects/sparc64/lib/libc_r/uthread/uthread_select.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_select.c,v 1.18 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.19 2002/04/09 05:41:00 asmodai Exp $ */ #include <unistd.h> #include <errno.h> @@ -52,7 +52,7 @@ struct pthread *curthread = _get_curthread(); struct timespec ts; int i, ret = 0, f_wait = 1; - int pfd_index, got_one = 0, fd_count = 0; + int pfd_index, got_events = 0, fd_count = 0; struct pthread_poll_data data; if (numfds > _thread_dtablesize) { @@ -166,12 +166,22 @@ * this file descriptor from the fdset if * the requested event wasn't ready. */ - got_one = 0; + + /* + * First check for invalid descriptor. + * If found, set errno and return -1. + */ + if (data.fds[i].revents & POLLNVAL) { + errno = EBADF; + return -1; + } + + got_events = 0; if (readfds != NULL) { if (FD_ISSET(data.fds[i].fd, readfds)) { if (data.fds[i].revents & (POLLIN | POLLRDNORM)) - got_one = 1; + got_events++; else FD_CLR(data.fds[i].fd, readfds); } @@ -180,7 +190,7 @@ if (FD_ISSET(data.fds[i].fd, writefds)) { if (data.fds[i].revents & (POLLOUT | POLLWRNORM | POLLWRBAND)) - got_one = 1; + got_events++; else FD_CLR(data.fds[i].fd, writefds); @@ -189,16 +199,15 @@ if (exceptfds != NULL) { if (FD_ISSET(data.fds[i].fd, exceptfds)) { if (data.fds[i].revents & (POLLRDBAND | - POLLPRI | POLLHUP | POLLERR | - POLLNVAL)) - got_one = 1; + POLLPRI)) + got_events++; else FD_CLR(data.fds[i].fd, exceptfds); } } - if (got_one) - numfds++; + if (got_events != 0) + numfds+=got_events; } ret = numfds; } ==== //depot/projects/sparc64/lib/libedit/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.19 2000/08/15 12:01:40 mrg Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libedit/Makefile,v 1.24 2001/10/01 23:10:48 obrien Exp $ +# $FreeBSD: src/lib/libedit/Makefile,v 1.25 2002/04/09 13:04:31 ru Exp $ LIB= edit SHLIB_MAJOR= 4 @@ -9,8 +9,8 @@ OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBNCURSES} +LDADD= -lncurses MAN= editline.3 editrc.5 ==== //depot/projects/sparc64/lib/libstand/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.32 2002/04/08 20:46:07 obrien Exp $ +# $FreeBSD: src/lib/libstand/Makefile,v 1.33 2002/04/09 05:34:22 obrien Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: @@ -11,8 +11,6 @@ NOPIC= YES MAN= libstand.3 -CFLAGS+= -ffreestanding - .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -mno-fp-regs .endif ==== //depot/projects/sparc64/release/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.666 2002/04/02 15:07:34 matusita Exp $ +# $FreeBSD: src/release/Makefile,v 1.667 2002/04/09 01:17:47 matusita Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -1009,6 +1009,7 @@ @echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .endif @echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc + @echo "set hint.acpi.0.disable=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .if ${MACHINE_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT} ==== //depot/projects/sparc64/sbin/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.101 2002/04/02 10:58:30 marcel Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.102 2002/04/09 10:55:11 phk Exp $ # XXX MISSING: icheck ncheck @@ -86,7 +86,6 @@ .if ${MACHINE_ARCH} == "i386" SUBDIR+=cxconfig \ - kget \ mount_nwfs \ mount_smbfs \ nextboot ==== //depot/projects/sparc64/sbin/dumpon/dumpon.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "From: @(#)swapon.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.15 2002/04/08 09:20:04 phk Exp $"; + "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.16 2002/04/09 10:00:18 phk Exp $"; #endif /* not lint */ #include <err.h> @@ -84,9 +84,9 @@ if (fd < 0) err(EX_OSFILE, "%s", argv[0]); u = 0; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); u = 1; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps on %s\n", argv[0]); @@ -95,12 +95,12 @@ if (fd < 0) err(EX_OSFILE, "%s", _PATH_DEVNULL); u = 0; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps disabled\n"); } if (i < 0) - err(EX_OSERR, "ioctl(DIOCGKERNELDUMP)"); + err(EX_OSERR, "ioctl(DIOCSKERNELDUMP)"); exit (0); } ==== //depot/projects/sparc64/share/examples/etc/make.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.183 2002/03/30 18:14:37 ume Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.184 2002/04/09 18:25:40 bmilekic Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -116,6 +116,7 @@ #NOSECURE= true # do not build crypto code in secure/ subdir #NOSHARE= true # do not go into the share subdir #NOUUCP= true # do not build uucp related programs +#NO_RCMNDS= true # do not build rlogin, rsh & rcp # # To build the OpenSSL manpages, uncomment the following. These are not # built by default because they clobber a number of system manpages with ==== //depot/projects/sparc64/share/man/man4/ip.4#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.24 2001/10/01 16:09:21 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.25 2002/04/09 18:03:18 silby Exp $ .\" .Dd March 3, 2001 .Dt IP 4 @@ -144,9 +144,9 @@ .Bl -tag -width IP_PORTRANGE_DEFAULT .It Dv IP_PORTRANGE_DEFAULT use the default range of values, normally -.Dv IPPORT_RESERVED +.Dv IPPORT_HIFIRSTAUTO through -.Dv IPPORT_USERRESERVED . +.Dv IPPORT_HILASTAUTO . This is adjustable through the sysctl setting: .Sy net.inet.ip.portrange.first and ==== //depot/projects/sparc64/share/mk/bsd.libnames.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.52 2002/03/28 18:44:24 joe Exp $ +# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.53 2002/04/09 13:19:09 ru Exp $ # The include file <bsd.libnames.mk> define library names. # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this @@ -34,6 +34,7 @@ LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a +LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a # XXX in secure dist, not base LIBHISTORY?= ${DESTDIR}${LIBDIR}/libhistory.a LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.a LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a ==== //depot/projects/sparc64/sys/alpha/alpha/machdep.c#26 (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/alpha/alpha/machdep.c,v 1.175 2002/04/07 21:01:34 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.176 2002/04/09 11:18:26 phk Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -278,18 +278,6 @@ vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) -#else - if (boothowto & RB_CONFIG) -#endif - { - userconfig(); - cninit(); /* the preferred console may have changed */ - } -#endif - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); ==== //depot/projects/sparc64/sys/boot/common/load_elf.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.22 2002/04/06 04:09:42 peter Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.23 2002/04/09 00:05:46 jake Exp $ */ #include <sys/param.h> ==== //depot/projects/sparc64/sys/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.26 2001/04/29 02:36:33 dcs Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.27 2002/04/09 17:45:11 dcs Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH} -BASE_SRCS= dict.c ficl.c math64.c search.c stack.c tools.c \ - prefix.c loader.c vm.c words.c +BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ + prefix.c search.c stack.c tools.c vm.c words.c + SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES= softcore.c testmain testmain.o .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/sparc64/sys/boot/ficl/alpha/sysdep.h#2 (text+ko) ==== @@ -9,7 +9,7 @@ ** FICL_ROBUST is enabled. This may require some consideration ** in firmware systems since assert often ** assumes stderr/stdout. -** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $ +** $Id: sysdep.h,v 1.11 2001/12/05 07:21:34 jsadler Exp $ *******************************************************************/ /* ** Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu) @@ -17,6 +17,11 @@ ** ** Get the latest Ficl release at http://ficl.sourceforge.net ** +** I am interested in hearing from anyone who uses ficl. If you have +** a problem, a success story, a defect, an enhancement request, or +** if you would like to contribute to the ficl release, please +** contact me by email at the address above. +** ** L I C E N S E and D I S C L A I M E R ** ** Redistribution and use in source and binary forms, with or without @@ -39,16 +44,9 @@ ** 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. -** -** I am interested in hearing from anyone who uses ficl. If you have -** a problem, a success story, a defect, an enhancement request, or -** if you would like to contribute to the ficl release, please send -** contact me by email at the address above. -** -** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $ */ -/* $FreeBSD: src/sys/boot/ficl/alpha/sysdep.h,v 1.7 2001/04/29 02:36:35 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/alpha/sysdep.h,v 1.8 2002/04/09 17:45:22 dcs Exp $ */ #if !defined (__SYSDEP_H__) #define __SYSDEP_H__ @@ -75,7 +73,6 @@ #define FALSE 0 #endif - /* ** System dependent data type declarations... */ @@ -162,6 +159,7 @@ #endif #if (FICL_MINIMAL) #define FICL_WANT_SOFTWORDS 0 +#define FICL_WANT_FILE 0 #define FICL_WANT_FLOAT 0 #define FICL_WANT_USER 0 #define FICL_WANT_LOCALS 0 @@ -181,6 +179,17 @@ #define FICL_PLATFORM_EXTEND 1 #endif + +/* +** FICL_WANT_FILE +** Includes the FILE and FILE-EXT wordset and associated code. Turn this off if you do not +** have a file system! +** Contributed by Larry Hastings +*/ +#if !defined (FICL_WANT_FILE) +#define FICL_WANT_FILE 0 +#endif + /* ** FICL_WANT_FLOAT ** Includes a floating point stack for the VM, and words to do float operations. @@ -199,6 +208,14 @@ #endif /* +** FICL_EXTENDED_PREFIX enables a bunch of extra prefixes in prefix.c and prefix.fr (if +** included as part of softcore.c) +*/ +#if !defined FICL_EXTENDED_PREFIX +#define FICL_EXTENDED_PREFIX 0 +#endif + +/* ** User variables: per-instance variables bound to the VM. ** Kinda like thread-local storage. Could be implemented in a ** VM private dictionary, but I've chosen the lower overhead @@ -341,14 +358,6 @@ #endif /* -** FICL_EXTENDED_PREFIX enables a bunch of extra prefixes in prefix.c and prefix.fr (if -** included as part of softcore.c) -*/ -#if !defined FICL_EXTENDED_PREFIX -#define FICL_EXTENDED_PREFIX 0 -#endif - -/* ** FICL_ALIGN is the power of two to which the dictionary ** pointer address must be aligned. This value is usually ** either 1 or 2, depending on the memory architecture @@ -409,4 +418,15 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y); UNSQR ficlLongDiv(DPUNS q, FICL_UNS y); + +/* +** FICL_HAVE_FTRUNCATE indicates whether the current OS supports +** the ftruncate() function (available on most UNIXes). This +** function is necessary to provide the complete File-Access wordset. +*/ +#if !defined (FICL_HAVE_FTRUNCATE) +#define FICL_HAVE_FTRUNCATE 0 +#endif + + #endif /*__SYSDEP_H__*/ ==== //depot/projects/sparc64/sys/boot/ficl/dict.c#2 (text+ko) ==== @@ -3,7 +3,7 @@ ** Forth Inspired Command Language - dictionary methods ** Author: John Sadler (john_sadler@alum.mit.edu) ** Created: 19 July 1997 -** $Id: dict.c,v 1.6 2000-06-17 07:43:44-07 jsadler Exp jsadler $ +** $Id: dict.c,v 1.14 2001/12/05 07:21:34 jsadler Exp $ *******************************************************************/ /* ** This file implements the dictionary -- FICL's model of @@ -22,6 +22,11 @@ ** ** Get the latest Ficl release at http://ficl.sourceforge.net ** +** I am interested in hearing from anyone who uses ficl. If you have +** a problem, a success story, a defect, an enhancement request, or +** if you would like to contribute to the ficl release, please +** contact me by email at the address above. +** ** L I C E N S E and D I S C L A I M E R ** ** Redistribution and use in source and binary forms, with or without @@ -44,20 +49,12 @@ ** 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. -** -** I am interested in hearing from anyone who uses ficl. If you have -** a problem, a success story, a defect, an enhancement request, or -** if you would like to contribute to the ficl release, please send -** contact me by email at the address above. -** -** $Id: dict.c,v 1.8 2001-04-26 21:41:45-07 jsadler Exp jsadler $ */ -/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.12 2001/05/29 23:44:12 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.13 2002/04/09 17:45:11 dcs Exp $ */ #ifdef TESTMAIN #include <stdio.h> -#include <stdlib.h> #include <ctype.h> #else #include <stand.h> @@ -304,16 +301,19 @@ /************************************************************************** d i c t C h e c k ** Checks the dictionary for corruption and throws appropriate -** errors +** errors. +** Input: +n number of ADDRESS UNITS (not Cells) proposed to allot +** -n number of ADDRESS UNITS proposed to de-allot +** 0 just do a consistency check **************************************************************************/ -void dictCheck(FICL_DICT *pDict, FICL_VM *pVM, int nCells) +void dictCheck(FICL_DICT *pDict, FICL_VM *pVM, int n) { - if ((nCells >= 0) && (dictCellsAvail(pDict) < nCells)) + if ((n >= 0) && (dictCellsAvail(pDict) * (int)sizeof(CELL) < n)) { vmThrowErr(pVM, "Error: dictionary full"); } - if ((nCells <= 0) && (dictCellsUsed(pDict) < -nCells)) + if ((n <= 0) && (dictCellsUsed(pDict) * (int)sizeof(CELL) < -n)) { vmThrowErr(pVM, "Error: dictionary underflow"); } @@ -396,6 +396,7 @@ memset(pDict, 0, sizeof (FICL_DICT)); pDict->dict = ficlMalloc(nAlloc); assert(pDict->dict); + pDict->size = nCells; dictEmpty(pDict, nHash); return pDict; @@ -460,6 +461,84 @@ /************************************************************************** + d i c t H a s h S u m m a r y +** Calculate a figure of merit for the dictionary hash table based +** on the average search depth for all the words in the dictionary, +** assuming uniform distribution of target keys. The figure of merit +** is the ratio of the total search depth for all keys in the table +** versus a theoretical optimum that would be achieved if the keys +** were distributed into the table as evenly as possible. +** The figure would be worse if the hash table used an open +** addressing scheme (i.e. collisions resolved by searching the +** table for an empty slot) for a given size table. +**************************************************************************/ +#if FICL_WANT_FLOAT +void dictHashSummary(FICL_VM *pVM) +{ + FICL_DICT *dp = vmGetDict(pVM); + FICL_HASH *pFHash; + FICL_WORD **pHash; + unsigned size; + FICL_WORD *pFW; + unsigned i; + int nMax = 0; + int nWords = 0; + int nFilled; + double avg = 0.0; + double best; + int nAvg, nRem, nDepth; + + dictCheck(dp, pVM, 0); + + pFHash = dp->pSearch[dp->nLists - 1]; + pHash = pFHash->table; + size = pFHash->size; + nFilled = size; + + for (i = 0; i < size; i++) + { + int n = 0; + pFW = pHash[i]; + + while (pFW) + { + ++n; + ++nWords; + pFW = pFW->link; + } + + avg += (double)(n * (n+1)) / 2.0; + + if (n > nMax) + nMax = n; + if (n == 0) + --nFilled; + } + + /* Calc actual avg search depth for this hash */ + avg = avg / nWords; + + /* Calc best possible performance with this size hash */ + nAvg = nWords / size; + nRem = nWords % size; + nDepth = size * (nAvg * (nAvg+1))/2 + (nAvg+1)*nRem; + best = (double)nDepth/nWords; + + sprintf(pVM->pad, + "%d bins, %2.0f%% filled, Depth: Max=%d, Avg=%2.1f, Best=%2.1f, Score: %2.0f%%", + size, + (double)nFilled * 100.0 / size, nMax, + avg, + best, + 100.0 * best / avg); + + ficlTextOut(pVM, pVM->pad, 1); + + return; +} +#endif + +/************************************************************************** d i c t I n c l u d e s ** Returns TRUE iff the given pointer is within the address range of ** the dictionary. @@ -471,7 +550,6 @@ ); } - /************************************************************************** d i c t L o o k u p ** Find the FICL_WORD that matches the given name and length. @@ -501,15 +579,16 @@ /************************************************************************** - d i c t L o o k u p L o c + f i c l L o o k u p L o c ** Same as dictLookup, but looks in system locals dictionary first... ** Assumes locals dictionary has only one wordlist... **************************************************************************/ #if FICL_WANT_LOCALS -FICL_WORD *dictLookupLoc(FICL_DICT *pDict, STRINGINFO si) +FICL_WORD *ficlLookupLoc(FICL_SYSTEM *pSys, STRINGINFO si) { FICL_WORD *pFW = NULL; - FICL_HASH *pHash = ficlGetLoc()->pForthWords; + FICL_DICT *pDict = pSys->dp; + FICL_HASH *pHash = ficlGetLoc(pSys)->pForthWords; int i; UNS16 hashCode = hashHashCode(si); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204091926.g39JQGo63159>