PERFORCE change 57339 for review
David Xu
davidxu at FreeBSD.org
Wed Jul 14 04:49:50 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=57339
Change 57339 by davidxu at davidxu_alona on 2004/07/14 11:49:37
IFC @57334
Affected files ...
.. //depot/projects/davidxu_ksedbg/src/bin/expr/expr.1#3 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex.3#5 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/alpha/include/pthread_md.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/sparc64/include/pthread_md.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/pthread.map#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_exit.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#7 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_priority_queue.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#8 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_sig.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_spec.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/concat/gconcat.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/label/glabel.8#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/nop/gnop.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/stripe/gstripe.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/kldunload/kldunload.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/kldunload/kldunload.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/dict/freebsd#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man9/module.9#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/pmap.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/alpha/include/ptrace.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/db_interface.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/db_trace.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/bus_memio.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/bus_pio.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/db_machdep.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/frame.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/kdb.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/pcb.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/include/setjmp.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/coda/coda_vfsops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/files#7 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/files.i386#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/files.powerpc#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_battery.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pci.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpivar.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7770.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/dcons/dcons.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_isa.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_pccard.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdcvar.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/mpt/mpt_debug.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/portalfs/portal_vfsops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/stripe/g_stripe.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/OLDCARD#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_event.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_module.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/link_elf.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/sched_4bsd.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#12 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/dcons/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/firewire/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/firewire/fwip/Makefile#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/modules/usb/Makefile#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/net/if_sl.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/aarp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/at_rmx.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_input.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_pcb.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_pcb.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_usrreq.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_var.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netipx/spx_usrreq.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/i386/machdep.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/clock.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fd.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fdc_cbus.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fdcvar.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/db_machdep.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/kdb.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/pcb.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/db_trace.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/locore.S#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/machdep.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/trap.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/trap_subr.S#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/machdep.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/event.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/eventvar.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/linker.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/module.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#8 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#7 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/signalvar.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/socketvar.h#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/gcore/elfcore.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/nl/nl.1#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/nl/nl.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/compile.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/defs.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/misc.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/process.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/sed.1#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/read.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tr/cmap.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tr/cset.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tr/cset.h#2 integrate
Differences ...
==== //depot/projects/davidxu_ksedbg/src/bin/expr/expr.1#3 (text+ko) ====
@@ -28,9 +28,9 @@
.\" (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/bin/expr/expr.1,v 1.24 2004/07/03 02:03:44 tjr Exp $
+.\" $FreeBSD: src/bin/expr/expr.1,v 1.25 2004/07/12 10:46:55 tjr Exp $
.\"
-.Dd July 3, 2004
+.Dd July 12, 2004
.Dt EXPR 1
.Os
.Sh NAME
@@ -261,7 +261,3 @@
The
.Fl e
flag is an extension.
-.Sh BUGS
-The
-.Nm
-utility does not recognize multibyte characters.
==== //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#4 (text+ko) ====
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD: src/contrib/top/commands.c,v 1.8 2004/07/12 03:00:50 alfred Exp $
+ * $FreeBSD: src/contrib/top/commands.c,v 1.9 2004/07/12 15:22:44 alfred Exp $
*/
/*
@@ -70,10 +70,10 @@
fputs("\
d - change number of displays to show\n\
e - list errors generated by last \"kill\" or \"renice\" command\n\
-i - toggle the displaying of idle processes\n\
+i or I - toggle the displaying of idle processes\n\
H - toggle the displaying of threads\n\
-I - same as 'i'\n\
k - kill processes; send a signal to a list of processes\n\
+m - toggle the display between 'cpu' and 'io' modes\n\
n or # - change number of processes to display\n", stdout);
#ifdef ORDER
if (displaymode == DISP_CPU)
@@ -87,6 +87,7 @@
r - renice a process\n\
s - change number of seconds to delay between updates\n\
S - toggle the displaying of system processes\n\
+t - toggle the display of this process\n\
u - display processes for only one user (+ selects all users)\n\
\n\
\n", stdout);
==== //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex.3#5 (text+ko) ====
@@ -34,7 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)regex.3 8.4 (Berkeley) 3/20/94
-.\" $FreeBSD: src/lib/libc/regex/regex.3,v 1.16 2004/07/12 06:07:26 tjr Exp $
+.\" $FreeBSD: src/lib/libc/regex/regex.3,v 1.17 2004/07/12 11:03:42 tjr Exp $
.\"
.Dd July 12, 2004
.Dt REGEX 3
@@ -727,5 +727,3 @@
.Pp
The implementation of word-boundary matching is a bit of a kludge,
and bugs may lurk in combinations of word-boundary matching and anchoring.
-.Pp
-The current implementation does not recognize multibyte characters.
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/alpha/include/pthread_md.h#2 (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/libpthread/arch/alpha/include/pthread_md.h,v 1.3 2003/09/26 06:53:54 marcel Exp $
+ * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.4 2004/07/13 22:54:22 davidxu Exp $
*/
#ifndef _PTHREAD_MD_H_
@@ -218,14 +218,27 @@
static __inline int
_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
{
+ extern int _libkse_debug;
+
_tcb_set(kcb, tcb);
- if (setmbox != 0)
- _alpha_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext,
- (intptr_t)&tcb->tcb_tmbx,
- (intptr_t *)&kcb->kcb_kmbx.km_curthread);
- else
- _alpha_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext,
- 0, NULL);
+ if (_libkse_debug == 0) {
+ tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp;
+ if (setmbox != 0)
+ _alpha_restore_context(
+ &tcb->tcb_tmbx.tm_context.uc_mcontext,
+ (intptr_t)&tcb->tcb_tmbx,
+ (intptr_t *)&kcb->kcb_kmbx.km_curthread);
+ else
+ _alpha_restore_context(
+ &tcb->tcb_tmbx.tm_context.uc_mcontext,
+ 0, NULL);
+ } else {
+ if (setmbox)
+ kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX);
+ else
+ kse_switchin(&tcb->tcb_tmbx, 0);
+ }
+
/* We should not reach here. */
return (-1);
}
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#3 (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/libpthread/arch/amd64/include/pthread_md.h,v 1.5 2003/10/23 06:12:57 peter Exp $
+ * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.6 2004/07/13 22:54:22 davidxu Exp $
*/
/*
* Machine-dependent thread prototypes/definitions for the thread kernel.
@@ -236,22 +236,22 @@
_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
{
extern int _libkse_debug;
- mcontext_t *mc;
if ((kcb == NULL) || (tcb == NULL))
return (-1);
kcb->kcb_curtcb = tcb;
- mc = &tcb->tcb_tmbx.tm_context.uc_mcontext;
if (_libkse_debug == 0) {
tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp;
if (setmbox != 0)
- _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext,
- (intptr_t)&tcb->tcb_tmbx,
- (intptr_t *)&kcb->kcb_kmbx.km_curthread);
+ _amd64_restore_context(
+ &tcb->tcb_tmbx.tm_context.uc_mcontext,
+ (intptr_t)&tcb->tcb_tmbx,
+ (intptr_t *)&kcb->kcb_kmbx.km_curthread);
else
- _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext,
- 0, NULL);
+ _amd64_restore_context(
+ &tcb->tcb_tmbx.tm_context.uc_mcontext,
+ 0, NULL);
/* We should not reach here. */
} else {
if (setmbox)
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/arm/include/pthread_md.h#2 (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/libpthread/arch/arm/include/pthread_md.h,v 1.1 2004/05/14 12:21:29 cognet Exp $
+ * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.3 2004/07/14 00:58:53 davidxu Exp $
*/
/*
@@ -227,15 +227,25 @@
static __inline int
_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
{
+ extern int _libkse_debug;
mcontext_t *mc;
_tcb_set(kcb, tcb);
mc = &tcb->tcb_tmbx.tm_context.uc_mcontext;
- if (setmbox)
- _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx,
- (intptr_t *)&kcb->kcb_kmbx.km_curthread);
- else
- _thr_setcontext(mc, 0, NULL);
+ if (_libkse_debug == 0) {
+ tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp;
+ if (setmbox)
+ _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx,
+ (intptr_t *)&kcb->kcb_kmbx.km_curthread);
+ else
+ _thr_setcontext(mc, 0, NULL);
+ } else {
+ if (setmbox)
+ kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX);
+ else
+ kse_switchin(&tcb->tcb_tmbx, 0);
+ }
+
/* We should not reach here. */
return (-1);
}
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#3 (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/libpthread/arch/i386/include/pthread_md.h,v 1.7 2003/09/19 23:28:13 marcel Exp $
+ * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.8 2004/07/13 22:54:23 davidxu Exp $
*/
/*
* Machine-dependent thread prototypes/definitions for the thread kernel.
@@ -238,12 +238,10 @@
_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
{
extern int _libkse_debug;
- mcontext_t *mc;
if ((kcb == NULL) || (tcb == NULL))
return (-1);
kcb->kcb_curtcb = tcb;
- mc = &tcb->tcb_tmbx.tm_context.uc_mcontext;
if (_libkse_debug == 0) {
tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp;
if (setmbox != 0)
@@ -253,7 +251,6 @@
else
_thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext,
0, NULL);
- /* We should not reach here. */
} else {
if (setmbox)
kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX);
@@ -261,6 +258,7 @@
kse_switchin(&tcb->tcb_tmbx, 0);
}
+ /* We should not reach here. */
return (-1);
}
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/sparc64/include/pthread_md.h#2 (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/libpthread/arch/sparc64/include/pthread_md.h,v 1.1 2003/10/09 02:32:28 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/arch/sparc64/include/pthread_md.h,v 1.2 2004/07/13 22:54:23 davidxu Exp $
*/
/*
@@ -227,15 +227,25 @@
static __inline int
_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
{
+ extern int _libkse_debug;
mcontext_t *mc;
_tcb_set(kcb, tcb);
mc = &tcb->tcb_tmbx.tm_context.uc_mcontext;
- if (setmbox)
- _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx,
- (intptr_t *)&kcb->kcb_kmbx.km_curthread);
- else
- _thr_setcontext(mc, 0, NULL);
+ if (_libkse_debug == 0) {
+ tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp;
+ if (setmbox)
+ _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx,
+ (intptr_t *)&kcb->kcb_kmbx.km_curthread);
+ else
+ _thr_setcontext(mc, 0, NULL);
+ } else {
+ if (setmbox)
+ kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX);
+ else
+ kse_switchin(&tcb->tcb_tmbx, 0);
+ }
+
/* We should not reach here. */
return (-1);
}
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/pthread.map#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/pthread.map,v 1.10 2004/02/10 05:36:09 deischen Exp $
+# $FreeBSD: src/lib/libpthread/pthread.map,v 1.11 2004/07/13 22:52:53 davidxu Exp $
LIBTHREAD_1_0 {
global:
___creat;
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#3 (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/libpthread/thread/thr_create.c,v 1.54 2004/06/12 07:40:01 davidxu Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.55 2004/07/13 22:53:56 davidxu Exp $
*/
#include <errno.h>
#include <stdlib.h>
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/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/libpthread/thread/thr_exit.c,v 1.35 2003/09/14 22:52:16 davidxu Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_exit.c,v 1.36 2004/07/13 22:49:58 davidxu Exp $
*/
#include <errno.h>
#include <unistd.h>
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#3 (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/libpthread/thread/thr_init.c,v 1.62 2003/11/29 14:10:02 davidxu Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.63 2004/07/13 22:51:03 davidxu Exp $
*/
/* Allocate space for global thread variables here: */
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#7 (text+ko) ====
@@ -33,7 +33,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.106 2004/04/08 23:16:21 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.107 2004/07/13 22:49:58 davidxu Exp $");
#include <sys/types.h>
#include <sys/kse.h>
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_priority_queue.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/libpthread/thread/thr_priority_queue.c,v 1.14 2003/04/28 23:56:11 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_priority_queue.c,v 1.15 2004/07/13 22:49:58 davidxu Exp $
*/
#include <stdlib.h>
#include <sys/queue.h>
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#8 (text+ko) ====
@@ -31,7 +31,7 @@
*
* Private thread definitions for the uthread kernel.
*
- * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.114 2004/06/12 07:40:01 davidxu Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.115 2004/07/13 22:49:58 davidxu Exp $
*/
#ifndef _THR_PRIVATE_H
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_sig.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/libpthread/thread/thr_sig.c,v 1.78 2004/06/12 07:40:01 davidxu Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.79 2004/07/13 22:52:11 davidxu Exp $
*/
#include <sys/param.h>
#include <sys/types.h>
==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_spec.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/libpthread/thread/thr_spec.c,v 1.21 2003/08/20 02:34:14 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_spec.c,v 1.22 2004/07/13 22:49:58 davidxu Exp $
*/
#include <signal.h>
#include <stdlib.h>
==== //depot/projects/davidxu_ksedbg/src/sbin/geom/class/concat/gconcat.8#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.6 2004/07/07 21:00:56 ru Exp $
+.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.7 2004/07/13 12:32:20 pjd Exp $
.\"
.Dd May 21, 2004
.Dt GCONCAT 8
@@ -137,6 +137,22 @@
.It Fl v
Be more verbose.
.El
+.Sh SYSCTL VARIABLES
+The following
+.Xr sysctl 8
+variables can be used to control the behavior of the
+.Nm CONCAT
+GEOM class.
+The default value is shown next to each variable.
+.Bl -tag -width indent
+.It Va kern.geom.concat.debug : No 0
+Debug level of the
+.Nm CONCAT
+GEOM class.
+This can be set to a number between 0 and 3, both included.
+If set to 0 minimal debug information is printed, and if set to 3 the
+maximum amount of debug information in printed.
+.El
.Sh EXAMPLES
The following example shows how to configure four disks for automatic
concatenation, create a file system on it, and mount it:
@@ -153,9 +169,11 @@
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
+.Xr loader.conf 5 ,
.Xr geom 8 ,
.Xr mount 8 ,
.Xr newfs 8 ,
+.Xr sysctl 8 ,
.Xr umount 8 ,
.Xr vinum 8
.Sh HISTORY
==== //depot/projects/davidxu_ksedbg/src/sbin/geom/class/label/glabel.8#4 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/label/glabel.8,v 1.4 2004/07/07 21:00:56 ru Exp $
+.\" $FreeBSD: src/sbin/geom/class/label/glabel.8,v 1.5 2004/07/13 12:32:20 pjd Exp $
.\"
.Dd July 2, 2004
.Dt GLABEL 8
@@ -160,6 +160,22 @@
.It Fl v
Be more verbose.
.El
+.Sh SYSCTL VARIABLES
+The following
+.Xr sysctl 8
+variables can be used to control the behavior of the
+.Nm LABEL
+GEOM class.
+The default value is shown next to each variable.
+.Bl -tag -width indent
+.It Va kern.geom.label.debug : No 0
+Debug level of the
+.Nm LABEL
+GEOM class.
+This can be set to a number between 0 and 2, both included.
+If set to 0 minimal debug information is printed, and if set to 2 the
+maximum amount of debug information in printed.
+.El
.Sh EXAMPLES
The following example shows how to set up a label for disk
.Dq Li da2 ,
@@ -183,9 +199,11 @@
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
+.Xr loader.conf 5 ,
.Xr geom 8 ,
.Xr mount 8 ,
.Xr newfs 8 ,
+.Xr sysctl 8 ,
.Xr tunefs 8 ,
.Xr umount 8
.Sh HISTORY
==== //depot/projects/davidxu_ksedbg/src/sbin/geom/class/nop/gnop.8#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.8 2004/07/07 21:00:56 ru Exp $
+.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.9 2004/07/13 12:32:20 pjd Exp $
.\"
.Dd May 21, 2004
.Dt GNOP 8
@@ -106,6 +106,22 @@
.It Fl v
Be more verbose.
.El
+.Sh SYSCTL VARIABLES
+The following
+.Xr sysctl 8
+variables can be used to control the behavior of the
+.Nm NOP
+GEOM class.
+The default value is shown next to each variable.
+.Bl -tag -width indent
+.It Va kern.geom.nop.debug : No 0
+Debug level of the
+.Nm NOP
+GEOM class.
+This can be set to a number between 0 and 2, both included.
+If set to 0 minimal debug information is printed, and if set to 2 the
+maximum amount of debug information in printed.
+.El
.Sh EXAMPLES
The following example shows how to create a transparent provider for disk
.Pa /dev/da0
==== //depot/projects/davidxu_ksedbg/src/sbin/geom/class/stripe/gstripe.8#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.8 2004/07/09 14:41:51 pjd Exp $
+.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.10 2004/07/13 12:30:11 pjd Exp $
.\"
.Dd May 21, 2004
.Dt GSTRIPE 8
@@ -141,6 +141,43 @@
.It Fl v
Be more verbose.
.El
+.Sh SYSCTL VARIABLES
+The following
+.Xr sysctl 8
+variables can be used to control the behavior of the
+.Nm STRIPE
+GEOM class.
+The default value is shown next to each variable.
+.Bl -tag -width indent
+.It Va kern.geom.stripe.debug : No 0
+Debug level of the
+.Nm STRIPE
+GEOM class.
+This can be set to a number between 0 and 3, both included.
+If set to 0 minimal debug information is printed, and if set to 3 the
+maximum amount of debug information in printed.
+.It Va kern.geom.stripe.fast : No 1
+If set to a non-zero value enable
+.Dq "fast mode"
+instead of the normal
+.Dq "economic mode" .
+Compared to
+.Dq "economic mode"
+.Dq "fast mode"
+uses more memory, but it is much faster for smaller stripe sizes.
+If enough memory cannot be allocated
+.Nm STRIPE
+will fall back to
+.Dq "economic mode" .
+.It Va kern.geom.stripe.maxmem : No 1310720
+Maximum amount of memory that can be consumed by
+.Dq "fast mode"
+(in bytes).
+This
+.Xr sysctl 8
+variable is read-only and can only be set as a tunable in
+.Xr loader.conf 5 .
+.El
.Sh EXAMPLES
The following example shows how to set up striped device from four disks
for automatic configuration, create a file system on it, and mount it:
@@ -157,9 +194,11 @@
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
+.Xr loader.conf 5 ,
.Xr geom 8 ,
.Xr mount 8 ,
.Xr newfs 8 ,
+.Xr sysctl 8 ,
.Xr umount 8 ,
.Xr vinum 8
.Sh HISTORY
==== //depot/projects/davidxu_ksedbg/src/sbin/kldunload/kldunload.8#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/kldunload/kldunload.8,v 1.12 2002/07/06 19:33:23 charnier Exp $
+.\" $FreeBSD: src/sbin/kldunload/kldunload.8,v 1.13 2004/07/13 19:36:58 phk Exp $
.\"
.Dd April 25, 1997
.Dt KLDUNLOAD 8
@@ -33,9 +33,11 @@
.Nd unload a file from the kernel
.Sh SYNOPSIS
.Nm
+.Op Fl f
.Op Fl v
.Fl i Ar id
.Nm
+.Op Fl f
.Op Fl v
.Op Fl n
.Ar name
@@ -47,6 +49,11 @@
.Pp
The following options are available:
.Bl -tag -width indentXX
+.It Fl f
+Force the unload.
+This ignores error returns to MOD_QUISCE from the module and implies
+that the module should be unloaded even if it is currently in use.
+The users are left to cope as best they can.
.It Fl v
Be more verbose.
.It Fl i Ar id
==== //depot/projects/davidxu_ksedbg/src/sbin/kldunload/kldunload.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.13 2003/05/03 18:41:57 obrien Exp $");
+__FBSDID("$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.14 2004/07/13 19:36:58 phk Exp $");
#include <err.h>
#include <stdio.h>
@@ -48,10 +48,14 @@
int c;
int verbose = 0;
int fileid = 0;
+ int force = LINKER_UNLOAD_NORMAL;
char* filename = NULL;
- while ((c = getopt(argc, argv, "i:n:v")) != -1)
+ while ((c = getopt(argc, argv, "fi:n:v")) != -1)
switch (c) {
+ case 'f':
+ force = LINKER_UNLOAD_FORCE;
+ break;
case 'i':
fileid = atoi(optarg);
if (!fileid)
@@ -93,7 +97,7 @@
printf("Unloading %s, id=%d\n", stat.name, fileid);
}
- if (kldunload(fileid) < 0)
+ if (kldunloadf(fileid, force) < 0)
err(1, "can't unload file");
return 0;
==== //depot/projects/davidxu_ksedbg/src/share/dict/freebsd#2 (text+ko) ====
@@ -1,15 +1,30 @@
-$FreeBSD: src/share/dict/freebsd,v 1.6 2003/04/20 21:36:12 murray Exp $
+$FreeBSD: src/share/dict/freebsd,v 1.9 2004/07/14 07:10:15 murray Exp $
ABI
+ACL
ACPI
+ADSL
+AGP
AMD
+API
+APIC
+ATAPI
+ATX
+AVI
AXP
+AfterStep
AlphaBIOS
Appletalk
+Athlon
+BIBA
BOFs
+BOOTP
BSDCon
BSDi
Barnes
+BeOS
+Bluetooth
Border's
+Broadcom
CDROM
CDROMs
CDs
@@ -25,11 +40,19 @@
DEVBUF
DNS
DTD
+DVD
+DVI
Dilbert
DocBook
+EIDE
+EISA
+Ensoniq
Ermilov
+Estonia
+EtherExpress
Euro
-Firewire
+FDDI
+FireWire
FreeBSD
FreeBSD's
Fry's
@@ -45,33 +68,48 @@
IBCS
IPsec
IRC
+IRQ
ISA
ISBN
ISDN
ISP
Iomega
+Itanium
JDK
+JVM
JadeTeX
KDE
KLD
+KOffice
KSE
Kennaway
Kerberos
Kerneltrap
Kuriyama
+LAN
LDAP
+LGPL
+LLC
+LOMAC
+LPD
Leffler
Lehey
LinuxDoc
+MBR
+MBone
MFC
MIPS
MP
+MPEG
+MTA
+MUA
Mallett
Matrox
McKusick
Mozilla
MySQL
NAI
+NDIS
NIC
NIS
NSS
@@ -89,9 +127,14 @@
OSnews
OpenBSD
OpenGL
+OpenOffice
+OpenSSH
+OpenSSL
PAE
PCI
PDF
+PID
+PLIP
PPC
PR
PXE
@@ -101,14 +144,26 @@
PostScript
Postgres
PowerPC
+Qt
+Quicktime
+RSA
+RealPlayer
+RedHat
+Romania
SCO
SGI
SMP
SNMP
+SSH
+SSL
+SQL
SVR
Shumway
Slackware
+Slovenia
+SoftUpdates
Sony
+SoundBlaster
StarOffice
Stokely
StrongArm
@@ -118,38 +173,61 @@
TRB
Tcl
Tk
+TrueType
TrustedBSD
UFS
UltraSPARC
+Ukraine
VFS
VM
Valentino
Vaschetto
Vidrine
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list