Date: Fri, 23 May 2003 13:49:22 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31725 for review Message-ID: <200305232049.h4NKnMkS087823@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=31725 Change 31725 by peter@peter_daintree on 2003/05/23 13:48:39 IFC @31722 Affected files ... .. //depot/projects/hammer/lib/libthr/Makefile#2 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_autoinit.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_printf.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#3 integrate .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/release.dsl#4 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.dsl#2 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#8 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#10 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#18 integrate Differences ... ==== //depot/projects/hammer/lib/libthr/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.2 2003/04/01 07:07:38 jeff Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.3 2003/05/23 09:48:20 mtm Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -20,6 +20,8 @@ AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread PRECIOUSLIB= yes +WARNS?= 2 + .include "${.CURDIR}/thread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#4 (text+ko) ==== @@ -23,7 +23,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/arch/i386/i386/_setcurthread.c,v 1.5 2003/05/21 08:21:24 mtm Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.6 2003/05/23 09:48:20 mtm Exp $ */ #include <sys/types.h> @@ -31,6 +31,8 @@ #include <pthread.h> #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <machine/sysarch.h> #include <machine/segments.h> @@ -48,6 +50,9 @@ static void ldt_init(void); +/* in _curthread.S */ +extern void _set_gs(int); + /* * Initialize the array of ldt_entries and the next free slot. * This routine must be called with the global ldt lock held. ==== //depot/projects/hammer/lib/libthr/thread/thr_autoinit.c#2 (text+ko) ==== @@ -30,9 +30,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_autoinit.c,v 1.1 2003/04/01 03:46:28 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_autoinit.c,v 1.2 2003/05/23 09:48:20 mtm Exp $ */ +#include <pthread.h> + +#include "thr_private.h" + /* * This module uses GCC extentions to initialize the * threads package at program start-up time. ==== //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#3 (text+ko) ==== @@ -1,9 +1,10 @@ /* * David Leonard <d@openbsd.org>, 1999. Public domain. - * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.3 2003/05/15 17:56:18 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.4 2003/05/23 09:48:20 mtm Exp $ */ #include <sys/errno.h> #include <pthread.h> +#include <stdlib.h> #include "thr_private.h" /* ==== //depot/projects/hammer/lib/libthr/thread/thr_create.c#4 (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_create.c,v 1.5 2003/05/21 03:34:54 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.6 2003/05/23 09:48:20 mtm Exp $ */ #include <errno.h> #include <stdlib.h> @@ -62,7 +62,6 @@ _pthread_create(pthread_t * thread, const pthread_attr_t * attr, void *(*start_routine) (void *), void *arg) { - struct itimerval itimer; int f_gc = 0; int ret = 0; pthread_t gc_thread; ==== //depot/projects/hammer/lib/libthr/thread/thr_detach.c#2 (text+ko) ==== @@ -29,10 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.3 2003/05/23 09:48:20 mtm Exp $ */ #include <errno.h> #include <pthread.h> +#include <stdlib.h> #include "thr_private.h" __weak_reference(_pthread_detach, pthread_detach); ==== //depot/projects/hammer/lib/libthr/thread/thr_exit.c#3 (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_exit.c,v 1.3 2003/05/21 03:29:18 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.5 2003/05/23 09:48:20 mtm Exp $ */ #include <errno.h> #include <unistd.h> @@ -42,6 +42,9 @@ __weak_reference(_pthread_exit, pthread_exit); +/* thr_exit() */ +extern int _thr_exit(void); + void _thread_exit(char *fname, int lineno, char *string) { @@ -173,7 +176,7 @@ /* If we're the last thread, call it quits */ if (TAILQ_EMPTY(&_thread_list)) - exit(curthread->ret); + exit(0); /* * Retire the architecture specific id so that it can be used for ==== //depot/projects/hammer/lib/libthr/thread/thr_init.c#3 (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_init.c,v 1.4 2003/05/21 03:22:36 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.5 2003/05/23 09:48:20 mtm Exp $ */ /* Allocate space for global thread variables here: */ @@ -158,7 +158,6 @@ { struct pthread *pthread; int fd; - int flags; int i; size_t len; int mib[2]; @@ -328,7 +327,7 @@ /* Initialise the garbage collector mutex and condition variable. */ if (_pthread_mutex_init(&_gc_mutex,NULL) != 0 || - pthread_cond_init(&_gc_cond,NULL) != 0) + _pthread_cond_init(&_gc_cond,NULL) != 0) PANIC("Failed to initialise garbage collector mutex or condvar"); } ==== //depot/projects/hammer/lib/libthr/thread/thr_kern.c#4 (text+ko) ==== @@ -23,7 +23,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_kern.c,v 1.5 2003/05/12 10:48:02 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_kern.c,v 1.7 2003/05/23 10:28:13 mtm Exp $ */ #include <sys/cdefs.h> @@ -33,6 +33,7 @@ #include <sys/timespec.h> #include <pthread.h> #include <signal.h> +#include <stdlib.h> #include <errno.h> #include <unistd.h> @@ -72,27 +73,18 @@ errno); abort(); } - - restore = sav; + curthread->savedsig = sav; } void _thread_critical_exit(pthread_t pthread) { sigset_t set; - int error; - - /* - * restore is protected by giant. We could restore our signal state - * incorrectly if someone else set restore between unlocking giant - * and restoring the signal mask. To avoid this we cache a copy prior - * to the unlock. - */ - set = restore; /* * Restore signals. */ + set = curthread->savedsig; if (__sys_sigprocmask(SIG_SETMASK, &set, NULL)) { _thread_printf(STDERR_FILENO, "Critical Exit: sig err %d\n", errno); ==== //depot/projects/hammer/lib/libthr/thread/thr_mutex.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_mutex.c,v 1.7 2003/05/21 03:41:07 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.8 2003/05/23 09:48:20 mtm Exp $ */ #include <stdlib.h> #include <errno.h> @@ -64,6 +64,7 @@ */ static int get_muncontested(pthread_mutex_t, int); static void get_mcontested(pthread_mutex_t); +static int mutex_lock_common(pthread_mutex_t *, int); static inline int mutex_self_trylock(pthread_mutex_t); static inline int mutex_self_lock(pthread_mutex_t); static inline int mutex_unlock_common(pthread_mutex_t *, int); @@ -1381,13 +1382,14 @@ static int get_muncontested(pthread_mutex_t mutexp, int nonblock) { - if (mutexp->m_owner != NULL && mutexp->m_owner != curthread) + if (mutexp->m_owner != NULL && mutexp->m_owner != curthread) { return (-1); - else if (mutexp->m_owner == curthread) + } else if (mutexp->m_owner == curthread) { if (nonblock) return (mutex_self_trylock(mutexp)); else return (mutex_self_lock(mutexp)); + } /* * The mutex belongs to this thread now. Mark it as ==== //depot/projects/hammer/lib/libthr/thread/thr_printf.c#2 (text+ko) ==== @@ -23,17 +23,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.1 2003/04/01 03:46:29 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.2 2003/05/23 09:48:20 mtm Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.1 2003/04/01 03:46:29 jeff Exp $"); +__FBSDID("$FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.2 2003/05/23 09:48:20 mtm Exp $"); #include <sys/types.h> #include <sys/fcntl.h> #include <sys/uio.h> #include <errno.h> #include <stdarg.h> +#include <string.h> #include <unistd.h> #include <pthread.h> ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.6 2003/05/12 10:48:02 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.8 2003/05/23 10:28:13 mtm Exp $ */ #ifndef _THR_PRIVATE_H @@ -425,6 +425,7 @@ char *name; u_int64_t uniqueid; /* for gdb */ thr_id_t thr_id; + sigset_t savedsig; /* * Lock for accesses to this thread structure. @@ -718,7 +719,7 @@ void _thread_cleanupspecific(void); void _thread_dump_info(void); void _thread_init(void); -void _thread_sig_wrapper(int sig, siginfo_t *info, ucontext_t *context); +void _thread_sig_wrapper(int sig, siginfo_t *info, void *context); void _thread_printf(int fd, const char *, ...); void _thread_start(void); void _thread_seterrno(pthread_t, int); ==== //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#2 (text+ko) ==== @@ -29,10 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_resume_np.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_resume_np.c,v 1.3 2003/05/23 09:48:20 mtm Exp $ */ #include <errno.h> #include <pthread.h> +#include <stdlib.h> #include "thr_private.h" static void resume_common(struct pthread *); ==== //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_setschedparam.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_setschedparam.c,v 1.4 2003/05/23 09:48:20 mtm Exp $ */ #include <errno.h> #include <sys/param.h> @@ -42,7 +42,10 @@ _pthread_setschedparam(pthread_t pthread, int policy, const struct sched_param *param) { - int old_prio, in_readyq = 0, ret = 0; + int old_prio, ret = 0; +#if 0 + int in_readyq = 0; +#endif if ((param == NULL) || (policy < SCHED_FIFO) || (policy > SCHED_RR)) return (EINVAL); ==== //depot/projects/hammer/lib/libthr/thread/thr_sig.c#4 (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_sig.c,v 1.5 2003/05/12 10:50:18 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.6 2003/05/23 09:48:20 mtm Exp $ */ #include <sys/param.h> @@ -113,7 +113,7 @@ * User thread signal handler wrapper. */ void -_thread_sig_wrapper(int sig, siginfo_t *info, ucontext_t *context) +_thread_sig_wrapper(int sig, siginfo_t *info, void *context) { struct pthread_state_data psd; __siginfohandler_t *handler; @@ -149,7 +149,7 @@ GIANT_UNLOCK(curthread); handler = (__siginfohandler_t *) _thread_sigact[sig - 1].sa_handler; - handler(sig, info, context); + handler(sig, info, (ucontext_t *)context); GIANT_LOCK(curthread); } ==== //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.1 2003/04/01 03:46:29 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.2 2003/05/23 09:48:20 mtm Exp $ */ /* @@ -90,6 +90,16 @@ #include "thr_private.h" +extern int __creat(const char *, mode_t); +extern int __sleep(unsigned int); +extern int __sys_nanosleep(const struct timespec *, struct timespec *); +extern int __sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); +extern int __system(const char *); +extern int __tcdrain(int); +extern pid_t __wait(int *); +extern pid_t _wait4(pid_t, int *, int, struct rusage *); +extern pid_t __waitpid(pid_t, int *, int); + __weak_reference(_aio_suspend, aio_suspend); int ==== //depot/projects/hammer/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl#4 (text+ko) ==== @@ -1,5 +1,5 @@ <!-- - $FreeBSD: src/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.5 2002/10/14 11:04:26 ue Exp $ + $FreeBSD: src/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.6 2003/05/23 10:30:27 hrs Exp $ $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.8 2002/10/13 16:40:33 ue Exp $ basiert auf: 1.6 --> @@ -15,6 +15,9 @@ <style-specification-body> <![ %output.html; [ + <!-- Generate links to HTML man pages --> + (define %refentry-xref-link% #t) + (define ($email-footer$) (make sequence (make element gi: "p" @@ -53,36 +56,8 @@ (create-link (list (list "HREF" "mailto:de-bsd-translators@de.FreeBSD.org")) (literal "de-bsd-translators@de.FreeBSD.org")) (literal ">.")))))) - - <!-- Convert " ... " to `` ... '' in the HTML output. --> - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - - <!-- Generate links to HTML man pages --> - (define %refentry-xref-link% #t) - - <!-- Specify how to generate the man page link HREF --> - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0")) - (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) - (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) - (else (string-append u "&" "manpath=FreeBSD+5.0-current"))))) ]]> - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - </style-specification-body> </style-specification> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ <!-- - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.9 2003/04/25 18:51:29 jake Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.11 2003/05/23 17:27:32 bmah Exp $ --> <sect1 id="proc"> <title>Supported Processors and Motherboards</title> @@ -65,4 +65,31 @@ work around hardware bugs or other oddities. When in doubt, a search of the archives of the &a.mobile; may be useful.</para> + <para>Most modern laptops (as well as many desktops) use the + Advanced Configuration and Power Management (ACPI) standard. &os; + supports ACPI via the ACPI Component Architecture reference + implementation from Intel, as described in the &man.acpi.4; manual + page. The use of ACPI causes instabilities on some machines and it + may be necessary to disable the ACPI driver, which is normally + loaded via a kernel module. This may be accomplished by adding + the following line to <filename>/boot/device.hints</filename>:</para> + + <programlisting>hint.acpi.0.disabled="1"</programlisting> + + <para>Users debugging ACPI-related problems may find it useful to + disable portions of the ACPI functionality. The &man.acpi.4; + manual page has more information on how to do this via loader + tunables.</para> + + <para>ACPI depends on a Differentiated System Descriptor Table + (DSDT) provided by each machine's BIOS. Some machines have bad or + incomplete DSDTs, which prevents ACPI from functioning correctly. + Replacement DSDTs for some machines can be found at the <ulink + url="http://acpi.sourceforge.net/dsdt/index.php">DSDT</ulink>; + section of the <ulink + url="http://acpi.sourceforge.net/">ACPI4Linux</ulink>; project Web + site. &os; can use these DSDTs to override the DSDT provided by + the BIOS; see the &man.acpi.4; manual page for more + information.</para> + </sect1> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 (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.570 2003/05/23 00:02:10 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.571 2003/05/23 20:10:46 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -814,10 +814,19 @@ <para arch="i386,pc98">The <filename>libkse</filename> library, providing POSIX threading support using KSE, is now enabled and - installed by default. It is still considered a + installed by default. + This library currently supports M:N threading. Both process and + system scope threads are supported, as well as getting/setting + the concurrency level. By default, the library sets the + concurrency level to the number of CPUs in the system. Each + concurrency level correlates to a KSE, and all process scope + threads run in these KSEs. Each system scope thread gets its + own KSE in addition to those corresponding to concurrency levels. + <filename>libkse</filename> is still considered a work-in-progress, and is not used by default. However, it can be used as a replacement for the <filename>libc_r</filename> - thread library.</para> + thread library, by substituting <option>-lkse</option> instead of + <option>-pthread</option> when linking programs.</para> <para arch="i386,pc98,sparc64,ia64">A 1:1 threading package (where for every pthread in an application there is one KSE and thread) has been implemented. ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#3 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/share/sgml/release.dsl,v 1.6 2002/08/30 02:52:14 bmah Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/share/sgml/release.dsl,v 1.7 2003/05/23 10:30:27 hrs Exp $ --> <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ <!ENTITY release.dsl PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN" CDATA DSSSL> @@ -11,6 +11,9 @@ <style-specification-body> <![ %output.html; [ + <!-- Generate links to HTML man pages --> + (define %refentry-xref-link% #t) + (define ($email-footer$) (make sequence (make element gi: "p" @@ -49,36 +52,8 @@ (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) (literal "doc@FreeBSD.org")) (literal ">.")))))) - - <!-- Convert " ... " to `` ... '' in the HTML output. --> - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - - <!-- Generate links to HTML man pages --> - (define %refentry-xref-link% #t) - - <!-- Specify how to generate the man page link HREF --> - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0")) - (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) - (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) - (else (string-append u "&" "manpath=FreeBSD+5.0-current"))))) ]]> - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - </style-specification-body> </style-specification> ==== //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#4 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD French Documentation Project $Id$ - $FreeBSD: src/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl,v 1.5 2002/10/19 16:26:33 gioria Exp $ + $FreeBSD: src/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl,v 1.6 2003/05/23 10:30:27 hrs Exp $ Original revision: 1.6 --> @@ -18,6 +18,9 @@ <style-specification-body> <![ %output.html; [ + <!-- Generate links to HTML man pages --> + (define %refentry-xref-link% #t) + (define ($email-footer$) (make sequence (make element gi: "p" @@ -56,36 +59,8 @@ (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) (literal "doc@FreeBSD.org")) (literal ">.")))))) - - <!-- Convert " ... " to `` ... '' in the HTML output. --> - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - - <!-- Generate links to HTML man pages --> - (define %refentry-xref-link% #t) - - <!-- Specify how to generate the man page link HREF --> - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0")) - (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) - (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) - (else (string-append u "&" "manpath=FreeBSD+5.0-current"))))) ]]> - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - </style-specification-body> </style-specification> ==== //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/release.dsl#4 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/release.dsl,v 1.9 2002/11/30 02:56:52 hrs Exp $ --> +<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/release.dsl,v 1.10 2003/05/23 10:30:27 hrs Exp $ --> <!-- Original revision: 1.6 --> <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ @@ -12,6 +12,9 @@ <style-specification-body> <![ %output.html; [ + <!-- Generate links to HTML man pages --> + (define %refentry-xref-link% #t) + (define ($email-footer$) (make sequence (make element gi: "p" @@ -55,37 +58,7 @@ (create-link (list (list "HREF" "http://www.jp.FreeBSD.org/ml.html#doc-jp")) (literal "doc-jp@jp.FreeBSD.org")) (literal "> まで電子メールでお願いします。")))))) - - - <!-- Convert " ... " to `` ... '' in the HTML output. --> - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - - <!-- Generate links to HTML man pages --> - (define %refentry-xref-link% #t) - - <!-- Specify how to generate the man page link HREF --> - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0")) - (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) - (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) - (else (string-append u "&" "manpath=FreeBSD+5.0-current"))))) ]]> - - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - </style-specification-body> </style-specification> ==== //depot/projects/hammer/release/doc/share/sgml/release.dsl#2 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.6 2002/06/20 21:19:49 bmah Exp $ --> +<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.7 2003/05/23 10:30:27 hrs Exp $ --> <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ <!ENTITY % output.html "IGNORE"> @@ -6,6 +6,8 @@ <!ENTITY % include.historic "IGNORE"> <!ENTITY % no.include.historic "IGNORE"> <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL> +<!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> +%release.ent; ]> <style-sheet> @@ -111,11 +113,35 @@ (define %callout-graphics% ;; Use graphics in callouts? #f) + + <!-- Convert " ... " to `` ... '' in the HTML output. --> + (element quote + (make sequence + (literal "``") + (process-children) + (literal "''"))) + + <!-- Specify how to generate the man page link HREF --> + (define ($create-refentry-xref-link$ #!optional (n (current-node))) + (let* ((r (select-elements (children n) (normalize "refentrytitle"))) + (m (select-elements (children n) (normalize "manvolnum"))) + (v (attribute-string (normalize "vendor") n)) + (u (string-append "&release.man.url;?query=" + (data r) "&" "sektion=" (data m)))) + (case v + (("xfree86") (string-append u "&" "manpath=XFree86+&release.manpath.xfree86;" )) + (("netbsd") (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;")) + (("ports") (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;")) + (else (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd;"))))) ]]> + (define (toc-depth nd) + (if (string=? (gi nd) (normalize "book")) + 3 + 3)) + </style-specification-body> </style-specification> <external-specification id="docbook" document="freebsd.dsl"> </style-sheet> - ==== //depot/projects/hammer/release/doc/share/sgml/release.ent#4 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- -*- sgml -*- - $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.10 2003/05/06 21:30:16 bmah Exp $ + $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.11 2003/05/23 10:30:27 hrs Exp $ OS Release Information --> @@ -37,6 +37,13 @@ <!ENTITY % release.type.snapshot "INCLUDE"> <!ENTITY % release.type.release "IGNORE"> +<!-- The manpaths for man page references --> +<!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">; +<!ENTITY release.manpath.xfree86 "4.2.0"> +<!ENTITY release.manpath.netbsd "1.5"> +<!ENTITY release.manpath.freebsd-ports "Ports"> +<!ENTITY release.manpath.freebsd "5.0-current"> + <!-- Text constants which probably don't need to be changed.--> <!-- Name of our OS. This is almost certainly going to remain ==== //depot/projects/hammer/sbin/bsdlabel/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.17 2003/05/17 19:06:45 ru Exp $ +# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.18 2003/05/23 06:08:28 peter Exp $ .PATH: ${.CURDIR}/../../sys/geom @@ -8,7 +8,8 @@ #MAN= bsdlabel.5 MAN+= bsdlabel.8 -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || \ + ${MACHINE_ARCH} == "amd64" LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel MLINKS= bsdlabel.8 disklabel.8 .endif ==== //depot/projects/hammer/sys/amd64/include/pmap.h#14 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.102 2003/05/23 05:04:54 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.103 2003/05/23 06:35:45 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/hammer/sys/amd64/include/reg.h#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/reg.h,v 1.30 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/reg.h,v 1.31 2003/05/23 06:31:56 peter Exp $ */ #ifndef _MACHINE_REG_H_ ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#10 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.37 2003/05/23 05:04:54 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.38 2003/05/23 06:36:46 peter Exp $ */ @@ -79,7 +79,7 @@ #define MAXSLP 20 /* - * We provide a machine specific single page allocator through the tuse + * We provide a machine specific single page allocator through the use * of the direct mapped segment. This uses 2MB pages for reduced * TLB pressure. */ ==== //depot/projects/hammer/sys/kern/vfs_subr.c#18 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.449 2003/05/16 19:46:51 truckman Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.450 2003/05/23 19:54:02 alc Exp $ */ /* @@ -71,6 +71,7 @@ #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_page.h> +#include <vm/vm_kern.h> #include <vm/uma.h> static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); @@ -458,7 +459,15 @@ vntblinit(void *dummy __unused) { - desiredvnodes = maxproc + cnt.v_page_count / 4; + /* + * Desiredvnodes is a function of the physical memory size and + * the kernel's heap size. Specifically, desiredvnodes scales + * in proportion to the physical memory size until two fifths + * of the kernel's heap size is consumed by vnodes and vm + * objects. + */ + desiredvnodes = min(maxproc + cnt.v_page_count / 4, 2 * vm_kmem_size / + (5 * (sizeof(struct vm_object) + sizeof(struct vnode)))); minvnodes = desiredvnodes / 4; mtx_init(&mountlist_mtx, "mountlist", NULL, MTX_DEF); mtx_init(&mntvnode_mtx, "mntvnode", NULL, MTX_DEF);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305232049.h4NKnMkS087823>