PERFORCE change 142901 for review
Paolo Pisati
piso at FreeBSD.org
Wed Jun 4 18:57:59 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142901
Change 142901 by piso at piso_newluxor on 2008/06/04 18:57:41
MFC at 142897
Affected files ...
.. //depot/projects/soc2005/libalias/MAINTAINERS#11 integrate
.. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#32 integrate
.. //depot/projects/soc2005/libalias/UPDATING#28 integrate
.. //depot/projects/soc2005/libalias/bin/sh/parser.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/coff-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/cpu-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elf32-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elf64-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfn32-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfxx-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfxx-mips.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/news-mips.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/mipsbsd.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/pe-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/bfd/pei-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/e-mipsecoff.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/e-mipself.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/itbl-mips.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/tc-mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/tc-mips.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/te-tmips.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/gas/doc/c-mips.texi#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/gprof/mips.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/include/coff/mips.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/include/coff/mipspe.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/include/opcode/mips.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsbig.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsbsd.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsidt.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsidtl.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipslit.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipslnews.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipspe.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emultempl/mipsecoff.em#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/emultempl/mipself.em#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/scripttempl/mips.sc#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/ld/scripttempl/mipsbsd.sc#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips-dis.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips-opc.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips16-opc.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/ncurses/FREEBSD-vendor#3 integrate
.. //depot/projects/soc2005/libalias/etc/defaults/bluetooth.device.conf#2 integrate
.. //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#5 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#11 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_fcntl.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libkse/thread/thr_fcntl.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#13 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#14 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_once.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#16 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_syscalls.c#6 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/readme/article.sgml#5 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate
.. //depot/projects/soc2005/libalias/release/doc/share/sgml/release.ent#6 integrate
.. //depot/projects/soc2005/libalias/sbin/mount/mount.8#8 integrate
.. //depot/projects/soc2005/libalias/sbin/ping6/ping6.8#3 integrate
.. //depot/projects/soc2005/libalias/sbin/ping6/ping6.c#5 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/snd_emu10kx.4#5 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/ubsa.4#6 integrate
.. //depot/projects/soc2005/libalias/share/man/man5/bluetooth.device.conf.5#4 integrate
.. //depot/projects/soc2005/libalias/share/sendmail/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/share/syscons/keymaps/INDEX.keymaps#4 integrate
.. //depot/projects/soc2005/libalias/share/syscons/keymaps/Makefile#4 integrate
.. //depot/projects/soc2005/libalias/share/syscons/keymaps/colemak.iso15.acc.kbd#1 branch
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#23 integrate
.. //depot/projects/soc2005/libalias/sys/arm/at91/at91_twi.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_mib.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_stats.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_util.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/compat/ndis/subr_ntoskrnl.c#6 edit
.. //depot/projects/soc2005/libalias/sys/dev/ath/ah_osdep.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#18 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/if_athvar.h#13 integrate
.. //depot/projects/soc2005/libalias/sys/dev/atkbdc/psm.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#19 integrate
.. //depot/projects/soc2005/libalias/sys/dev/cnw/if_cnw.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/cs/if_cs.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/fe/if_fe.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/fe/if_fe_pccard.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/fe/if_fevar.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ie/if_ie.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ie/if_ie_isa.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ie/if_ievar.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ieee488/upd7210.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndis.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndisvar.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/led/led.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/md/md.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#18 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_ioctl.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/nve/if_nve.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/nve/if_nvereg.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/pccard/pccard_cis.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/puc/pucdata.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/dev/snc/dp83932.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/snc/dp83932subr.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/snc/dp83932var.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/snc/if_sncreg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_ns8250.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/ubsa.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#21 integrate
.. //depot/projects/soc2005/libalias/sys/dev/xe/if_xe.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/xe/if_xe_pccard.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/xe/if_xevar.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_vnops.c#14 integrate
.. //depot/projects/soc2005/libalias/sys/geom/geom_dev.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/i386/cpufreq/est.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/ia64/include/atomic.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_conf.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_descrip.c#18 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_umtx.c#17 integrate
.. //depot/projects/soc2005/libalias/sys/kern/tty_tty.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/modules/Makefile#28 integrate
.. //depot/projects/soc2005/libalias/sys/modules/ath_rate_onoe/Makefile#5 integrate
.. //depot/projects/soc2005/libalias/sys/modules/ath_rate_sample/Makefile#5 integrate
.. //depot/projects/soc2005/libalias/sys/modules/cnw/Makefile#1 branch
.. //depot/projects/soc2005/libalias/sys/modules/dtrace/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/sys/net/radix_mpath.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/net/radix_mpath.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.c#12 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_tkip.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_wep.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ddb.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_freebsd.h#9 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_node.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#14 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.c#12 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.h#9 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_scan.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_var.h#12 integrate
.. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#16 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/ip_carp.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#80 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#32 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#34 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#18 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/udp_usrreq.c#15 integrate
.. //depot/projects/soc2005/libalias/sys/netinet6/udp6_usrreq.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/netipx/spx_usrreq.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_serv.c#12 integrate
.. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_impl.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/pci/if_xl.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/pci/if_xlreg.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/powerpc/aim/trap.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#16 integrate
.. //depot/projects/soc2005/libalias/sys/security/mac/mac_inet.c#14 integrate
.. //depot/projects/soc2005/libalias/sys/sys/conf.h#9 integrate
.. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.1#3 integrate
.. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.cc#4 integrate
.. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest_run.sh#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/comm/comm.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/shar/shar.sh#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/jexec/jexec.8#4 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/jexec/jexec.c#4 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/Makefile#5 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/main.c#7 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/pkg_add.1#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/create/main.c#5 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/create/pkg_create.1#4 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/main.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/pkg_delete.1#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/main.c#4 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/pkg_info.1#5 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/lib/lib.h#7 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/updating/main.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/updating/pkg_updating.1#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/main.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/pkg_version.1#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/pw/pw_user.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd.c#10 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/sicontrol/sicontrol.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/timed/timed/timed.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/tzsetup/paths.h#2 delete
.. //depot/projects/soc2005/libalias/usr.sbin/tzsetup/tzsetup.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/wlandebug/wlandebug.c#4 integrate
Differences ...
==== //depot/projects/soc2005/libalias/MAINTAINERS#11 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.147 2008/05/27 06:50:46 peter Exp $
+$FreeBSD: src/MAINTAINERS,v 1.149 2008/06/04 07:37:26 rafan Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -71,7 +71,6 @@
ps gad I am working on a number of changes to this. Would
like advance notice of major changes planned to it.
cvs peter Heads-up appreciated, try not to break it.
-ncurses peter Heads-up appreciated, try not to break it.
nvi peter Try not to break it.
libz peter Try not to break it.
groff ru Recommends pre-commit review.
@@ -127,6 +126,7 @@
gnu/usr.bin/send-pr bugmaster Pre-commit review requested.
BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports.
usb core Please contact core@ before any major changes
+ncurses rafan Heads-up appreciated, try not to break it.
Following are the entries from the Makefiles, and a few other sources.
Please remove stale entries from both their origin, and this file.
==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#32 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.139 2008/05/26 10:39:45 bz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.141 2008/05/27 21:05:49 bz Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -128,6 +128,26 @@
OLD_DIRS+=usr/share/examples/isdn
OLD_FILES+=usr/share/examples/ppp/isdnd.rc
OLD_FILES+=usr/share/examples/ppp/ppp.conf.isdn
+# 20080525: ng_atmpif removed
+OLD_FILES+=usr/include/netgraph/atm/ng_atmpif.h
+OLD_FILES+=usr/share/man/man4/ng_atmpif.4.gz
+# 20080522: pmap_addr_hint removed
+OLD_FILES+=usr/share/man/man9/pmap_addr_hint.9.gz
+# 20080517: ipsec_osdep.h removed
+OLD_FILES+=usr/include/netipsec/ipsec_osdep.h
+# 20080507: heimdal 1.1 import
+OLD_LIBS+=usr/lib/libasn1.so.9
+OLD_LIBS+=usr/lib/libgssapi.so.9
+OLD_LIBS+=usr/lib/libgssapi_krb5.so.9
+OLD_LIBS+=usr/lib/libhdb.so.9
+OLD_LIBS+=usr/lib/libkadm5clnt.so.9
+OLD_LIBS+=usr/lib/libkadm5srv.so.9
+OLD_LIBS+=usr/lib/libkafs5.so.9
+OLD_LIBS+=usr/lib/libkrb5.so.9
+OLD_LIBS+=usr/lib/libroken.so.9
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libgssapi.so.9
+.endif
# 20080420: Symbol card support dropped
OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h
# 20080420: awi removal
@@ -210,7 +230,7 @@
.endif
# 20070801: fast_ipsec.4 gone
OLD_FILES+=usr/share/man/man4/fast_ipsec.4.gz
-# 20070715: netatm temporarily disconnected
+# 20070715: netatm temporarily disconnected (removed 20080525)
OLD_FILES+=rescue/atm
OLD_FILES+=rescue/fore_dnld
OLD_FILES+=rescue/ilmid
@@ -298,7 +318,7 @@
OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
OLD_FILES+=usr/include/machine/i4b_trace.h
.endif
-# 20070704: I4B 'modules' temporary disconnected
+# 20070704: I4B 'modules' temporary disconnected (removed 20080525)
.if ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/share/man/man4/i4bing.4.gz
OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
==== //depot/projects/soc2005/libalias/UPDATING#28 (text+ko) ====
@@ -22,6 +22,12 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080603:
+ The version that Linuxulator emulates was changed from 2.4.2
+ to 2.6.16. If you experience any problems with Linux binaries
+ please try to set sysctl compat.linux.osrelease to 2.4.2 and
+ if it fixes the problem contact emulation mailing list.
+
20080525:
ISDN4BSD (I4B) was removed from the src tree. You may need to
update a your kernel configuration and remove relevant entries.
@@ -1043,4 +1049,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.529 2008/05/26 10:39:45 bz Exp $
+$FreeBSD: src/UPDATING,v 1.531 2008/06/03 18:09:10 rdivacky Exp $
==== //depot/projects/soc2005/libalias/bin/sh/parser.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.60 2008/05/28 21:44:32 stefanf Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -1188,6 +1188,7 @@
int bracketed_name = 0; /* used to handle ${[0-9]*} variables */
int i;
int linno;
+ int length;
c = pgetc();
if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) &&
@@ -1220,12 +1221,14 @@
subtype = 0;
}
if (!is_eof(c) && is_name(c)) {
- p = out;
+ length = 0;
do {
STPUTC(c, out);
c = pgetc();
+ length++;
} while (!is_eof(c) && is_in_name(c));
- if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) {
+ if (length == 6 &&
+ strncmp(out - length, "LINENO", length) == 0) {
/* Replace the variable name with the
* current line number. */
linno = plinno;
==== //depot/projects/soc2005/libalias/contrib/ncurses/FREEBSD-vendor#3 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/contrib/ncurses/FREEBSD-vendor,v 1.2 2008/05/09 02:30:24 rafan Exp $
+# $FreeBSD: src/contrib/ncurses/FREEBSD-vendor,v 1.3 2008/06/04 07:38:38 rafan Exp $
Project: Ncurses (new curses) library
ProjectURL: http://www.gnu.org/software/ncurses/
Version: 5.6-20080503 snapshot
VendorTag: NCURSES
VersionTag: v5_6_20080503
License: MIT-like
-Maintainer: peter, rafan
+Maintainer: rafan
==== //depot/projects/soc2005/libalias/etc/defaults/bluetooth.device.conf#2 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1 2005/11/10 19:09:22 emax Exp $
+# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.2 2008/05/27 17:46:32 emax Exp $
# The authentication_enable parameter controls if the device requires to
# authenticate the remote device at connection setup. At connection setup,
@@ -39,8 +39,7 @@
# The class parameter is used to indicate the capabilities of the device to
# other devices.
#
-# For more details see
-# https://www.bluetooth.org/foundry/assignnumb/document/baseband
+# For more details see "Assigned Numbers - Bluetooth Baseband" document
#
# Possible value:
#
@@ -101,7 +100,7 @@
# The role_switch parameter controls whether the local device should perform
# role switch. By default, if role switch is supported, the local device will
# try to perform role switch and become Master on incoming connection. Some
-# devices do not support role switch and thus incomming connections from such
+# devices do not support role switch and thus incoming connections from such
# devices will fail. If role switch is disabled then accepting device will
# remain Slave.
#
==== //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#5 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.45 2007/12/08 00:20:33 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.46 2008/05/31 18:07:16 remko Exp $
%
Any user that is a member of the wheel group can use "su -" to simulate
a root login. You can add a user to the wheel group by editing /etc/group.
@@ -402,16 +402,6 @@
as root. This will install a collection of packages that is appropriate for
running a "generic" server.
%
-You can get a good standard workstation install by using the
-instant-workstation port/package. If you have ports installed, you can
-install it by doing
-
- # cd /usr/ports/misc/instant-workstation
- # make install && make clean
-
-as root. This will install a collection of packages that is convenient to
-have on a workstation.
-%
You can install extra packages for FreeBSD by using the ports system.
If you have installed it, you can download, compile, and install software by
just typing
==== //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#11 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.15 2008/05/09 23:00:20 julian Exp $
+ * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.16 2008/05/30 14:47:40 dfr Exp $
*/
/*
@@ -522,6 +522,7 @@
__sys_fchown;
_fcntl;
__sys_fcntl;
+ __fcntl_compat;
_fhopen;
__sys_fhopen;
_fhstat;
==== //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.1 2008/04/04 09:43:03 dfr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.3 2008/05/30 14:47:40 dfr Exp $");
#include <fcntl.h>
#include <stdarg.h>
@@ -34,8 +34,10 @@
#include <sys/syscall.h>
#include "libc_private.h"
+__weak_reference(__fcntl_compat, fcntl);
+
int
-fcntl(int fd, int cmd, ...)
+__fcntl_compat(int fd, int cmd, ...)
{
va_list args;
long arg;
==== //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_fcntl.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.16 2007/01/12 07:25:25 imp Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.17 2008/05/30 14:47:41 dfr Exp $
*/
#include <stdarg.h>
#include <unistd.h>
@@ -36,6 +36,8 @@
__weak_reference(__fcntl, fcntl);
+extern int __fcntl_compat(int fd, int cmd, ...);
+
int
_fcntl(int fd, int cmd,...)
{
@@ -124,7 +126,7 @@
break;
default:
/* Might want to make va_arg use a union */
- ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
+ ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
break;
}
==== //depot/projects/soc2005/libalias/lib/libkse/thread/thr_fcntl.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.24 2007/12/16 23:29:55 deischen Exp $
+ * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.25 2008/05/30 14:47:42 dfr Exp $
*/
#include "namespace.h"
@@ -37,6 +37,7 @@
#include "thr_private.h"
int __fcntl(int fd, int cmd,...);
+extern int __fcntl_compat(int fd, int cmd,...);
__weak_reference(__fcntl, fcntl);
@@ -68,7 +69,7 @@
ret = __sys_fcntl(fd, cmd);
break;
default:
- ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
+ ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
}
va_end(ap);
==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#13 (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.50 2008/04/16 03:19:11 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.51 2008/05/29 07:57:33 davidxu Exp $
*/
#include "namespace.h"
@@ -89,8 +89,7 @@
struct pthread_mutex_attr _pthread_mutexattr_default = {
.m_type = PTHREAD_MUTEX_DEFAULT,
.m_protocol = PTHREAD_PRIO_NONE,
- .m_ceiling = 0,
- .m_flags = 0
+ .m_ceiling = 0
};
/* Default condition variable attributes: */
==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#14 (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_mutex.c,v 1.73 2008/04/26 13:19:07 kris Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.74 2008/05/29 07:57:33 davidxu Exp $
*/
#include "namespace.h"
@@ -51,12 +51,12 @@
(m)->m_qe.tqe_next = NULL; \
} while (0)
#define MUTEX_ASSERT_IS_OWNED(m) do { \
- if ((m)->m_qe.tqe_prev == NULL) \
+ if (__predict_false((m)->m_qe.tqe_prev == NULL))\
PANIC("mutex is not on list"); \
} while (0)
#define MUTEX_ASSERT_NOT_OWNED(m) do { \
- if (((m)->m_qe.tqe_prev != NULL) || \
- ((m)->m_qe.tqe_next != NULL)) \
+ if (__predict_false((m)->m_qe.tqe_prev != NULL || \
+ (m)->m_qe.tqe_next != NULL)) \
PANIC("mutex is on list"); \
} while (0)
#else
@@ -95,9 +95,13 @@
static int mutex_unlock_common(pthread_mutex_t *);
__weak_reference(__pthread_mutex_init, pthread_mutex_init);
+__strong_reference(__pthread_mutex_init, _pthread_mutex_init);
__weak_reference(__pthread_mutex_lock, pthread_mutex_lock);
+__strong_reference(__pthread_mutex_lock, _pthread_mutex_lock);
__weak_reference(__pthread_mutex_timedlock, pthread_mutex_timedlock);
+__strong_reference(__pthread_mutex_timedlock, _pthread_mutex_timedlock);
__weak_reference(__pthread_mutex_trylock, pthread_mutex_trylock);
+__strong_reference(__pthread_mutex_trylock, _pthread_mutex_trylock);
/* Single underscore versions provided for libc internal usage: */
/* No difference between libc and application usage of these: */
@@ -108,15 +112,17 @@
__weak_reference(_pthread_mutex_setprioceiling, pthread_mutex_setprioceiling);
__weak_reference(__pthread_mutex_setspinloops_np, pthread_mutex_setspinloops_np);
+__strong_reference(__pthread_mutex_setspinloops_np, _pthread_mutex_setspinloops_np);
__weak_reference(_pthread_mutex_getspinloops_np, pthread_mutex_getspinloops_np);
__weak_reference(__pthread_mutex_setyieldloops_np, pthread_mutex_setyieldloops_np);
+__strong_reference(__pthread_mutex_setyieldloops_np, _pthread_mutex_setyieldloops_np);
__weak_reference(_pthread_mutex_getyieldloops_np, pthread_mutex_getyieldloops_np);
__weak_reference(_pthread_mutex_isowned_np, pthread_mutex_isowned_np);
static int
mutex_init(pthread_mutex_t *mutex,
- const pthread_mutexattr_t *mutex_attr, int private,
+ const pthread_mutexattr_t *mutex_attr,
void *(calloc_cb)(size_t, size_t))
{
const struct pthread_mutex_attr *attr;
@@ -139,9 +145,6 @@
pmutex->m_type = attr->m_type;
pmutex->m_owner = NULL;
- pmutex->m_flags = attr->m_flags | MUTEX_FLAGS_INITED;
- if (private)
- pmutex->m_flags |= MUTEX_FLAGS_PRIVATE;
pmutex->m_count = 0;
pmutex->m_refcount = 0;
pmutex->m_spinloops = 0;
@@ -180,7 +183,7 @@
THR_LOCK_ACQUIRE(thread, &_mutex_static_lock);
if (*mutex == NULL)
- ret = mutex_init(mutex, NULL, 0, calloc);
+ ret = mutex_init(mutex, NULL, calloc);
else
ret = 0;
@@ -189,23 +192,6 @@
return (ret);
}
-static int
-init_static_private(struct pthread *thread, pthread_mutex_t *mutex)
-{
- int ret;
-
- THR_LOCK_ACQUIRE(thread, &_mutex_static_lock);
-
- if (*mutex == NULL)
- ret = mutex_init(mutex, NULL, 1, calloc);
- else
- ret = 0;
-
- THR_LOCK_RELEASE(thread, &_mutex_static_lock);
-
- return (ret);
-}
-
static void
set_inherited_priority(struct pthread *curthread, struct pthread_mutex *m)
{
@@ -219,17 +205,10 @@
}
int
-_pthread_mutex_init(pthread_mutex_t *mutex,
- const pthread_mutexattr_t *mutex_attr)
-{
- return mutex_init(mutex, mutex_attr, 1, calloc);
-}
-
-int
__pthread_mutex_init(pthread_mutex_t *mutex,
const pthread_mutexattr_t *mutex_attr)
{
- return mutex_init(mutex, mutex_attr, 0, calloc);
+ return mutex_init(mutex, mutex_attr, calloc);
}
/* This function is used internally by malloc. */
@@ -240,12 +219,11 @@
static const struct pthread_mutex_attr attr = {
.m_type = PTHREAD_MUTEX_NORMAL,
.m_protocol = PTHREAD_PRIO_NONE,
- .m_ceiling = 0,
- .m_flags = 0
+ .m_ceiling = 0
};
static const struct pthread_mutex_attr *pattr = &attr;
- return mutex_init(mutex, (pthread_mutexattr_t *)&pattr, 0, calloc_cb);
+ return mutex_init(mutex, (pthread_mutexattr_t *)&pattr, calloc_cb);
}
void
@@ -319,7 +297,6 @@
return (ret);
}
-
#define ENQUEUE_MUTEX(curthread, m) \
do { \
(m)->m_owner = curthread; \
@@ -368,124 +345,95 @@
return (mutex_trylock_common(curthread, mutex));
}
-int
-_pthread_mutex_trylock(pthread_mutex_t *mutex)
-{
- struct pthread *curthread = _get_curthread();
- int ret;
-
- /*
- * If the mutex is statically initialized, perform the dynamic
- * initialization marking the mutex private (delete safe):
- */
- if (__predict_false(*mutex == NULL)) {
- ret = init_static_private(curthread, mutex);
- if (__predict_false(ret))
- return (ret);
- }
- return (mutex_trylock_common(curthread, mutex));
-}
-
static int
-mutex_lock_common(struct pthread *curthread, pthread_mutex_t *mutex,
+mutex_lock_sleep(struct pthread *curthread, pthread_mutex_t m,
const struct timespec * abstime)
{
struct timespec ts, ts2;
- struct pthread_mutex *m;
uint32_t id;
int ret;
int count;
id = TID(curthread);
- m = *mutex;
- ret = _thr_umutex_trylock2(&m->m_lock, id);
- if (ret == 0) {
- ENQUEUE_MUTEX(curthread, m);
- } else if (m->m_owner == curthread) {
- ret = mutex_self_lock(m, abstime);
- } else {
- /*
- * For adaptive mutexes, spin for a bit in the expectation
- * that if the application requests this mutex type then
- * the lock is likely to be released quickly and it is
- * faster than entering the kernel
- */
- if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT)
- goto sleep_in_kernel;
+ if (__predict_false(m->m_owner == curthread))
+ return mutex_self_lock(m, abstime);
- if (!_thr_is_smp)
- goto yield_loop;
+ /*
+ * For adaptive mutexes, spin for a bit in the expectation
+ * that if the application requests this mutex type then
+ * the lock is likely to be released quickly and it is
+ * faster than entering the kernel
+ */
+ if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT)
+ goto sleep_in_kernel;
- count = m->m_spinloops;
- while (count--) {
- if (m->m_lock.m_owner == UMUTEX_UNOWNED) {
- ret = _thr_umutex_trylock2(&m->m_lock, id);
- if (ret == 0)
- goto done;
- }
- CPU_SPINWAIT;
- }
+ if (!_thr_is_smp)
+ goto yield_loop;
-yield_loop:
- count = m->m_yieldloops;
- while (count--) {
- _sched_yield();
+ count = m->m_spinloops;
+ while (count--) {
+ if (m->m_lock.m_owner == UMUTEX_UNOWNED) {
ret = _thr_umutex_trylock2(&m->m_lock, id);
if (ret == 0)
goto done;
}
+ CPU_SPINWAIT;
+ }
+yield_loop:
+ count = m->m_yieldloops;
+ while (count--) {
+ _sched_yield();
+ ret = _thr_umutex_trylock2(&m->m_lock, id);
+ if (ret == 0)
+ goto done;
+ }
+
sleep_in_kernel:
- if (abstime == NULL) {
- ret = __thr_umutex_lock(&m->m_lock);
- } else if (__predict_false(
- abstime->tv_sec < 0 || abstime->tv_nsec < 0 ||
- abstime->tv_nsec >= 1000000000)) {
- ret = EINVAL;
- } else {
- clock_gettime(CLOCK_REALTIME, &ts);
- TIMESPEC_SUB(&ts2, abstime, &ts);
- ret = __thr_umutex_timedlock(&m->m_lock, &ts2);
- /*
- * Timed out wait is not restarted if
- * it was interrupted, not worth to do it.
- */
- if (ret == EINTR)
- ret = ETIMEDOUT;
- }
+ if (abstime == NULL) {
+ ret = __thr_umutex_lock(&m->m_lock);
+ } else if (__predict_false(
+ abstime->tv_sec < 0 || abstime->tv_nsec < 0 ||
+ abstime->tv_nsec >= 1000000000)) {
+ ret = EINVAL;
+ } else {
+ clock_gettime(CLOCK_REALTIME, &ts);
+ TIMESPEC_SUB(&ts2, abstime, &ts);
+ ret = __thr_umutex_timedlock(&m->m_lock, &ts2);
+ /*
+ * Timed out wait is not restarted if
+ * it was interrupted, not worth to do it.
+ */
+ if (ret == EINTR)
+ ret = ETIMEDOUT;
+ }
done:
- if (ret == 0)
- ENQUEUE_MUTEX(curthread, m);
- }
+ if (ret == 0)
+ ENQUEUE_MUTEX(curthread, m);
return (ret);
}
-int
-__pthread_mutex_lock(pthread_mutex_t *m)
+static inline int
+mutex_lock_common(struct pthread *curthread, struct pthread_mutex *m,
+ const struct timespec * abstime)
{
- struct pthread *curthread;
+ uint32_t id;
int ret;
- _thr_check_init();
-
- curthread = _get_curthread();
-
- /*
- * If the mutex is statically initialized, perform the dynamic
- * initialization:
- */
- if (__predict_false(*m == NULL)) {
- ret = init_static(curthread, m);
- if (__predict_false(ret))
- return (ret);
- }
- return (mutex_lock_common(curthread, m, NULL));
+ id = TID(curthread);
+ ret = _thr_umutex_trylock2(&m->m_lock, id);
+ if (ret == 0)
+ ENQUEUE_MUTEX(curthread, m);
+ else
+ ret = mutex_lock_sleep(curthread, m, abstime);
+ return (ret);
}
int
-_pthread_mutex_lock(pthread_mutex_t *m)
+__pthread_mutex_lock(pthread_mutex_t *mutex)
{
struct pthread *curthread;
+ struct pthread_mutex *m;
int ret;
_thr_check_init();
@@ -494,20 +442,22 @@
/*
* If the mutex is statically initialized, perform the dynamic
- * initialization marking it private (delete safe):
+ * initialization:
*/
- if (__predict_false(*m == NULL)) {
- ret = init_static_private(curthread, m);
+ if (__predict_false((m = *mutex) == NULL)) {
+ ret = init_static(curthread, mutex);
if (__predict_false(ret))
return (ret);
+ m = *mutex;
}
return (mutex_lock_common(curthread, m, NULL));
}
int
-__pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *abstime)
+__pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *abstime)
{
struct pthread *curthread;
+ struct pthread_mutex *m;
int ret;
_thr_check_init();
@@ -518,37 +468,16 @@
* If the mutex is statically initialized, perform the dynamic
* initialization:
*/
- if (__predict_false(*m == NULL)) {
- ret = init_static(curthread, m);
+ if (__predict_false((m = *mutex) == NULL)) {
+ ret = init_static(curthread, mutex);
if (__predict_false(ret))
return (ret);
+ m = *mutex;
}
return (mutex_lock_common(curthread, m, abstime));
}
int
-_pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *abstime)
-{
- struct pthread *curthread;
- int ret;
-
- _thr_check_init();
-
- curthread = _get_curthread();
-
- /*
- * If the mutex is statically initialized, perform the dynamic
- * initialization marking it private (delete safe):
- */
- if (__predict_false(*m == NULL)) {
- ret = init_static_private(curthread, m);
- if (__predict_false(ret))
- return (ret);
- }
- return (mutex_lock_common(curthread, m, abstime));
-}
-
-int
_pthread_mutex_unlock(pthread_mutex_t *m)
{
return (mutex_unlock_common(m));
@@ -559,7 +488,7 @@
{
int ret;
- ret = mutex_lock_common(_get_curthread(), m, NULL);
+ ret = mutex_lock_common(_get_curthread(), *m, NULL);
if (ret == 0) {
(*m)->m_refcount--;
(*m)->m_count += count;
@@ -605,10 +534,15 @@
case PTHREAD_MUTEX_ERRORCHECK:
case PTHREAD_MUTEX_ADAPTIVE_NP:
if (abstime) {
- clock_gettime(CLOCK_REALTIME, &ts1);
- TIMESPEC_SUB(&ts2, abstime, &ts1);
- __sys_nanosleep(&ts2, NULL);
- ret = ETIMEDOUT;
+ if (abstime->tv_sec < 0 || abstime->tv_nsec < 0 ||
+ abstime->tv_nsec >= 1000000000) {
+ ret = EINVAL;
+ } else {
+ clock_gettime(CLOCK_REALTIME, &ts1);
+ TIMESPEC_SUB(&ts2, abstime, &ts1);
+ __sys_nanosleep(&ts2, NULL);
+ ret = ETIMEDOUT;
+ }
} else {
/*
* POSIX specifies that mutexes should return
@@ -625,10 +559,15 @@
*/
ret = 0;
if (abstime) {
- clock_gettime(CLOCK_REALTIME, &ts1);
- TIMESPEC_SUB(&ts2, abstime, &ts1);
- __sys_nanosleep(&ts2, NULL);
- ret = ETIMEDOUT;
+ if (abstime->tv_sec < 0 || abstime->tv_nsec < 0 ||
+ abstime->tv_nsec >= 1000000000) {
+ ret = EINVAL;
+ } else {
+ clock_gettime(CLOCK_REALTIME, &ts1);
+ TIMESPEC_SUB(&ts2, abstime, &ts1);
+ __sys_nanosleep(&ts2, NULL);
+ ret = ETIMEDOUT;
+ }
} else {
ts1.tv_sec = 30;
ts1.tv_nsec = 0;
@@ -726,17 +665,6 @@
return (0);
}
-void
-_mutex_unlock_private(pthread_t pthread)
-{
- struct pthread_mutex *m, *m_next;
-
- TAILQ_FOREACH_SAFE(m, &pthread->mutexq, m_qe, m_next) {
- if ((m->m_flags & MUTEX_FLAGS_PRIVATE) != 0)
- _pthread_mutex_unlock(&m);
- }
-}
-
int
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list