PERFORCE change 101433 for review
Marcel Moolenaar
marcel at FreeBSD.org
Thu Jul 13 06:02:13 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=101433
Change 101433 by marcel at marcel_nfs on 2006/07/13 06:01:39
IFC @101431
Affected files ...
.. //depot/projects/tty/MAINTAINERS#22 integrate
.. //depot/projects/tty/ObsoleteFiles.inc#8 integrate
.. //depot/projects/tty/UPDATING#31 integrate
.. //depot/projects/tty/bin/dd/Makefile#5 integrate
.. //depot/projects/tty/contrib/texinfo/FREEBSD-upgrade#5 integrate
.. //depot/projects/tty/etc/rc.d/dhclient#8 integrate
.. //depot/projects/tty/etc/rc.d/mountcritlocal#5 integrate
.. //depot/projects/tty/etc/rc.d/mountlate#1 branch
.. //depot/projects/tty/games/fortune/datfiles/Makefile#4 integrate
.. //depot/projects/tty/games/fortune/datfiles/fortunes#26 integrate
.. //depot/projects/tty/lib/libc/posix1e/Makefile.inc#6 integrate
.. //depot/projects/tty/lib/libc/posix1e/mac_is_present.3#2 integrate
.. //depot/projects/tty/lib/libc/posix1e/mac_is_present_np.3#3 delete
.. //depot/projects/tty/lib/libc/posix1e/mac_prepare.3#7 integrate
.. //depot/projects/tty/lib/libc/posix1e/mac_set.3#4 integrate
.. //depot/projects/tty/lib/libc/posix1e/mac_text.3#5 integrate
.. //depot/projects/tty/lib/libthr/sys/thr_error.c#3 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_attr.c#6 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_create.c#11 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_getschedparam.c#5 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_init.c#11 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_private.h#13 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_setprio.c#3 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_setschedparam.c#7 integrate
.. //depot/projects/tty/lib/libutil/kld.3#2 integrate
.. //depot/projects/tty/lib/msun/src/e_log.c#4 integrate
.. //depot/projects/tty/lib/msun/src/e_logf.c#3 integrate
.. //depot/projects/tty/sbin/gpt/gpt.c#7 integrate
.. //depot/projects/tty/sbin/ifconfig/ifclone.c#2 integrate
.. //depot/projects/tty/sbin/ifconfig/ifconfig.c#13 integrate
.. //depot/projects/tty/sbin/ifconfig/ifconfig.h#7 integrate
.. //depot/projects/tty/sbin/ifconfig/ifvlan.c#5 integrate
.. //depot/projects/tty/sbin/mount/mount.8#14 integrate
.. //depot/projects/tty/sbin/mount/mount.c#13 integrate
.. //depot/projects/tty/share/man/man4/ipw.4#8 integrate
.. //depot/projects/tty/share/man/man4/iwi.4#10 integrate
.. //depot/projects/tty/share/man/man7/security.7#9 integrate
.. //depot/projects/tty/share/man/man9/Makefile#20 integrate
.. //depot/projects/tty/share/man/man9/mac.9#7 integrate
.. //depot/projects/tty/share/man/man9/mutex.9#10 integrate
.. //depot/projects/tty/share/man/man9/sx.9#7 integrate
.. //depot/projects/tty/sys/amd64/amd64/db_trace.c#12 integrate
.. //depot/projects/tty/sys/amd64/amd64/identcpu.c#13 integrate
.. //depot/projects/tty/sys/amd64/amd64/intr_machdep.c#11 integrate
.. //depot/projects/tty/sys/amd64/amd64/local_apic.c#11 integrate
.. //depot/projects/tty/sys/amd64/conf/GENERIC#22 integrate
.. //depot/projects/tty/sys/amd64/include/specialreg.h#9 integrate
.. //depot/projects/tty/sys/amd64/linux32/linux32_proto.h#10 integrate
.. //depot/projects/tty/sys/amd64/linux32/linux32_syscall.h#10 integrate
.. //depot/projects/tty/sys/amd64/linux32/linux32_sysent.c#10 integrate
.. //depot/projects/tty/sys/amd64/linux32/syscalls.master#10 integrate
.. //depot/projects/tty/sys/arm/arm/db_trace.c#7 integrate
.. //depot/projects/tty/sys/arm/arm/pmap.c#17 integrate
.. //depot/projects/tty/sys/arm/at91/kb920x_machdep.c#3 integrate
.. //depot/projects/tty/sys/compat/freebsd32/freebsd32_misc.c#16 integrate
.. //depot/projects/tty/sys/compat/linux/linux_file.c#13 integrate
.. //depot/projects/tty/sys/compat/linux/linux_ipc.c#13 integrate
.. //depot/projects/tty/sys/compat/linux/linux_socket.c#18 integrate
.. //depot/projects/tty/sys/compat/svr4/svr4_ipc.c#8 integrate
.. //depot/projects/tty/sys/compat/svr4/svr4_misc.c#17 integrate
.. //depot/projects/tty/sys/compat/svr4/svr4_proto.h#7 integrate
.. //depot/projects/tty/sys/compat/svr4/svr4_stream.c#12 integrate
.. //depot/projects/tty/sys/compat/svr4/svr4_syscall.h#7 integrate
.. //depot/projects/tty/sys/compat/svr4/svr4_syscallnames.c#7 integrate
.. //depot/projects/tty/sys/compat/svr4/svr4_sysent.c#7 integrate
.. //depot/projects/tty/sys/compat/svr4/svr4_util.h#6 integrate
.. //depot/projects/tty/sys/compat/svr4/syscalls.master#7 integrate
.. //depot/projects/tty/sys/conf/NOTES#37 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src.diff#2 delete
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/Makefile#4 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx.h#5 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_bstream.c#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_bstream.h#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_context.c#5 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_context.h#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_env.c#4 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_env.h#5 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#5 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_self.c#5 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_self.h#4 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_self_context.s#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_step.c#5 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_step.h#4 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_str.c#4 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_str.h#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_swap.c#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_swap.h#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_trace.c#5 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_trace.h#5 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#5 delete
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#4 delete
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#6 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#3 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_utable.c#4 integrate
.. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_utable.h#4 integrate
.. //depot/projects/tty/sys/contrib/pf/net/if_pflog.c#10 integrate
.. //depot/projects/tty/sys/contrib/pf/net/if_pfsync.c#12 integrate
.. //depot/projects/tty/sys/ddb/db_command.c#11 integrate
.. //depot/projects/tty/sys/ddb/db_output.c#7 integrate
.. //depot/projects/tty/sys/ddb/db_output.h#3 integrate
.. //depot/projects/tty/sys/ddb/db_ps.c#11 integrate
.. //depot/projects/tty/sys/ddb/db_thread.c#4 integrate
.. //depot/projects/tty/sys/ddb/ddb.h#10 integrate
.. //depot/projects/tty/sys/dev/asr/MAINTAINER#2 delete
.. //depot/projects/tty/sys/dev/bce/if_bce.c#3 integrate
.. //depot/projects/tty/sys/dev/fdc/fdc.c#8 integrate
.. //depot/projects/tty/sys/dev/isp/isp_freebsd.c#13 integrate
.. //depot/projects/tty/sys/dev/isp/isp_freebsd.h#13 integrate
.. //depot/projects/tty/sys/dev/isp/isp_pci.c#14 integrate
.. //depot/projects/tty/sys/dev/isp/isp_sbus.c#8 integrate
.. //depot/projects/tty/sys/dev/isp/isp_target.c#9 integrate
.. //depot/projects/tty/sys/dev/ispfw/asm_1040.h#3 integrate
.. //depot/projects/tty/sys/dev/ispfw/asm_1080.h#3 integrate
.. //depot/projects/tty/sys/dev/ispfw/asm_12160.h#4 integrate
.. //depot/projects/tty/sys/dev/ispfw/ispfw.c#8 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt.c#11 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt.h#13 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_cam.c#8 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_debug.c#9 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_pci.c#15 integrate
.. //depot/projects/tty/sys/dev/pci/pci.c#19 integrate
.. //depot/projects/tty/sys/dev/random/probe.c#4 integrate
.. //depot/projects/tty/sys/dev/sound/midi/sequencer.c#7 integrate
.. //depot/projects/tty/sys/doc/Doxyfile#2 delete
.. //depot/projects/tty/sys/doc/Makefile#2 delete
.. //depot/projects/tty/sys/doc/subsys/Dependencies#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-cam#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-crypto#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-dev_pci#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-dev_sound#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-dev_usb#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-geom#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-i4b#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-kern#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-libkern#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-linux#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-net80211#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-netgraph#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-netinet#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-netinet6#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-netipsec#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-opencrypto#2 delete
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-vm#2 delete
.. //depot/projects/tty/sys/doc/subsys/Makefile#2 delete
.. //depot/projects/tty/sys/doc/subsys/README#2 delete
.. //depot/projects/tty/sys/doc/subsys/common-Doxyfile#2 delete
.. //depot/projects/tty/sys/doc/subsys/notreviewed.dox#2 delete
.. //depot/projects/tty/sys/fs/devfs/devfs_vnops.c#17 integrate
.. //depot/projects/tty/sys/fs/portalfs/portal_vnops.c#8 integrate
.. //depot/projects/tty/sys/geom/geom.h#15 integrate
.. //depot/projects/tty/sys/geom/mirror/g_mirror.c#13 integrate
.. //depot/projects/tty/sys/geom/raid3/g_raid3.c#12 integrate
.. //depot/projects/tty/sys/geom/raid3/g_raid3_ctl.c#6 integrate
.. //depot/projects/tty/sys/i386/conf/GENERIC#27 integrate
.. //depot/projects/tty/sys/i386/conf/PAE#14 integrate
.. //depot/projects/tty/sys/i386/i386/db_trace.c#12 integrate
.. //depot/projects/tty/sys/i386/i386/identcpu.c#19 integrate
.. //depot/projects/tty/sys/i386/i386/initcpu.c#9 integrate
.. //depot/projects/tty/sys/i386/i386/intr_machdep.c#11 integrate
.. //depot/projects/tty/sys/i386/i386/local_apic.c#11 integrate
.. //depot/projects/tty/sys/i386/i386/machdep.c#22 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_ipc.c#5 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_ipc.h#4 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_misc.c#12 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_other.c#5 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_proto.h#8 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_sysent.c#9 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_util.h#5 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_xenix.c#7 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_xenix.h#6 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate
.. //depot/projects/tty/sys/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate
.. //depot/projects/tty/sys/i386/ibcs2/imgact_coff.c#9 integrate
.. //depot/projects/tty/sys/i386/ibcs2/syscalls.master#8 integrate
.. //depot/projects/tty/sys/i386/ibcs2/syscalls.xenix#6 integrate
.. //depot/projects/tty/sys/i386/include/i4b_ioctl.h#3 integrate
.. //depot/projects/tty/sys/i386/include/md_var.h#14 integrate
.. //depot/projects/tty/sys/i386/include/specialreg.h#8 integrate
.. //depot/projects/tty/sys/i386/linux/linux_proto.h#15 integrate
.. //depot/projects/tty/sys/i386/linux/linux_syscall.h#15 integrate
.. //depot/projects/tty/sys/i386/linux/linux_sysent.c#16 integrate
.. //depot/projects/tty/sys/i386/linux/syscalls.master#15 integrate
.. //depot/projects/tty/sys/i4b/layer4/i4b_l4mgmt.c#4 integrate
.. //depot/projects/tty/sys/ia64/conf/GENERIC#17 integrate
.. //depot/projects/tty/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/tty/sys/isa/isahint.c#5 integrate
.. //depot/projects/tty/sys/kern/bus_if.m#6 integrate
.. //depot/projects/tty/sys/kern/init_sysent.c#19 integrate
.. //depot/projects/tty/sys/kern/kern_descrip.c#20 integrate
.. //depot/projects/tty/sys/kern/kern_environment.c#10 integrate
.. //depot/projects/tty/sys/kern/kern_intr.c#18 integrate
.. //depot/projects/tty/sys/kern/kern_ktr.c#12 integrate
.. //depot/projects/tty/sys/kern/kern_linker.c#15 integrate
.. //depot/projects/tty/sys/kern/kern_thr.c#12 integrate
.. //depot/projects/tty/sys/kern/subr_bus.c#18 integrate
.. //depot/projects/tty/sys/kern/subr_hints.c#5 integrate
.. //depot/projects/tty/sys/kern/subr_prf.c#14 integrate
.. //depot/projects/tty/sys/kern/subr_turnstile.c#9 integrate
.. //depot/projects/tty/sys/kern/sys_generic.c#13 integrate
.. //depot/projects/tty/sys/kern/syscalls.c#19 integrate
.. //depot/projects/tty/sys/kern/syscalls.master#20 integrate
.. //depot/projects/tty/sys/kern/sysv_sem.c#15 integrate
.. //depot/projects/tty/sys/kern/uipc_domain.c#7 integrate
.. //depot/projects/tty/sys/kern/uipc_socket.c#22 integrate
.. //depot/projects/tty/sys/kern/uipc_socket2.c#20 integrate
.. //depot/projects/tty/sys/kern/uipc_syscalls.c#21 integrate
.. //depot/projects/tty/sys/kern/uipc_usrreq.c#18 integrate
.. //depot/projects/tty/sys/kern/vfs_syscalls.c#25 integrate
.. //depot/projects/tty/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/tty/sys/modules/ispfw/isp_1000/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_1040/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_1040_it/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_1080/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_1080_it/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_12160/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_12160_it/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_2100/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_2200/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_2300/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/isp_2322/Makefile#1 branch
.. //depot/projects/tty/sys/modules/ispfw/ispfw/Makefile#1 branch
.. //depot/projects/tty/sys/net/if.c#26 integrate
.. //depot/projects/tty/sys/net/if_bridge.c#12 integrate
.. //depot/projects/tty/sys/net/if_clone.c#7 integrate
.. //depot/projects/tty/sys/net/if_clone.h#4 integrate
.. //depot/projects/tty/sys/net/if_disc.c#14 integrate
.. //depot/projects/tty/sys/net/if_enc.c#2 integrate
.. //depot/projects/tty/sys/net/if_faith.c#16 integrate
.. //depot/projects/tty/sys/net/if_gif.c#15 integrate
.. //depot/projects/tty/sys/net/if_gre.c#16 integrate
.. //depot/projects/tty/sys/net/if_loop.c#18 integrate
.. //depot/projects/tty/sys/net/if_ppp.c#16 integrate
.. //depot/projects/tty/sys/net/if_stf.c#16 integrate
.. //depot/projects/tty/sys/net/if_vlan.c#17 integrate
.. //depot/projects/tty/sys/netinet/ip_carp.c#9 integrate
.. //depot/projects/tty/sys/nfs4client/nfs4_vnops.c#8 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_socket.c#22 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_vnops.c#19 integrate
.. //depot/projects/tty/sys/pc98/conf/GENERIC#20 integrate
.. //depot/projects/tty/sys/pc98/pc98/machdep.c#10 integrate
.. //depot/projects/tty/sys/posix4/ksched.c#8 integrate
.. //depot/projects/tty/sys/posix4/p1003_1b.c#7 integrate
.. //depot/projects/tty/sys/posix4/posix4.h#3 integrate
.. //depot/projects/tty/sys/powerpc/powerpc/db_trace.c#8 integrate
.. //depot/projects/tty/sys/powerpc/powerpc/mmu_oea.c#4 integrate
.. //depot/projects/tty/sys/security/mac_biba/mac_biba.c#18 integrate
.. //depot/projects/tty/sys/sparc64/conf/GENERIC#22 integrate
.. //depot/projects/tty/sys/sparc64/sparc64/db_trace.c#10 integrate
.. //depot/projects/tty/sys/sys/bus.h#12 integrate
.. //depot/projects/tty/sys/sys/protosw.h#10 integrate
.. //depot/projects/tty/sys/sys/sockio.h#6 integrate
.. //depot/projects/tty/sys/sys/syscall.h#19 integrate
.. //depot/projects/tty/sys/sys/syscall.mk#19 integrate
.. //depot/projects/tty/sys/sys/syscallsubr.h#17 integrate
.. //depot/projects/tty/sys/sys/sysproto.h#20 integrate
.. //depot/projects/tty/sys/sys/systm.h#14 integrate
.. //depot/projects/tty/sys/sys/thr.h#7 integrate
.. //depot/projects/tty/sys/ufs/ffs/ffs_vfsops.c#23 integrate
.. //depot/projects/tty/sys/ufs/ufs/ufs_lookup.c#10 integrate
.. //depot/projects/tty/sys/vm/vm_meter.c#11 integrate
.. //depot/projects/tty/tools/kerneldoc/Doxyfile#2 integrate
.. //depot/projects/tty/tools/kerneldoc/Makefile#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Dependencies#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-cam#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-crypto#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-dev_pci#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-dev_sound#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-dev_usb#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-geom#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-i4b#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-kern#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-libkern#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-linux#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-net80211#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-netgraph#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-netinet#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-netinet6#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-netipsec#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-opencrypto#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-vm#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/Makefile#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/README#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/common-Doxyfile#2 integrate
.. //depot/projects/tty/tools/kerneldoc/subsys/notreviewed.dox#2 integrate
.. //depot/projects/tty/tools/regression/fifo/fifo_create/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/fifo/fifo_io/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/fifo/fifo_misc/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/fifo/fifo_open/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/file/ftruncate/Makefile#1 branch
.. //depot/projects/tty/tools/regression/file/ftruncate/ftruncate.c#1 branch
.. //depot/projects/tty/tools/regression/netinet/msocket_ifnet_remove/Makefile#3 integrate
.. //depot/projects/tty/tools/regression/netinet/tcpdrop/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/netinet/tcpsocktimewait/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/netipx/ipxdgramloopback/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/netipx/spxabort/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/netipx/spxloopback/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/sockets/listen_backlog/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/sockets/rtsocket/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/sockets/sendfile/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/sockets/socketpair/Makefile#4 integrate
.. //depot/projects/tty/tools/regression/sockets/unix_bindconnect/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/sockets/unix_passfd/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/sockets/unix_socket/Makefile#2 integrate
.. //depot/projects/tty/tools/regression/ufs/uprintf/Makefile#2 integrate
.. //depot/projects/tty/usr.bin/kdump/kdump.c#8 integrate
.. //depot/projects/tty/usr.bin/kdump/mksubr#2 integrate
.. //depot/projects/tty/usr.sbin/i4b/isdnd/controller.c#3 integrate
.. //depot/projects/tty/usr.sbin/i4b/isdnd/main.c#3 integrate
.. //depot/projects/tty/usr.sbin/i4b/isdndebug/main.c#2 integrate
.. //depot/projects/tty/usr.sbin/i4b/isdnmonitor/main.c#3 integrate
.. //depot/projects/tty/usr.sbin/i4b/isdnphone/main.c#2 integrate
.. //depot/projects/tty/usr.sbin/i4b/isdntelctl/main.c#2 integrate
.. //depot/projects/tty/usr.sbin/i4b/isdntest/main.c#3 integrate
.. //depot/projects/tty/usr.sbin/mountd/mountd.c#14 integrate
.. //depot/projects/tty/usr.sbin/pkg_install/lib/url.c#5 integrate
Differences ...
==== //depot/projects/tty/MAINTAINERS#22 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.137 2006/07/04 02:01:48 brooks Exp $
+$FreeBSD: src/MAINTAINERS,v 1.139 2006/07/11 06:09:54 mjacob Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -51,7 +51,6 @@
pass(4) ken Pre-commit review requested.
ch(4) ken Pre-commit review requested.
isp(4) mjacob Pre-commit review requested.
-mpt(4) mjacob Pre-commit review requested.
em(4) tackerman Pre-commit review requested.
tdfx(4) cokane Just keep me informed of changes, try not to break it.
sendmail gshapiro Pre-commit review requested.
@@ -135,11 +134,7 @@
List below generated with:
$ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ <tab>]*='
-bin/dd/Makefile:MAINTAINER= green at FreeBSD.org
-games/fortune/datfiles/Makefile:MAINTAINER= jkh
-gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch
sys/modules/3dfx/Makefile:MAINTAINER= cokane at FreeBSD.org
sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi <kzmi at ca2.so-net.ne.jp>
tools/tools/sysdoc/Makefile:MAINTAINER= trhodes at FreeBSD.org
-usr.bin/locate/Makefile:MAINTAINER= wosch
usr.sbin/zic/Makefile:MAINTAINER= wollman at FreeBSD.org
==== //depot/projects/tty/ObsoleteFiles.inc#8 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.39 2006/07/06 11:43:53 delphij Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.41 2006/07/08 03:22:44 avatar Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -594,6 +594,8 @@
OLD_FILES+=usr/share/man/man1aout/strip.1aout.gz
OLD_FILES+=bin/mountd
OLD_FILES+=bin/nfsd
+# 20020707 sbin/nfsd -> usr.sbin/nfsd
+OLD_FILES+=sbin/nfsd
# 200206XX
OLD_FILES+=usr/lib/libpam_ssh.a
OLD_FILES+=usr/lib/libpam_ssh_p.a
@@ -622,6 +624,9 @@
OLD_FILES+=usr/bin/find2perl
OLD_FILES+=usr/sbin/pkg_update
OLD_FILES+=usr/sbin/scriptdump
+# 20020409 GC kget(1), userconfig is long dead.
+OLD_FILES+=sbin/kget
+OLD_FILES+=usr/share/man/man8/kget.8.gz
# 200203XX
OLD_FILES+=usr/lib/libss.a
OLD_FILES+=usr/lib/libss_p.a
@@ -649,6 +654,9 @@
OLD_FILES+=usr/sbin/stlstty
OLD_FILES+=usr/sbin/ispppcontrol
OLD_FILES+=usr/sbin/rndcontrol
+# 20010523 mount_portal -> mount_portalfs
+OLD_FILES+=sbin/mount_portal
+OLD_FILES+=usr/share/man/man8/mount_portal.8.gz
# 200104XX
OLD_FILES+=usr/lib/libdescrypt.a
OLD_FILES+=usr/lib/libscrypt.a
==== //depot/projects/tty/UPDATING#31 (text+ko) ====
@@ -21,6 +21,12 @@
developers choose to disable these features on build machines
to maximize performance.
+20060709:
+ The interface version of the i4b kernel part has changed. So
+ after updating the kernel sources and compiling a new kernel,
+ the i4b user space tools in "/usr/src/usr.sbin/i4b" must also
+ be rebuilt, and vice versa.
+
20060627:
The XBOX kernel now defaults to the nfe(4) driver instead of
the nve(4) driver. Please update your configuration
@@ -585,4 +591,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.450 2006/06/27 20:22:32 rink Exp $
+$FreeBSD: src/UPDATING,v 1.451 2006/07/09 21:16:06 twinterg Exp $
==== //depot/projects/tty/bin/dd/Makefile#5 (text+ko) ====
@@ -1,7 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/dd/Makefile,v 1.18 2004/04/09 07:13:27 njl Exp $
-
-MAINTAINER= green at FreeBSD.org
+# $FreeBSD: src/bin/dd/Makefile,v 1.19 2006/07/09 21:47:37 markm Exp $
PROG= dd
SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c
==== //depot/projects/tty/contrib/texinfo/FREEBSD-upgrade#5 (text+ko) ====
@@ -1,5 +1,5 @@
# ex:ts=8
-$FreeBSD: src/contrib/texinfo/FREEBSD-upgrade,v 1.6 2005/05/23 10:55:29 ru Exp $
+$FreeBSD: src/contrib/texinfo/FREEBSD-upgrade,v 1.7 2006/07/08 07:32:41 cperciva Exp $
GNU Texinfo 4.8
originals can be found at: ftp://ftp.gnu.org/gnu/texinfo/
@@ -36,3 +36,7 @@
ru at FreeBSD.org
23-May-2005
+
+NOTE: The upstream fix to util/texindex.c which fixes CVE-2005-3011
+(FreeBSD-SA-06:01.texindex) causes temporary files to not be removed
+when handling very large inputs. FreeBSD's fix works.
==== //depot/projects/tty/etc/rc.d/dhclient#8 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dhclient,v 1.21 2005/07/26 00:37:19 brooks Exp $
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.22 2006/07/09 06:54:24 stefanf Exp $
#
# PROVIDE: dhclient
@@ -18,7 +18,7 @@
dhclient_start()
{
- # prevent unnecessicary restarts
+ # prevent unnecessary restarts
# XXX: should use a pidfile
if [ -x /usr/bin/pgrep ]; then
pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"`
==== //depot/projects/tty/etc/rc.d/mountcritlocal#5 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $
-# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.12 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.13 2006/07/12 16:05:51 des Exp $
#
# PROVIDE: mountcritlocal
@@ -27,6 +27,7 @@
esac
# Mount everything except nfs filesystems.
+ echo -n 'Mounting local file systems:'
mount_excludes='no'
for i in ${netfs_types}; do
fstype=${i%:*}
@@ -34,6 +35,7 @@
done
mount_excludes=${mount_excludes%,}
mount -a -t ${mount_excludes}
+ echo '.'
case $? in
0)
==== //depot/projects/tty/games/fortune/datfiles/Makefile#4 (text+ko) ====
@@ -1,15 +1,10 @@
# @(#)Makefile 8.2 (Berkeley) 4/19/94
-# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.33 2005/02/03 00:20:36 ru Exp $
+# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.34 2006/07/09 20:26:36 markm Exp $
FILES= fortunes freebsd-tips murphy startrek zippy
BLDS= fortunes.dat murphy.dat startrek.dat zippy.dat \
fortunes-o fortunes-o.dat freebsd-tips.dat
-# Pass all new entries by ${MAINTAINER} to preserve some semblance of
-# humor in the fortune files. What's funny to you on 6 beers may not
-# be funny to anyone else.
-MAINTAINER= jkh
-
# TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, COMMENT OUT THE
# THREE LINES AND UNCOMMENT THE FOURTH LINE.
==== //depot/projects/tty/games/fortune/datfiles/fortunes#26 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.221 2006/06/20 08:34:36 phk Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.223 2006/07/10 16:53:32 phk Exp $
%
=======================================================================
@@ -29705,6 +29705,10 @@
remember.
-- Eugene McCarthy
%
+It is difficult to get a man to understand something when his salary
+depends upon his not understanding it.
+ -- Upton Sinclair
+%
It is difficult to legislate morality in the absence of moral legislators.
%
It is difficult to produce a television documentary that is both
==== //depot/projects/tty/lib/libc/posix1e/Makefile.inc#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.18 2006/03/13 01:14:58 deischen Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.19 2006/07/07 14:02:17 rwatson Exp $
.PATH: ${.CURDIR}/posix1e
@@ -53,7 +53,7 @@
mac.3 \
mac.conf.5 \
mac_free.3 \
- mac_is_present_np.3 \
+ mac_is_present.3 \
mac_get.3 \
mac_prepare.3 \
mac_set.3 \
==== //depot/projects/tty/lib/libc/posix1e/mac_is_present.3#2 (text+ko) ====
@@ -28,13 +28,13 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present.3,v 1.6 2003/08/22 18:01:03 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present.3,v 1.8 2006/07/07 14:02:17 rwatson Exp $
.\"
.Dd January 9, 2002
.Dt MAC_IS_PRESENT_NP 3
.Os
.Sh NAME
-.Nm mac_is_present_np
+.Nm mac_is_present
.Nd report whether the running system has MAC support
.Sh LIBRARY
.Lb libc
@@ -44,7 +44,7 @@
.Fn mac_is_present "const char *policyname"
.Sh DESCRIPTION
The
-.Fn mac_is_present_np
+.Fn mac_is_present
function determines whether the currently-running kernel supports MAC for
a given policy or not.
If
==== //depot/projects/tty/lib/libc/posix1e/mac_prepare.3#7 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_prepare.3,v 1.7 2005/07/31 03:30:44 keramida Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_prepare.3,v 1.8 2006/07/07 14:02:17 rwatson Exp $
.\"
.Dd August 22, 2003
.Os
@@ -103,7 +103,7 @@
.Xr mac 3 ,
.Xr mac_free 3 ,
.Xr mac_get 3 ,
-.Xr mac_is_present_np 3 ,
+.Xr mac_is_present 3 ,
.Xr mac_set 3 ,
.Xr mac 4 ,
.Xr mac.conf 5 ,
==== //depot/projects/tty/lib/libc/posix1e/mac_set.3#4 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.10 2003/11/16 20:21:21 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.11 2006/07/07 14:02:17 rwatson Exp $
.\"
.Dd January 14, 2003
.Dt MAC_SET 3
@@ -135,7 +135,7 @@
.Xr mac 3 ,
.Xr mac_free 3 ,
.Xr mac_get 3 ,
-.Xr mac_is_present_np 3 ,
+.Xr mac_is_present 3 ,
.Xr mac_prepare 3 ,
.Xr mac_text 3 ,
.Xr mac 4 ,
==== //depot/projects/tty/lib/libc/posix1e/mac_text.3#5 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.11 2004/06/30 20:09:09 ru Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.12 2006/07/07 14:02:17 rwatson Exp $
.\"
.Dd December 21, 2001
.Dt MAC_TEXT 3
@@ -95,7 +95,7 @@
.Xr free 3 ,
.Xr mac 3 ,
.Xr mac_get 3 ,
-.Xr mac_is_present_np 3 ,
+.Xr mac_is_present 3 ,
.Xr mac_prepare 3 ,
.Xr mac_set 3 ,
.Xr mac 4 ,
==== //depot/projects/tty/lib/libthr/sys/thr_error.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/sys/thr_error.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/sys/thr_error.c,v 1.3 2006/07/12 03:44:05 davidxu Exp $
*/
#include <pthread.h>
@@ -45,10 +45,12 @@
int *
__error(void)
{
- struct pthread *curthread = _get_curthread();
+ struct pthread *curthread;
- if (curthread != NULL && curthread != _thr_initial)
- return (&curthread->error);
- else
- return (&errno);
+ if (_thr_initial != NULL) {
+ curthread = _get_curthread();
+ if (curthread != NULL && curthread != _thr_initial)
+ return (&curthread->error);
+ }
+ return (&errno);
}
==== //depot/projects/tty/lib/libthr/thread/thr_attr.c#6 (text+ko) ====
@@ -93,7 +93,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.6 2006/04/27 08:18:23 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.7 2006/07/12 06:13:18 davidxu Exp $
*/
#include "namespace.h"
@@ -434,9 +434,17 @@
policy = (*attr)->sched_policy;
- if (param->sched_priority < _thr_priorities[policy-1].pri_min ||
- param->sched_priority > _thr_priorities[policy-1].pri_max)
+ if (policy == SCHED_FIFO || policy == SCHED_RR) {
+ if (param->sched_priority < _thr_priorities[policy-1].pri_min ||
+ param->sched_priority > _thr_priorities[policy-1].pri_max)
return (ENOTSUP);
+ } else {
+ /*
+ * Ignore it for SCHED_OTHER now, patches for glib ports
+ * are wrongly using M:N thread library's internal macro
+ * THR_MIN_PRIORITY and THR_MAX_PRIORITY.
+ */
+ }
(*attr)->prio = param->sched_priority;
==== //depot/projects/tty/lib/libthr/thread/thr_create.c#11 (text+ko) ====
@@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.29 2006/04/04 02:57:49 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.30 2006/07/12 06:13:18 davidxu Exp $
*/
#include "namespace.h"
@@ -50,6 +50,7 @@
{
struct pthread *curthread, *new_thread;
struct thr_param param;
+ struct thr_sched_param sched_param;
int ret = 0, locked, create_suspended;
sigset_t set, oset;
@@ -105,30 +106,6 @@
new_thread->arg = arg;
new_thread->cancelflags = PTHREAD_CANCEL_ENABLE |
PTHREAD_CANCEL_DEFERRED;
- /*
- * Check if this thread is to inherit the scheduling
- * attributes from its parent:
- */
- if (new_thread->attr.sched_inherit == PTHREAD_INHERIT_SCHED) {
- /*
- * Copy the scheduling attributes. Lock the scheduling
- * lock to get consistent scheduling parameters.
- */
- THR_LOCK(curthread);
- new_thread->base_priority = curthread->base_priority;
- new_thread->attr.prio = curthread->base_priority;
- new_thread->attr.sched_policy = curthread->attr.sched_policy;
- THR_UNLOCK(curthread);
- } else {
- /*
- * Use just the thread priority, leaving the
- * other scheduling attributes as their
- * default values:
- */
- new_thread->base_priority = new_thread->attr.prio;
- }
- new_thread->active_priority = new_thread->base_priority;
-
/* Initialize the mutex queue: */
TAILQ_INIT(&new_thread->mutexq);
@@ -166,6 +143,13 @@
param.flags = 0;
if (new_thread->attr.flags & PTHREAD_SCOPE_SYSTEM)
param.flags |= THR_SYSTEM_SCOPE;
+ if (new_thread->attr.sched_inherit == PTHREAD_INHERIT_SCHED)
+ param.sched = NULL;
+ else {
+ param.sched = &sched_param;
+ sched_param.policy = new_thread->attr.sched_policy;
+ sched_param.param.sched_priority = new_thread->attr.prio;
+ }
/* Schedule the new thread. */
if (create_suspended) {
@@ -177,6 +161,15 @@
ret = thr_new(¶m, sizeof(param));
+ if (ret != 0) {
+ ret = errno;
+ /*
+ * Translate EPROCLIM into well-known POSIX code EAGAIN.
+ */
+ if (ret == EPROCLIM)
+ ret = EAGAIN;
+ }
+
if (create_suspended)
__sys_sigprocmask(SIG_SETMASK, &oset, NULL);
@@ -196,7 +189,6 @@
_thr_ref_delete_unlocked(curthread, new_thread);
THREAD_LIST_UNLOCK(curthread);
(*thread) = 0;
- ret = EAGAIN;
} else if (locked) {
_thr_report_creation(curthread, new_thread);
THR_THREAD_UNLOCK(curthread, new_thread);
==== //depot/projects/tty/lib/libthr/thread/thr_getschedparam.c#5 (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/libthr/thread/thr_getschedparam.c,v 1.5 2006/04/27 08:18:23 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_getschedparam.c,v 1.6 2006/07/12 06:13:18 davidxu Exp $
*/
#include "namespace.h"
@@ -46,32 +46,47 @@
struct sched_param *param)
{
struct pthread *curthread = _get_curthread();
- int ret, tmp;
+ int ret;
+
+ if (policy == NULL || param == NULL)
+ return (EINVAL);
- if ((param == NULL) || (policy == NULL))
- /* Return an invalid argument error: */
- ret = EINVAL;
- else if (pthread == curthread) {
+ if (pthread == curthread) {
/*
* Avoid searching the thread list when it is the current
* thread.
*/
- THR_THREAD_LOCK(curthread, curthread);
- param->sched_priority = pthread->base_priority;
- tmp = pthread->attr.sched_policy;
- THR_THREAD_UNLOCK(curthread, curthread);
- *policy = tmp;
- ret = 0;
+ THR_LOCK(curthread);
+
+ /*
+ * XXX Here we need two separated syscalls, atomic is only
+ * guaranteed in thread library, a new syscall is needed.
+ */
+
+ *policy = sched_getscheduler((pid_t)curthread->tid);
+ if (*policy == -1)
+ ret = errno;
+ else {
+ ret = sched_getparam((pid_t)curthread->tid, param);
+ if (ret == -1)
+ ret = errno;
+ }
+ THR_UNLOCK(curthread);
}
/* Find the thread in the list of active threads. */
else if ((ret = _thr_ref_add(curthread, pthread, /*include dead*/0))
== 0) {
THR_THREAD_LOCK(curthread, pthread);
- param->sched_priority = pthread->base_priority;
- tmp = pthread->attr.sched_policy;
+ *policy = sched_getscheduler((pid_t)pthread->tid);
+ if (*policy == -1)
+ ret = errno;
+ else {
+ ret = sched_getparam((pid_t)pthread->tid, param);
+ if (ret == -1)
+ ret = errno;
+ }
THR_THREAD_UNLOCK(curthread, pthread);
_thr_ref_delete(curthread, pthread);
- *policy = tmp;
}
return (ret);
}
==== //depot/projects/tty/lib/libthr/thread/thr_init.c#11 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.34 2006/04/27 08:18:23 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.35 2006/07/12 06:13:18 davidxu Exp $
*/
#include "namespace.h"
@@ -40,6 +40,7 @@
#include <sys/sysctl.h>
#include <sys/ttycom.h>
#include <sys/mman.h>
+#include <sys/rtprio.h>
#include <errno.h>
#include <fcntl.h>
#include <paths.h>
@@ -67,14 +68,10 @@
atfork_head _thr_atfork_list = TAILQ_HEAD_INITIALIZER(_thr_atfork_list);
umtx_t _thr_atfork_lock;
-/*
- * XXX these values should be updated from kernel at startup,
- * but current they are same.
- */
struct pthread_prio _thr_priorities[3] = {
- {0, 31, 0}, /* FIF0 */
- {-20, 20, 0}, /* OTHER */
- {0, 31, 0} /* RR */
+ {RTP_PRIO_MIN, RTP_PRIO_MAX, 0}, /* FIFO */
+ {0, 0, 63}, /* OTHER */
+ {RTP_PRIO_MIN, RTP_PRIO_MAX, 0} /* RR */
};
struct pthread_attr _pthread_attr_default = {
@@ -156,8 +153,6 @@
STATIC_LIB_REQUIRE(_sigaction);
STATIC_LIB_REQUIRE(_sigprocmask);
STATIC_LIB_REQUIRE(_sigsuspend);
-STATIC_LIB_REQUIRE(_socket);
-STATIC_LIB_REQUIRE(_socketpair);
STATIC_LIB_REQUIRE(_thread_init_hack);
STATIC_LIB_REQUIRE(_wait4);
STATIC_LIB_REQUIRE(_write);
@@ -407,11 +402,6 @@
thread->cancelflags = PTHREAD_CANCEL_ENABLE | PTHREAD_CANCEL_DEFERRED;
thr_set_name(thread->tid, "initial thread");
- /* Default the priority of the initial thread: */
- thread->base_priority = THR_DEF_PRIORITY;
- thread->active_priority = THR_DEF_PRIORITY;
- thread->inherited_priority = 0;
-
/* Initialize the mutex queue: */
TAILQ_INIT(&thread->mutexq);
==== //depot/projects/tty/lib/libthr/thread/thr_private.h#13 (text+ko) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.65 2006/06/03 00:19:40 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.66 2006/07/12 06:13:18 davidxu Exp $
*/
#ifndef _THR_PRIVATE_H
@@ -262,7 +262,7 @@
* Define priorities returned by kernel.
*/
#define THR_MIN_PRIORITY (_thr_priorities[SCHED_OTHER-1].pri_min)
-#define THR_MAX_PRIORITY (_thr_priorities[SCHED_OTHER-1].pri_min)
+#define THR_MAX_PRIORITY (_thr_priorities[SCHED_OTHER-1].pri_max)
#define THR_DEF_PRIORITY (_thr_priorities[SCHED_OTHER-1].pri_default)
#define THR_MIN_RR_PRIORITY (_thr_priorities[SCHED_RR-1].pri_min)
@@ -271,7 +271,7 @@
/* XXX The SCHED_FIFO should have same priority range as SCHED_RR */
#define THR_MIN_FIFO_PRIORITY (_thr_priorities[SCHED_FIFO_1].pri_min)
-#define THR_MAX_FIFO_PRIORITY (_thr_priorities[SCHED_FIFO-1].pri_min)
+#define THR_MAX_FIFO_PRIORITY (_thr_priorities[SCHED_FIFO-1].pri_max)
#define THR_DEF_FIFO_PRIORITY (_thr_priorities[SCHED_FIFO-1].pri_default)
struct pthread_prio {
@@ -413,32 +413,6 @@
#define TLFLAGS_IN_GCLIST 0x0004 /* thread in gc list */
#define TLFLAGS_DETACHED 0x0008 /* thread is detached */
- /*
- * Base priority is the user setable and retrievable priority
- * of the thread. It is only affected by explicit calls to
- * set thread priority and upon thread creation via a thread
- * attribute or default priority.
- */
- char base_priority;
-
- /*
- * Inherited priority is the priority a thread inherits by
- * taking a priority inheritence or protection mutex. It
- * is not affected by base priority changes. Inherited
- * priority defaults to and remains 0 until a mutex is taken
- * that is being waited on by any other thread whose priority
- * is non-zero.
- */
- char inherited_priority;
-
- /*
- * Active priority is always the maximum of the threads base
- * priority and inherited priority. When there is a change
- * in either the base or inherited priority, the active
- * priority must be recalculated.
- */
- char active_priority;
-
/* Queue of currently owned simple type mutexes. */
TAILQ_HEAD(, pthread_mutex) mutexq;
==== //depot/projects/tty/lib/libthr/thread/thr_setprio.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list