PERFORCE change 35831 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Aug 9 00:27:26 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=35831
Change 35831 by marcel at marcel_nfs on 2003/08/09 00:27:05
IFC @35830
Affected files ...
.. //depot/projects/ia64/bin/ls/ls.1#18 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#37 integrate
.. //depot/projects/ia64/etc/mtree/BSD.local.dist#17 integrate
.. //depot/projects/ia64/etc/mtree/BSD.usr.dist#25 integrate
.. //depot/projects/ia64/etc/network.subr#7 integrate
.. //depot/projects/ia64/lib/Makefile#33 integrate
.. //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#7 integrate
.. //depot/projects/ia64/lib/libc/alpha/gen/signalcontext.c#1 branch
.. //depot/projects/ia64/lib/libc/gen/Makefile.inc#24 integrate
.. //depot/projects/ia64/lib/libc/gen/pmadvise.c#3 integrate
.. //depot/projects/ia64/lib/libc/sparc64/gen/Makefile.inc#7 integrate
.. //depot/projects/ia64/lib/libc/sparc64/gen/signalcontext.c#1 branch
.. //depot/projects/ia64/lib/libc/sys/Makefile.inc#15 integrate
.. //depot/projects/ia64/lib/libc/sys/madvise.2#8 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid.3#4 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid_compare.c#2 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid_create.c#2 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid_create_nil.c#2 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid_equal.c#2 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid_from_string.c#2 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid_hash.c#2 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid_is_nil.c#2 integrate
.. //depot/projects/ia64/lib/libc/uuid/uuid_to_string.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/arch/alpha/Makefile.inc#2 integrate
.. //depot/projects/ia64/lib/libpthread/arch/alpha/alpha/context.S#1 branch
.. //depot/projects/ia64/lib/libpthread/arch/alpha/alpha/enter_uts.S#1 branch
.. //depot/projects/ia64/lib/libpthread/arch/alpha/alpha/pthread_md.c#1 branch
.. //depot/projects/ia64/lib/libpthread/arch/alpha/include/atomic_ops.h#1 branch
.. //depot/projects/ia64/lib/libpthread/arch/alpha/include/pthread_md.h#1 branch
.. //depot/projects/ia64/lib/libpthread/support/Makefile.inc#4 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#28 integrate
.. //depot/projects/ia64/release/Makefile#68 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#115 integrate
.. //depot/projects/ia64/release/scripts/doFS.sh#18 integrate
.. //depot/projects/ia64/sbin/comcontrol/Makefile#4 integrate
.. //depot/projects/ia64/sbin/comcontrol/comcontrol.c#3 integrate
.. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.8#5 integrate
.. //depot/projects/ia64/share/colldef/Makefile#16 integrate
.. //depot/projects/ia64/share/man/man4/ccd.4#7 integrate
.. //depot/projects/ia64/share/man/man7/hier.7#21 integrate
.. //depot/projects/ia64/share/mklocale/Makefile#14 integrate
.. //depot/projects/ia64/share/mklocale/ko_KR.CP949.src#1 branch
.. //depot/projects/ia64/share/monetdef/Makefile#13 integrate
.. //depot/projects/ia64/share/msgdef/Makefile#13 integrate
.. //depot/projects/ia64/share/numericdef/Makefile#13 integrate
.. //depot/projects/ia64/share/timedef/Makefile#13 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#17 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi.c#35 integrate
.. //depot/projects/ia64/sys/dev/ida/ida_disk.c#11 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#15 integrate
.. //depot/projects/ia64/sys/kern/kern_thread.c#63 integrate
.. //depot/projects/ia64/sys/kern/sys_pipe.c#37 integrate
.. //depot/projects/ia64/sys/net/if_loop.c#18 integrate
.. //depot/projects/ia64/sys/pc98/pc98/clock.c#17 integrate
.. //depot/projects/ia64/sys/sys/mman.h#6 integrate
.. //depot/projects/ia64/usr.bin/elfdump/elfdump.c#5 integrate
.. //depot/projects/ia64/usr.sbin/acpi/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_elf32.c#11 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/advcap.c#2 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/config.c#8 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/dump.c#3 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/if.c#2 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/rrenum.c#2 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.c#6 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.h#4 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/timer.c#3 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/timer.h#3 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/dump.c#2 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/if.c#2 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/probe.c#2 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/rtsock.c#2 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/rtsol.c#3 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/rtsold.8#4 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/rtsold.c#3 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/rtsold.h#2 integrate
Differences ...
==== //depot/projects/ia64/bin/ls/ls.1#18 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.75 2003/07/10 20:53:56 brueffer Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.76 2003/08/08 17:04:17 schweikh Exp $
.\"
.Dd May 19, 2002
.Dt LS 1
@@ -645,7 +645,12 @@
.Xr getfmac 8 ,
.Xr sticky 8
.Sh STANDARDS
-The
+With the exception of options
+.Fl g ,
+.Fl n
+and
+.Fl o ,
+the
.Nm
utility conforms to
.St -p1003.1-2001 .
==== //depot/projects/ia64/etc/defaults/rc.conf#37 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.182 2003/07/28 13:09:00 mbr Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.183 2003/08/08 17:43:58 ume Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -282,6 +282,7 @@
ipv6_default_interface="NO" # Default output interface for scoped addrs.
# Now this works only for IPv6 link local
# multicast addrs.
+rtsol_flags="" # Flags to IPv6 router solicitation.
rtadvd_enable="NO" # Set to YES to enable an IPv6 router
# advertisement daemon. If set to YES,
# this router becomes a possible candidate
==== //depot/projects/ia64/etc/mtree/BSD.local.dist#17 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.100 2003/08/05 05:42:07 mtm Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.101 2003/08/08 13:43:48 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -383,6 +383,8 @@
..
ja_JP.eucJP
..
+ ko_KR.CP949
+ ..
ko_KR.eucKR
..
la_LN.ISO8859-1
==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#25 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.278 2003/08/05 05:42:07 mtm Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.279 2003/08/08 13:43:48 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -445,6 +445,8 @@
..
ja_JP.eucJP
..
+ ko_KR.CP949
+ ..
ko_KR.eucKR
..
la_LN.ISO8859-1
@@ -775,6 +777,8 @@
..
ja_JP.eucJP
..
+ ko_KR.CP949
+ ..
ko_KR.eucKR
..
la_LN.ISO8859-1
==== //depot/projects/ia64/etc/network.subr#7 (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/network.subr,v 1.151 2003/06/24 03:55:21 kuriyama Exp $
+# $FreeBSD: src/etc/network.subr,v 1.152 2003/08/08 17:43:58 ume Exp $
#
#
@@ -407,7 +407,7 @@
sysctl net.inet6.ip6.accept_rtadv=1
set ${rtsol_interfaces}
ifconfig $1 up
- rtsol $1
+ rtsol ${rtsol_flags} $1
fi
for i in $interfaces; do
==== //depot/projects/ia64/lib/Makefile#33 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.166 2003/07/24 18:30:24 markm Exp $
+# $FreeBSD: src/lib/Makefile,v 1.167 2003/08/08 21:16:06 deischen Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -82,6 +82,9 @@
.if ${MACHINE_ARCH} == "amd64"
_libncp= libncp
_libsmb= libsmb
+.if !defined(NOLIBPTHREAD)
+_libpthread= libpthread
+.endif
.endif
.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "powerpc"
==== //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $
+# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.12 2003/08/09 05:37:54 deischen Exp $
SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
@@ -8,7 +8,7 @@
SRCS+= __divqu.S __divq.S __divlu.S __divl.S
SRCS+= __remqu.S __remq.S __remlu.S __reml.S
SRCS+= rfork_thread.S
-SRCS+= _ctx_start.S makecontext.c
+SRCS+= _ctx_start.S makecontext.c signalcontext.c
CLEANFILES+= __divqu.S __divq.S __divlu.S __divl.S
CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S
==== //depot/projects/ia64/lib/libc/gen/Makefile.inc#24 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.106 2003/04/17 14:14:22 nectar Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.107 2003/08/09 03:23:24 bms Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -19,7 +19,8 @@
initgroups.c isatty.c jrand48.c lcong48.c \
lockf.c lrand48.c mrand48.c nice.c \
nlist.c nrand48.c ntp_gettime.c opendir.c \
- pause.c popen.c posixshm.c pselect.c psignal.c pw_scan.c pwcache.c \
+ pause.c pmadvise.c popen.c posixshm.c pselect.c \
+ psignal.c pw_scan.c pwcache.c \
raise.c readdir.c readpassphrase.c rewinddir.c \
scandir.c seed48.c seekdir.c semctl.c \
setdomainname.c sethostname.c setjmperr.c setmode.c \
==== //depot/projects/ia64/lib/libc/gen/pmadvise.c#3 (text+ko) ====
@@ -5,12 +5,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/pmadvise.c,v 1.2 2002/02/01 00:57:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pmadvise.c,v 1.3 2003/08/09 03:23:24 bms Exp $");
#include <sys/mman.h>
int
-(posix_madvise)(void *address, size_t size, int how)
+posix_madvise(void *address, size_t size, int how)
{
- return posix_madvise(address, size, how);
+ return madvise(address, size, how);
}
==== //depot/projects/ia64/lib/libc/sparc64/gen/Makefile.inc#7 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.7 2003/04/01 23:28:50 jake Exp $
+# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.8 2003/08/08 15:40:28 jake Exp $
SRCS+= _ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \
fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \
- frexp.c infinity.c isinf.c ldexp.c makecontext.c modf.S setjmp.S \
- sigsetjmp.S
+ frexp.c infinity.c isinf.c ldexp.c makecontext.c modf.S \
+ signalcontext.c setjmp.S sigsetjmp.S
==== //depot/projects/ia64/lib/libc/sys/Makefile.inc#15 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.103 2003/04/17 18:39:30 trhodes Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.104 2003/08/09 03:23:24 bms Exp $
# sys sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -119,6 +119,7 @@
MLINKS+=kqueue.2 kevent.2
MLINKS+=kse.2 kse_create.2 kse.2 kse_exit.2 kse.2 kse_release.2 \
kse.2 kse_wakeup.2 kse.2 kse_thr_interrupt.2
+MLINKS+=madvise.2 posix_madvise.2
MLINKS+=mlock.2 munlock.2
MLINKS+=modnext.2 modfnext.2
MLINKS+=mount.2 unmount.2
==== //depot/projects/ia64/lib/libc/sys/madvise.2#8 (text+ko) ====
@@ -30,13 +30,13 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)madvise.2 8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.29 2003/03/31 21:09:56 wes Exp $
+.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.30 2003/08/09 03:23:24 bms Exp $
.\"
.Dd July 19, 1996
.Dt MADVISE 2
.Os
.Sh NAME
-.Nm madvise
+.Nm madvise , posix_madvise
.Nd give advice about use of memory
.Sh LIBRARY
.Lb libc
@@ -44,12 +44,17 @@
.In sys/mman.h
.Ft int
.Fn madvise "void *addr" "size_t len" "int behav"
+.Ft int
+.Fn posix_madvise "void *addr" "size_t len" "int behav"
.Sh DESCRIPTION
The
.Fn madvise
system call
allows a process that has knowledge of its memory behavior
to describe it to the system.
+The
+.Fn posix_madvise
+interface is identical and is provided for standards conformance.
.Pp
The known behaviors are:
.Bl -tag -width MADV_SEQUENTIAL
@@ -124,6 +129,15 @@
This should be used judiciously in processes that must remain running
for the system to properly function.
.El
+.Pp
+Portable programs that call the
+.Fn posix_madvise
+interface should use the aliases
+.Dv POSIX_MADV_NORMAL , POSIX_MADV_SEQUENTIAL ,
+.Dv POSIX_MADV_RANDOM , POSIX_MADV_WILLNEED ,
+and
+.Dv POSIX_MADV_DONTNEED
+rather than the flags described above.
.Sh RETURN VALUES
.Rv -std madvise
.Sh ERRORS
@@ -132,6 +146,10 @@
system call will fail if:
.Bl -tag -width Er
.It Bq Er EINVAL
+The
+.Fa behav
+argument is not valid.
+.It Bq Er ENOMEM
The virtual address range specified by the
.Fa addr
and
@@ -146,6 +164,11 @@
.Xr mprotect 2 ,
.Xr msync 2 ,
.Xr munmap 2
+.Sh STANDARDS
+The
+.Fn posix_madvise
+interface conforms to
+.St -p1003.1-2001 .
.Sh HISTORY
The
.Fn madvise
==== //depot/projects/ia64/lib/libc/uuid/uuid.3#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.3 2002/12/19 09:40:28 ru Exp $
+.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.4 2003/08/08 19:12:28 marcel Exp $
.\"
.Dd October 29, 2002
.Dt UUID 3
@@ -61,7 +61,8 @@
.Fn uuid_create_nil
functions create UUIDs.
The
-.Fn uuid_compare , uuid_equal
+.Fn uuid_compare ,
+.Fn uuid_equal
and
.Fn uuid_is_nil
functions can be used to test UUIDs.
==== //depot/projects/ia64/lib/libc/uuid/uuid_compare.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.1 2002/10/30 03:51:00 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.3 2003/08/08 19:18:43 marcel Exp $
*/
#include <string.h>
@@ -34,7 +34,6 @@
* uuid_compare() - compare two UUIDs.
* See also:
* http://www.opengroup.org/onlinepubs/009629399/uuid_compare.htm
- * http://www.transarc.ibm.com/Library/documentation/dce/1.1/uuid_compare.html
*
* NOTE: Either UUID can be NULL, meaning a nil UUID. nil UUIDs are smaller
* than any non-nil UUID.
@@ -72,5 +71,8 @@
res = (int)a->clock_seq_low - (int)b->clock_seq_low;
if (res)
return ((res < 0) ? -1 : 1);
- return (memcmp(a->node, b->node, sizeof(uuid_t)));
+ res = memcmp(a->node, b->node, sizeof(a->node));
+ if (res)
+ return ((res < 0) ? -1 : 1);
+ return (0);
}
==== //depot/projects/ia64/lib/libc/uuid/uuid_create.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_create.c,v 1.1 2002/10/30 03:51:00 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_create.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
*/
#include <uuid.h>
@@ -33,7 +33,6 @@
* uuid_create() - create an UUID.
* See also:
* http://www.opengroup.org/onlinepubs/009629399/uuid_create.htm
- * http://www.transarc.ibm.com/Library/documentation/dce/1.1/uuid_create.html
*/
void
uuid_create(uuid_t *u, uint32_t *status)
==== //depot/projects/ia64/lib/libc/uuid/uuid_create_nil.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_create_nil.c,v 1.1 2002/10/30 03:51:00 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_create_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
*/
#include <strings.h>
@@ -34,7 +34,6 @@
* uuid_create_nil() - create a nil UUID.
* See also:
* http://www.opengroup.org/onlinepubs/009629399/uuid_create_nil.htm
- * http://www.transarc.ibm.com/Library/documentation/dce/1.1/uuid_create_nil.html
*/
void
uuid_create_nil(uuid_t *u, uint32_t *status)
==== //depot/projects/ia64/lib/libc/uuid/uuid_equal.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_equal.c,v 1.1 2002/10/30 03:51:00 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_equal.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
*/
#include <string.h>
@@ -34,7 +34,6 @@
* uuid_equal() - compare for equality.
* See also:
* http://www.opengroup.org/onlinepubs/009629399/uuid_equal.htm
- * http://www.transarc.ibm.com/Library/documentation/dce/1.1/uuid_equal.html
*/
int32_t
uuid_equal(uuid_t *a, uuid_t *b, uint32_t *status)
==== //depot/projects/ia64/lib/libc/uuid/uuid_from_string.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_from_string.c,v 1.1 2002/10/30 03:51:00 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_from_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
*/
#include <stdio.h>
@@ -36,7 +36,6 @@
* a binary representation.
* See also:
* http://www.opengroup.org/onlinepubs/009629399/uuid_from_string.htm
- * http://www.transarc.ibm.com/Library/documentation/dce/1.1/uuid_from_string.html
*
* NOTE: The sequence field is in big-endian, while the time fields are in
* native byte order.
==== //depot/projects/ia64/lib/libc/uuid/uuid_hash.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_hash.c,v 1.1 2002/10/30 03:51:00 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_hash.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
*/
#include <uuid.h>
@@ -33,7 +33,6 @@
* uuid_hash() - generate a hash value.
* See also:
* http://www.opengroup.org/onlinepubs/009629399/uuid_hash.htm
- * http://www.transarc.ibm.com/Library/documentation/dce/1.1/uuid_hash.html
*/
uint16_t
uuid_hash(uuid_t *u, uint32_t *status)
==== //depot/projects/ia64/lib/libc/uuid/uuid_is_nil.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_is_nil.c,v 1.1 2002/10/30 03:51:00 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_is_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
*/
#include <uuid.h>
@@ -33,7 +33,6 @@
* uuid_is_nil() - return whether the UUID is a nil UUID.
* See also:
* http://www.opengroup.org/onlinepubs/009629399/uuid_is_nil.htm
- * http://www.transarc.ibm.com/Library/documentation/dce/1.1/uuid_is_nil.html
*/
int32_t
uuid_is_nil(uuid_t *u, uint32_t *status)
==== //depot/projects/ia64/lib/libc/uuid/uuid_to_string.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_to_string.c,v 1.1 2002/10/30 03:51:00 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_to_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
*/
#include <stdio.h>
@@ -35,7 +35,6 @@
* uuid_to_string() - Convert a binary UUID into a string representation.
* See also:
* http://www.opengroup.org/onlinepubs/009629399/uuid_to_string.htm
- * http://www.transarc.ibm.com/Library/documentation/dce/1.1/uuid_to_string.html
*
* NOTE: The references given above do not have a status code for when
* the string could not be allocated. The status code has been
==== //depot/projects/ia64/lib/libpthread/arch/alpha/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libpthread/arch/alpha/Makefile.inc,v 1.1 2003/06/23 04:28:31 marcel Exp $
+# $FreeBSD: src/lib/libpthread/arch/alpha/Makefile.inc,v 1.2 2003/08/09 05:44:27 deischen Exp $
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-SRCS+= ksd.c thr_enter_uts.S thr_getcontext.S thr_switch.S
+SRCS+= enter_uts.S context.S pthread_md.c
==== //depot/projects/ia64/lib/libpthread/support/Makefile.inc#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.4 2003/07/02 20:52:39 ru Exp $
+# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.5 2003/08/08 03:41:13 kan Exp $
.PATH: ${.CURDIR}/support
@@ -6,4 +6,4 @@
CLEANFILES+= thr_support.So
thr_libc.So: thr_support.So
- ${CC} -nostdlib -o ${.TARGET} -Wl,-r thr_support.So -lc_pic
+ ${CC} -nostdlib -o ${.TARGET} -r thr_support.So -lc_pic
==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#28 (text+ko) ====
@@ -33,7 +33,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.82 2003/08/06 00:43:28 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.83 2003/08/08 22:20:59 davidxu Exp $");
#include <sys/types.h>
#include <sys/kse.h>
@@ -66,15 +66,22 @@
* Define a high water mark for the maximum number of threads that
* will be cached. Once this level is reached, any extra threads
* will be free()'d.
- *
- * XXX - It doesn't make sense to worry about the maximum number of
- * KSEs that we can cache because the system will limit us to
- * something *much* less than the maximum number of threads
- * that we can have. Disregarding KSEs in their own group,
- * the maximum number of KSEs is the number of processors in
- * the system.
*/
#define MAX_CACHED_THREADS 100
+/*
+ * Define high water marks for the maximum number of KSEs and KSE groups
+ * that will be cached. Because we support 1:1 threading, there could have
+ * same number of KSEs and KSE groups as threads. Once these levels are
+ * reached, any extra KSE and KSE groups will be free()'d.
+ */
+#ifdef SYSTEM_SCOPE_ONLY
+#define MAX_CACHED_KSES 100
+#define MAX_CACHED_KSEGS 100
+#else
+#define MAX_CACHED_KSES 50
+#define MAX_CACHED_KSEGS 50
+#endif
+
#define KSE_STACKSIZE 16384
#define KSE_SET_MBOX(kse, thrd) \
@@ -136,9 +143,11 @@
static void kse_switchout_thread(struct kse *kse, struct pthread *thread);
static void kse_wait(struct kse *kse, struct pthread *td_wait, int sigseq);
static void kse_free_unlocked(struct kse *kse);
+static void kse_destroy(struct kse *kse);
static void kseg_free_unlocked(struct kse_group *kseg);
static void kseg_init(struct kse_group *kseg);
static void kseg_reinit(struct kse_group *kseg);
+static void kseg_destroy(struct kse_group *kseg);
static void kse_waitq_insert(struct pthread *thread);
static void kse_wakeup_multi(struct kse *curkse);
static struct kse_mailbox *kse_wakeup_one(struct pthread *thread);
@@ -149,7 +158,9 @@
struct pthread_sigframe *psf);
static int thr_timedout(struct pthread *thread, struct timespec *curtime);
static void thr_unlink(struct pthread *thread);
-
+static void thread_gc(struct pthread *thread);
+static void kse_gc(struct pthread *thread);
+static void kseg_gc(struct pthread *thread);
static __inline void
kse_set_curthread(struct kse *kse, struct pthread *td)
@@ -1248,6 +1259,14 @@
void
_thr_gc(struct pthread *curthread)
{
+ thread_gc(curthread);
+ kse_gc(curthread);
+ kseg_gc(curthread);
+}
+
+static void
+thread_gc(struct pthread *curthread)
+{
struct pthread *td, *td_next;
kse_critical_t crit;
TAILQ_HEAD(, pthread) worklist;
@@ -1317,10 +1336,61 @@
} else
DBG_MSG("Initial thread won't be freed\n");
}
- /* XXX free kse and ksegrp list should be looked as well */
+}
+
+static void
+kse_gc(struct pthread *curthread)
+{
+ kse_critical_t crit;
+ TAILQ_HEAD(, kse) worklist;
+ struct kse *kse;
+
+ if (free_kse_count <= MAX_CACHED_KSES)
+ return;
+ TAILQ_INIT(&worklist);
+ crit = _kse_critical_enter();
+ KSE_LOCK_ACQUIRE(curthread->kse, &kse_lock);
+ while (free_kse_count > MAX_CACHED_KSES) {
+ kse = TAILQ_FIRST(&free_kseq);
+ TAILQ_REMOVE(&free_kseq, kse, k_qe);
+ TAILQ_INSERT_HEAD(&worklist, kse, k_qe);
+ free_kse_count--;
+ }
+ KSE_LOCK_RELEASE(curthread->kse, &kse_lock);
+ _kse_critical_leave(crit);
+
+ while ((kse = TAILQ_FIRST(&worklist))) {
+ TAILQ_REMOVE(&worklist, kse, k_qe);
+ kse_destroy(kse);
+ }
}
+static void
+kseg_gc(struct pthread *curthread)
+{
+ kse_critical_t crit;
+ TAILQ_HEAD(, kse_group) worklist;
+ struct kse_group *kseg;
+ if (free_kseg_count <= MAX_CACHED_KSEGS)
+ return;
+ crit = _kse_critical_enter();
+ KSE_LOCK_ACQUIRE(curthread->kse, &kse_lock);
+ while (free_kseg_count > MAX_CACHED_KSEGS) {
+ kseg = TAILQ_FIRST(&free_kse_groupq);
+ TAILQ_REMOVE(&free_kse_groupq, kseg, kg_qe);
+ free_kseg_count--;
+ TAILQ_INSERT_HEAD(&worklist, kseg, kg_qe);
+ }
+ KSE_LOCK_RELEASE(curthread->kse, &kse_lock);
+ _kse_critical_leave(crit);
+
+ while ((kseg = TAILQ_FIRST(&worklist))) {
+ TAILQ_REMOVE(&worklist, kseg, kg_qe);
+ kseg_destroy(kseg);
+ }
+}
+
/*
* Only new threads that are running or suspended may be scheduled.
*/
@@ -2019,6 +2089,26 @@
return (kseg);
}
+static void
+kseg_init(struct kse_group *kseg)
+{
+ kseg_reinit(kseg);
+ _lock_init(&kseg->kg_lock, LCK_ADAPTIVE, _kse_lock_wait,
+ _kse_lock_wakeup);
+}
+
+static void
+kseg_reinit(struct kse_group *kseg)
+{
+ TAILQ_INIT(&kseg->kg_kseq);
+ TAILQ_INIT(&kseg->kg_threadq);
+ TAILQ_INIT(&kseg->kg_schedq.sq_waitq);
+ kseg->kg_threadcount = 0;
+ kseg->kg_ksecount = 0;
+ kseg->kg_idle_kses = 0;
+ kseg->kg_flags = 0;
+}
+
/*
* This must be called with the kse lock held and when there are
* no more threads that reference it.
@@ -2046,6 +2136,14 @@
_kse_critical_leave(crit);
}
+static void
+kseg_destroy(struct kse_group *kseg)
+{
+ _lock_destroy(&kseg->kg_lock);
+ _pq_free(&kseg->kg_schedq.sq_runq);
+ free(kseg);
+}
+
/*
* Allocate a new KSE.
*
@@ -2193,7 +2291,6 @@
kse->k_kcb->kcb_kmbx.km_quantum = 20000;
kse->k_flags = 0;
TAILQ_INSERT_HEAD(&free_kseq, kse, k_qe);
- _kcb_dtor(kse->k_kcb);
free_kse_count++;
}
@@ -2214,23 +2311,17 @@
}
static void
-kseg_init(struct kse_group *kseg)
+kse_destroy(struct kse *kse)
{
- kseg_reinit(kseg);
- _lock_init(&kseg->kg_lock, LCK_ADAPTIVE, _kse_lock_wait,
- _kse_lock_wakeup);
-}
+ int i;
-static void
-kseg_reinit(struct kse_group *kseg)
-{
- TAILQ_INIT(&kseg->kg_kseq);
- TAILQ_INIT(&kseg->kg_threadq);
- TAILQ_INIT(&kseg->kg_schedq.sq_waitq);
- kseg->kg_threadcount = 0;
- kseg->kg_ksecount = 0;
- kseg->kg_idle_kses = 0;
- kseg->kg_flags = 0;
+ if (kse->k_stack.ss_sp != NULL)
+ free(kse->k_stack.ss_sp);
+ _kcb_dtor(kse->k_kcb);
+ for (i = 0; i < MAX_KSE_LOCKLEVEL; ++i)
+ _lockuser_destroy(&kse->k_lockusers[i]);
+ _lock_destroy(&kse->k_lock);
+ free(kse);
}
struct pthread *
==== //depot/projects/ia64/release/Makefile#68 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.815 2003/08/07 18:22:34 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.816 2003/08/08 21:00:57 ru Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -201,12 +201,11 @@
NO_FLOPPIES=
.elif ${TARGET_ARCH} == "sparc64"
DISKLABEL= sunlabel
-BIGBOOTSIZE= 4096
MFSSIZE= 4096
-BOOTINODE= 8192
MFSINODE= 8192
-BIGBOOTLABEL= auto
MFSLABEL= auto
+MINIROOT=
+NO_FLOPPIES=
.elif ${TARGET_ARCH} == "ia64"
MFSINODE= 8192
MFSLABEL= auto
@@ -249,7 +248,7 @@
# Where the bootstrap ports (see DOCPORTS) get installed.
LOCALDIR= /usr/local/bin
-.if ${TARGET} != ${MACHINE}
+.if ${TARGET} != ${MACHINE} && ${DISKLABEL} == "bsdlabel"
DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ${TARGET}
.else
DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ""
@@ -884,6 +883,12 @@
@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf
.if defined(CD_BOOT)
@cp -Rp ${CD_DISC2}/boot ${CD_BOOT}
+.if defined(MINIROOT)
+ @mkdir -p ${FD}/miniroot
+ @sh -e ${DOFS_SH} ${FD}/miniroot/miniroot.ufs \
+ ${RD} ${MNT} 0 ${CD_BOOT} 8192 auto
+ @gzip -9v ${FD}/miniroot/miniroot.ufs
+.endif
.endif
@cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
.if ${TARGET} == "i386" && defined(EMUL_BOOT) && !defined(NO_FLOPPIES)
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#115 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.609 2003/08/04 15:26:40 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.610 2003/08/08 15:59:34 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -201,6 +201,10 @@
<para arch="i386,pc98,sparc64">The &man.patm.4; driver has been added to
support IDT77252 based ATM interfaces.</para>
+ <para>The &man.rl.4; driver now has support for the RealTek
+ 8139C+ Fast Ethernet chipset and the RealTek 8169 Gigabit
+ Ethernet chip.</para>
+
<para>The suspend/resume support for the &man.wi.4; driver
now works correctly when the device is configured down.
&merged;</para>
@@ -240,6 +244,9 @@
<sect3 id="disks">
<title>Disks and Storage</title>
+ <para>&man.ccd.4; can now operate on raw disks and other
+ &man.geom.4; providers.</para>
+
<para>The &man.da.4; driver no longer tries to send 6-byte
commands to USB and Firewire devices. The quirks for these
devices (which hopefully are now unnecessary) have been
@@ -287,6 +294,9 @@
<sect2 id="userland">
<title>Userland Changes</title>
+ <para>&man.acpidb.8;, an ACPI DSDT debugger, has been
+ added.</para>
+
<para>&man.arp.8; now supports a <option>-i</option> option
to limit the scope of the current operation to the ARP entries
on a particular interface. This option applies to the display
@@ -306,6 +316,10 @@
polling interval can be controlled with the <option>-i</option>
option.</para>
+ <para>The &man.iasl.8; utility, a compiler/decompiler for ACPI
+ Source Language (ASL) and ACPI Machine language (AML), has been
+ added.</para>
+
<para>&man.ipfw.8; <literal>list</literal> and <literal>show</literal>
command now support ranges of rule numbers.
&merged;</para>
==== //depot/projects/ia64/release/scripts/doFS.sh#18 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/scripts/doFS.sh,v 1.52 2003/05/17 19:16:28 ru Exp $
+# $FreeBSD: src/release/scripts/doFS.sh,v 1.53 2003/08/08 18:23:00 ru Exp $
#
set -ex
@@ -18,6 +18,18 @@
FSLABEL=$1 ; shift
#
+# If we've been told to, compute the required file system size
+# and average inode size automatically.
+#
+if [ ${FSSIZE} -eq 0 -a ${FSLABEL} = "auto" ]; then
+ roundup() echo $((($1+$2-1)-($1+$2-1)%$2))
+ nf=$(find ${FSPROTO} |wc -l)
+ sk=$(du -sk ${FSPROTO} |cut -f1)
+ FSINODE=$(roundup $(($sk*1024/$nf)) ${FSINODE})
+ FSSIZE=$(roundup $(($sk*12/10)) 1024)
+fi
+
+#
# We don't have any bootblocks on ia64. Note that -B implies -r,
# so we have to specifically specify -r when we don't have -B.
# bsdlabel fails otherwise.
==== //depot/projects/ia64/sbin/comcontrol/Makefile#4 (text+ko) ====
@@ -1,7 +1,8 @@
# @(#)Makefile 5.4 (Berkeley) 6/5/91
-# $FreeBSD: src/sbin/comcontrol/Makefile,v 1.6 2003/02/23 13:25:02 johan Exp $
+# $FreeBSD: src/sbin/comcontrol/Makefile,v 1.7 2003/08/08 19:51:01 johan Exp $
PROG= comcontrol
MAN= comcontrol.8
+WARNS?= 6
.include <bsd.prog.mk>
==== //depot/projects/ia64/sbin/comcontrol/comcontrol.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.13 2003/05/03 18:41:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.14 2003/08/08 19:51:01 johan Exp $");
#include <ctype.h>
#include <err.h>
@@ -40,6 +40,8 @@
#include <sys/types.h>
#include <sys/ioctl.h>
+static void usage(void);
+
static void
usage()
{
==== //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.8#5 (text+ko) ====
@@ -28,7 +28,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/sbin/mount_msdosfs/mount_msdosfs.8,v 1.24 2002/08/21 18:11:00 trhodes Exp $
+.\" $FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.8,v 1.26 2003/08/09 04:21:18 bms Exp $
.\"
.Dd April 7, 1994
.Dt MOUNT_MSDOSFS 8
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list