CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Mon Dec 9 08:03:17 UTC 2013
Modified Files:
src/sbin/gpt: Makefile gpt.8 gpt.c gpt.h
Added Files:
src/sbin/gpt: set.c unset.c
Log Message:
Add two new subcommands, set and unset. These were inspired by
FreeBSD's gpart(8), but the code is all mine. The purpose of these
is to set and unset partition attributes.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/gpt/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.25 -r1.26 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/gpt/gpt.h
cvs rdiff -u -r0 -r1.1 src/sbin/gpt/set.c src/sbin/gpt/unset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/Makefile
diff -u src/sbin/gpt/Makefile:1.5 src/sbin/gpt/Makefile:1.6
--- src/sbin/gpt/Makefile:1.5 Wed Nov 20 08:08:47 2013
+++ src/sbin/gpt/Makefile Mon Dec 9 08:03:17 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/11/20 08:08:47 jnemeth Exp $
+# $NetBSD: Makefile,v 1.6 2013/12/09 08:03:17 jnemeth Exp $
# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
PROG= gpt
SRCS= add.c biosboot.c create.c destroy.c gpt.c label.c map.c migrate.c \
- recover.c remove.c resize.c show.c
+ recover.c remove.c resize.c set.c show.c unset.c
MAN= gpt.8
LDADD+= -lprop -lutil
Index: src/sbin/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.24 src/sbin/gpt/gpt.8:1.25
--- src/sbin/gpt/gpt.8:1.24 Mon Dec 9 01:35:02 2013
+++ src/sbin/gpt/gpt.8 Mon Dec 9 08:03:17 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpt.8,v 1.24 2013/12/09 01:35:02 jnemeth Exp $
+.\ $NetBSD: gpt.8,v 1.25 2013/12/09 08:03:17 jnemeth Exp $
.\
.\ Copyright (c) 2002 Marcel Moolenaar
.\ All rights reserved.
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
.\
-.Dd December 8, 2013
+.Dd December 9, 2013
.Dt GPT 8
.Os
.Sh NAME
@@ -344,6 +344,35 @@ If the
.Fl a
option is specified then the size will be adjusted to be a multiple of
alignment if possible.
+.\ set
+.It Nm Ic set Fl a Ar attribute Fl i Ar index Ar device ...
+The
+.Ic set
+command sets various partition attributes.
+The
+.Fl a
+option specifies which attributes to set and may be specified more then once.
+The
+.Fl i
+option specifies which entry to update.
+The possible attributes are
+.Do biosboot Dc ,
+.Do bootme Dc ,
+.Do bootonce Dc , and
+.Do bootfailed Dc .
+The biosboot flag is used to indicate which partition should be booted
+by legacy BIOS boot code.
+See the
+.Ic biosboot
+command for more information.
+The other three attributes are for compatibility with
+.Fx
+and are not currently used by any
+.Nx
+code.
+They may be used by
+.Nx
+code in the future.
.\ show
.It Nm Ic show Oo Fl glu Oc Oo Fl i Ar index Oc Ar device ...
The
@@ -372,6 +401,35 @@ The order of precedence for the options
.Fl l ,
.Fl g ,
.Fl u .
+.\ unset
+.It Nm Ic unset Fl a Ar attribute Fl i Ar index Ar device ...
+The
+.Ic unset
+command unsets various partition attributes.
+The
+.Fl a
+option specifies which attributes to unset and may be specified more then once.
+The
+.Fl i
+option specifies which entry to update.
+The possible attributes are
+.Do biosboot Dc ,
+.Do bootme Dc ,
+.Do bootonce Dc , and
+.Do bootfailed Dc .
+The biosboot flag is used to indicate which partition should be booted
+by legacy BIOS boot code.
+See the
+.Ic biosboot
+command for more information.
+The other three attributes are for compatibility with
+.Fx
+and are not currently used by any
+.Nx
+code.
+They may be used by
+.Nx
+code in the future.
.El
.Sh EXAMPLES
.Bd -literal
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.25 src/sbin/gpt/gpt.c:1.26
--- src/sbin/gpt/gpt.c:1.25 Wed Dec 4 20:15:51 2013
+++ src/sbin/gpt/gpt.c Mon Dec 9 08:03:17 2013
@@ -31,7 +31,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: gpt.c,v 1.25 2013/12/04 20:15:51 jakllsch Exp $);
+__RCSID($NetBSD: gpt.c,v 1.26 2013/12/09 08:03:17 jnemeth Exp $);
#endif
#include sys/param.h
@@ -727,7 +727,9 @@ static struct {
{ cmd_remove, remove },
{ NULL, rename },
{ cmd_resize, resize },
+ { cmd_set, set },
{ cmd_show, show },
+ { cmd_unset, unset },
{ NULL, verify },
{ NULL, NULL }
};
@@ -738,7 +740,8 @@ usage(void)
extern const char addmsg1[], addmsg2[], biosbootmsg[], createmsg[];
extern const char destroymsg[], labelmsg1[], labelmsg2[], labelmsg3[];
extern const char migratemsg[], recovermsg[], removemsg1[];
- extern const char removemsg2[], resizemsg[], showmsg[];
+ extern const char removemsg2[], resizemsg[], setmsg[], showmsg[];
+ extern const char unsetmsg[];
fprintf(stderr,
usage: %s %s\n
@@ -754,6 +757,8 @@ usage(void)
%s %s\n
%s %s\n
%s %s\n
+ %s %s\n
+ %s %s\n
CVS commit: src/sys/compat/linux/arch/i386
Module Name:src
Committed By: dsl
Date: Mon Dec 9 08:33:48 UTC 2013
Modified Files:
src/sys/compat/linux/arch/i386: linux_machdep.c
Log Message:
Missing change to the fxsave structure rename
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/compat/linux/arch/i386/linux_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/i386/linux_machdep.c
diff -u src/sys/compat/linux/arch/i386/linux_machdep.c:1.153 src/sys/compat/linux/arch/i386/linux_machdep.c:1.154
--- src/sys/compat/linux/arch/i386/linux_machdep.c:1.153 Sun Dec 1 01:05:16 2013
+++ src/sys/compat/linux/arch/i386/linux_machdep.c Mon Dec 9 08:33:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.153 2013/12/01 01:05:16 christos Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.154 2013/12/09 08:33:48 dsl Exp $ */
/*-
* Copyright (c) 1995, 2000, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_machdep.c,v 1.153 2013/12/01 01:05:16 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_machdep.c,v 1.154 2013/12/09 08:33:48 dsl Exp $);
#if defined(_KERNEL_OPT)
#include opt_vm86.h
@@ -142,8 +142,8 @@ linux_setregs(struct lwp *l, struct exec
l-l_md.md_flags = ~MDL_USEDFPU;
if (i386_use_fxsave) {
- pcb-pcb_savefpu.sv_xmm.sv_env.en_cw = __Linux_NPXCW__;
- pcb-pcb_savefpu.sv_xmm.sv_env.en_mxcsr = __INITIAL_MXCSR__;
+ pcb-pcb_savefpu.sv_xmm.sv_env.fx_cw = __Linux_NPXCW__;
+ pcb-pcb_savefpu.sv_xmm.sv_env.fx_mxcsr = __INITIAL_MXCSR__;
} else
pcb-pcb_savefpu.sv_87.sv_env.en_cw = __Linux_NPXCW__;
CVS commit: src/sbin/gpt
Module Name:src Committed By: wiz Date: Mon Dec 9 09:22:44 UTC 2013 Modified Files: src/sbin/gpt: gpt.8 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.25 src/sbin/gpt/gpt.8:1.26 --- src/sbin/gpt/gpt.8:1.25 Mon Dec 9 08:03:17 2013 +++ src/sbin/gpt/gpt.8 Mon Dec 9 09:22:44 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: gpt.8,v 1.25 2013/12/09 08:03:17 jnemeth Exp $ +.\ $NetBSD: gpt.8,v 1.26 2013/12/09 09:22:44 wiz Exp $ .\ .\ Copyright (c) 2002 Marcel Moolenaar .\ All rights reserved. @@ -351,7 +351,7 @@ The command sets various partition attributes. The .Fl a -option specifies which attributes to set and may be specified more then once. +option specifies which attributes to set and may be specified more than once. The .Fl i option specifies which entry to update. @@ -408,7 +408,7 @@ The command unsets various partition attributes. The .Fl a -option specifies which attributes to unset and may be specified more then once. +option specifies which attributes to unset and may be specified more than once. The .Fl i option specifies which entry to update.
CVS commit: src
Module Name:src
Committed By: wiz
Date: Mon Dec 9 09:35:17 UTC 2013
Modified Files:
src/lib/libc/resolv: res_init.c
src/sbin/atactl: atactl.c
src/share/man/man4: iee.4
src/sys/arch/amiga/dev: toccata.c
src/sys/arch/powerpc/booke: e500_tlb.c
src/sys/arch/vax/vax: lock_stubs.S
src/sys/arch/x68k/stand/boot_ufs: readufs_lfs.c
src/sys/dev/dm: dm.h
src/sys/dev/dm/doc: design.txt
src/sys/dev/ic: i82596.c
src/sys/dev/pci/n8/common/api: n8_packet_IPSec.c
src/sys/external/bsd/drm2/dist/drm/vmwgfx: vmwgfx_kms.c
src/sys/external/bsd/drm2/dist/uapi/drm: drm_mode.h
src/sys/fs/nfs/client: nfs_clbio.c
src/sys/kern: subr_blist.c
src/sys/sys: blist.h
src/sys/ufs/chfs: chfs_nodeops.c
src/usr.bin/rfcomm_sppd: rfcomm_sppd.c
src/usr.sbin/lmcconfig: lmcconfig.8
Log Message:
Fix typo (then instead of than)
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/resolv/res_init.c
cvs rdiff -u -r1.72 -r1.73 src/sbin/atactl/atactl.c
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/iee.4
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/toccata.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/booke/e500_tlb.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vax/lock_stubs.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dm/doc/design.txt
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/i82596.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/n8/common/api/n8_packet_IPSec.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/uapi/drm/drm_mode.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/client/nfs_clbio.c
cvs rdiff -u -r1.11 -r1.12 src/sys/kern/subr_blist.c
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/blist.h
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_nodeops.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/rfcomm_sppd/rfcomm_sppd.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/lmcconfig/lmcconfig.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/resolv/res_init.c
diff -u src/lib/libc/resolv/res_init.c:1.26 src/lib/libc/resolv/res_init.c:1.27
--- src/lib/libc/resolv/res_init.c:1.26 Sun Sep 9 18:04:26 2012
+++ src/lib/libc/resolv/res_init.c Mon Dec 9 09:35:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: res_init.c,v 1.26 2012/09/09 18:04:26 christos Exp $ */
+/* $NetBSD: res_init.c,v 1.27 2013/12/09 09:35:16 wiz Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@@ -76,7 +76,7 @@
static const char sccsid[] = @(#)res_init.c 8.1 (Berkeley) 6/7/93;
static const char rcsid[] = Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp;
#else
-__RCSID($NetBSD: res_init.c,v 1.26 2012/09/09 18:04:26 christos Exp $);
+__RCSID($NetBSD: res_init.c,v 1.27 2013/12/09 09:35:16 wiz Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -269,7 +269,7 @@ __res_vinit(res_state statp, int preinit
* Examples and applications exist which do not check
* our return code. Furthermore several applications
* simply call us to get the systems domainname. So
- * rather then immediately fail here we store the
+ * rather than immediately fail here we store the
* failure, which is returned later, in h_errno. And
* prevent the collection of 'nameserver' information
* by setting maxns to 0. Thus applications that fail
Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.72 src/sbin/atactl/atactl.c:1.73
--- src/sbin/atactl/atactl.c:1.72 Wed Oct 30 15:37:49 2013
+++ src/sbin/atactl/atactl.c Mon Dec 9 09:35:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atactl.c,v 1.72 2013/10/30 15:37:49 drochner Exp $ */
+/* $NetBSD: atactl.c,v 1.73 2013/12/09 09:35:16 wiz Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.72 2013/10/30 15:37:49 drochner Exp $);
+__RCSID($NetBSD: atactl.c,v 1.73 2013/12/09 09:35:16 wiz Exp $);
#endif
@@ -577,7 +577,7 @@ static const struct {
{ 127, Abort off-line test },
{ 129, Short captive },
{ 130, Extended captive },
- { 256, Unknown test }, /* larger then uint8_t */
+ { 256, Unknown test }, /* larger than uint8_t */
{ 0, NULL }
};
Index: src/share/man/man4/iee.4
diff -u src/share/man/man4/iee.4:1.6 src/share/man/man4/iee.4:1.7
--- src/share/man/man4/iee.4:1.6 Tue Aug 6 19:02:57 2013
+++ src/share/man/man4/iee.4 Mon Dec 9 09:35:16 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: iee.4,v 1.6 2013/08/06 19:02:57 snj Exp $
+.\ $NetBSD: iee.4,v 1.7 2013/12/09 09:35:16 wiz Exp $
.\ Copyright (c) 2002 Jochen Kunz.
.\ All rights reserved.
.\
@@ -108,7 +108,7 @@ Number of frames lost because the system
.It iee%d: iee_intr: rcvcdt_err=%d
Number of collisions
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 16:21:15 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: lwproc.c
Log Message:
stop ktrace at process exit
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/librump/rumpkern/lwproc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.24 src/sys/rump/librump/rumpkern/lwproc.c:1.25
--- src/sys/rump/librump/rumpkern/lwproc.c:1.24 Sun Oct 27 20:25:45 2013
+++ src/sys/rump/librump/rumpkern/lwproc.c Mon Dec 9 16:21:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lwproc.c,v 1.24 2013/10/27 20:25:45 pooka Exp $ */
+/* $NetBSD: lwproc.c,v 1.25 2013/12/09 16:21:15 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.24 2013/10/27 20:25:45 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.25 2013/12/09 16:21:15 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -34,6 +34,7 @@ __KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1
#include sys/kauth.h
#include sys/kmem.h
#include sys/lwp.h
+#include sys/ktrace.h
#include sys/pool.h
#include sys/proc.h
#include sys/queue.h
@@ -51,12 +52,20 @@ lwproc_proc_free(struct proc *p)
{
kauth_cred_t cred;
+ KASSERT(p-p_stat == SDYING || p-p_stat == SDEAD);
+
+#ifdef KTRACE
+ if (p-p_tracep) {
+ mutex_enter(ktrace_lock);
+ ktrderef(p);
+ mutex_exit(ktrace_lock);
+ }
+#endif
+
mutex_enter(proc_lock);
KASSERT(p-p_nlwps == 0);
KASSERT(LIST_EMPTY(p-p_lwps));
- KASSERT(p-p_stat == SACTIVE || p-p_stat == SDYING ||
- p-p_stat == SDEAD);
LIST_REMOVE(p, p_list);
LIST_REMOVE(p, p_sibling);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Mon Dec 9 16:23:10 UTC 2013 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: Use sy_invoke() instead of sy_call() directly. To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/sys/rump/librump/rumpkern/rump.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.276 src/sys/rump/librump/rumpkern/rump.c:1.277 --- src/sys/rump/librump/rumpkern/rump.c:1.276 Mon Nov 18 18:45:29 2013 +++ src/sys/rump/librump/rumpkern/rump.c Mon Dec 9 16:23:10 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.276 2013/11/18 18:45:29 njoly Exp $ */ +/* $NetBSD: rump.c,v 1.277 2013/12/09 16:23:10 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.276 2013/11/18 18:45:29 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.277 2013/12/09 16:23:10 pooka Exp $); #include sys/systm.h #define ELFSIZE ARCH_ELFSIZE @@ -834,7 +834,7 @@ rump_hyp_syscall(int num, void *arg, lon callp = rump_sysent + num; l = curlwp; - rv = sy_call(callp, l, (void *)arg, regrv); + rv = sy_invoke(callp, l, (void *)arg, regrv, num); retval[0] = regrv[0]; retval[1] = regrv[1]; @@ -1021,7 +1021,7 @@ rump_syscall(int num, void *data, size_t #endif callp = e-e_sysent + num; - rv = sy_call(callp, curlwp, data, retval); + rv = sy_invoke(callp, curlwp, data, retval, num); rump_unschedule(); return rv;
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 16:27:15 UTC 2013
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
Rump kernels now use sy_invoke(), which initializes the return
value registers, so no need to do it individually in each wrapper.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.134 src/sys/kern/makesyscalls.sh:1.135
--- src/sys/kern/makesyscalls.sh:1.134 Tue Oct 8 11:47:57 2013
+++ src/sys/kern/makesyscalls.sh Mon Dec 9 16:27:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.134 2013/10/08 11:47:57 njoly Exp $
+# $NetBSD: makesyscalls.sh,v 1.135 2013/12/09 16:27:15 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -812,7 +812,7 @@ function putent(type, compatwrap) {
}
printf(%s %s)\n, uncompattype(argtype[argc]), argname[argc]) \
rumpcalls
- printf({\n\tregister_t retval[2] = {0, 0};\n) rumpcalls
+ printf({\n\tregister_t retval[2];\n) rumpcalls
if (returntype != void) {
if (type != NOERR) {
printf(\tint error = 0;\n) rumpcalls
@@ -938,7 +938,7 @@ END {
printf(int rump_sys_pipe(int *);\n) rumpprotos
printf(\nint rump_sys_pipe(int *);\n) rumpcalls
printf(int\nrump_sys_pipe(int *fd)\n{\n) rumpcalls
- printf(\tregister_t retval[2] = {0, 0};\n) rumpcalls
+ printf(\tregister_t retval[2];\n) rumpcalls
printf(\tint error = 0;\n) rumpcalls
printf(\n\terror = rsys_syscall(SYS_pipe, ) rumpcalls
printf(NULL, 0, retval);\n) rumpcalls
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Mon Dec 9 16:32:06 UTC 2013 Modified Files: src/sys/kern: makesyscalls.sh Log Message: Echo generated file names so that you can just copypaste cvs ci without having to resort to the blazingly fast help of cvs diff. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sys/kern/makesyscalls.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/makesyscalls.sh diff -u src/sys/kern/makesyscalls.sh:1.135 src/sys/kern/makesyscalls.sh:1.136 --- src/sys/kern/makesyscalls.sh:1.135 Mon Dec 9 16:27:15 2013 +++ src/sys/kern/makesyscalls.sh Mon Dec 9 16:32:06 2013 @@ -1,4 +1,4 @@ -# $NetBSD: makesyscalls.sh,v 1.135 2013/12/09 16:27:15 pooka Exp $ +# $NetBSD: makesyscalls.sh,v 1.136 2013/12/09 16:32:06 pooka Exp $ # # Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou # All rights reserved. @@ -1003,3 +1003,6 @@ echo $rumpcallshdr cat $rumpprotos $rumpcallshdr #chmod 444 $sysnames $sysnumhdr $syssw + +echo Generated following files: +echo $sysarghdr $sysnumhdr $syssw $sysnames $rumpcalls $rumpcallshdr
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Mon Dec 9 16:45:23 UTC 2013
Modified Files:
src/sys/conf: files
src/sys/kern: kern_ktrace.c
src/sys/sys: ktrace.h
Added Files:
src/sys/kern: kern_ktrace_vfs.c
Log Message:
Put vfs bits of ktrace into kern_ktrace_vfs.c per convention.
To generate a diff of this commit:
cvs rdiff -u -r1.1081 -r1.1082 src/sys/conf/files
cvs rdiff -u -r1.163 -r1.164 src/sys/kern/kern_ktrace.c
cvs rdiff -u -r0 -r1.1 src/sys/kern/kern_ktrace_vfs.c
cvs rdiff -u -r1.59 -r1.60 src/sys/sys/ktrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1081 src/sys/conf/files:1.1082
--- src/sys/conf/files:1.1081 Tue Oct 15 15:13:17 2013
+++ src/sys/conf/files Mon Dec 9 16:45:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1081 2013/10/15 15:13:17 skrll Exp $
+# $NetBSD: files,v 1.1082 2013/12/09 16:45:23 pooka Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1505,6 +1505,7 @@ file kern/kern_idle.c
file kern/kern_hook.c
file kern/kern_kthread.c
file kern/kern_ktrace.c ktrace
+file kern/kern_ktrace_vfs.c ktrace
file kern/kern_ksyms.c ksyms | ddb | modular needs-flag
file kern/kern_lock.c
file kern/kern_lwp.c
Index: src/sys/kern/kern_ktrace.c
diff -u src/sys/kern/kern_ktrace.c:1.163 src/sys/kern/kern_ktrace.c:1.164
--- src/sys/kern/kern_ktrace.c:1.163 Mon Sep 16 09:25:56 2013
+++ src/sys/kern/kern_ktrace.c Mon Dec 9 16:45:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.163 2013/09/16 09:25:56 martin Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.164 2013/12/09 16:45:23 pooka Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -61,14 +61,12 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_ktrace.c,v 1.163 2013/09/16 09:25:56 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_ktrace.c,v 1.164 2013/12/09 16:45:23 pooka Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/proc.h
#include sys/file.h
-#include sys/namei.h
-#include sys/vnode.h
#include sys/kernel.h
#include sys/kthread.h
#include sys/ktrace.h
@@ -131,7 +129,6 @@ struct ktr_desc {
static int ktealloc(struct ktrace_entry **, void **, lwp_t *, int,
size_t);
static void ktrwrite(struct ktr_desc *, struct ktrace_entry *);
-static int ktrace_common(lwp_t *, int, int, int, file_t **);
static int ktrops(lwp_t *, struct proc *, int, int,
struct ktr_desc *);
static int ktrsetchildren(lwp_t *, struct proc *, int, int,
@@ -221,23 +218,6 @@ ktd_logerr(struct proc *p, int error)
}
#endif
-static inline int
-ktrenter(lwp_t *l)
-{
-
- if ((l-l_pflag LP_KTRACTIVE) != 0)
- return 1;
- l-l_pflag |= LP_KTRACTIVE;
- return 0;
-}
-
-static inline void
-ktrexit(lwp_t *l)
-{
-
- l-l_pflag = ~LP_KTRACTIVE;
-}
-
static int
ktrace_listener_cb(kauth_cred_t cred, kauth_action_t action, void *cookie,
void *arg0, void *arg1, void *arg2, void *arg3)
@@ -1190,75 +1170,6 @@ sys_fktrace(struct lwp *l, const struct
return error;
}
-/*
- * ktrace system call
- */
-/* ARGSUSED */
-int
-sys_ktrace(struct lwp *l, const struct sys_ktrace_args *uap, register_t *retval)
-{
- /* {
- syscallarg(const char *) fname;
- syscallarg(int) ops;
- syscallarg(int) facs;
- syscallarg(int) pid;
- } */
- struct vnode *vp = NULL;
- file_t *fp = NULL;
- struct pathbuf *pb;
- struct nameidata nd;
- int error = 0;
- int fd;
-
- if (ktrenter(l))
- return EAGAIN;
-
- if (KTROP(SCARG(uap, ops)) != KTROP_CLEAR) {
- /*
- * an operation which requires a file argument.
- */
- error = pathbuf_copyin(SCARG(uap, fname), pb);
- if (error) {
- ktrexit(l);
- return (error);
- }
- NDINIT(nd, LOOKUP, FOLLOW, pb);
- if ((error = vn_open(nd, FREAD|FWRITE, 0)) != 0) {
- pathbuf_destroy(pb);
- ktrexit(l);
- return (error);
- }
- vp = nd.ni_vp;
- pathbuf_destroy(pb);
- VOP_UNLOCK(vp);
- if (vp-v_type != VREG) {
- vn_close(vp, FREAD|FWRITE, l-l_cred);
- ktrexit(l);
- return (EACCES);
- }
- /*
- * This uses up a file descriptor slot in the
- * tracing process for the duration of this syscall.
- * This is not expected to be a problem.
- */
- if ((error = fd_allocfile(fp, fd)) != 0) {
- vn_close(vp, FWRITE, l-l_cred);
- ktrexit(l);
- return error;
- }
- fp-f_flag = FWRITE;
- fp-f_type = DTYPE_VNODE;
- fp-f_ops = vnops;
- fp-f_data = (void *)vp;
- vp = NULL;
- }
- error = ktrace_common(l, SCARG(uap, ops), SCARG(uap, facs),
- SCARG(uap, pid), fp);
- if (KTROP(SCARG(uap, ops)) != KTROP_CLEAR)
- fd_abort(curproc, fp, fd);
- return (error);
-}
-
int
ktrops(lwp_t *curl, struct proc *p, int ops, int facs,
struct ktr_desc *ktd)
Index: src/sys/sys/ktrace.h
diff -u src/sys/sys/ktrace.h:1.59 src/sys/sys/ktrace.h:1.60
--- src/sys/sys/ktrace.h:1.59 Sun Feb 19 21:06:58 2012
+++ src/sys/sys/ktrace.h Mon Dec 9 16:45:23 2013
@@ -1,4 +1,4 @@
-/*
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 16:49:43 UTC 2013
Modified Files:
src/sys/kern: kern_subr.c kern_syscall.c
Log Message:
Group more syscall related routines together (kern_subr - kern_syscall)
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/kern/kern_subr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/kern_syscall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_subr.c
diff -u src/sys/kern/kern_subr.c:1.213 src/sys/kern/kern_subr.c:1.214
--- src/sys/kern/kern_subr.c:1.213 Sun Jun 10 17:05:18 2012
+++ src/sys/kern/kern_subr.c Mon Dec 9 16:49:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_subr.c,v 1.213 2012/06/10 17:05:18 mlelstv Exp $ */
+/* $NetBSD: kern_subr.c,v 1.214 2013/12/09 16:49:43 pooka Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,13 +79,10 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_subr.c,v 1.213 2012/06/10 17:05:18 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_subr.c,v 1.214 2013/12/09 16:49:43 pooka Exp $);
#include opt_ddb.h
#include opt_md.h
-#include opt_syscall_debug.h
-#include opt_ktrace.h
-#include opt_ptrace.h
#include opt_tftproot.h
#include sys/param.h
@@ -98,8 +95,6 @@ __KERNEL_RCSID(0, $NetBSD: kern_subr.c,
#include sys/disk.h
#include sys/disklabel.h
#include sys/queue.h
-#include sys/ktrace.h
-#include sys/ptrace.h
#include sys/fcntl.h
#include sys/kauth.h
#include sys/stat.h
@@ -656,81 +651,3 @@ parsedisk(char *str, int len, int defpar
*cp = c;
return (dv);
}
-
-/*
- * Return true if system call tracing is enabled for the specified process.
- */
-bool
-trace_is_enabled(struct proc *p)
-{
-#ifdef SYSCALL_DEBUG
- return (true);
-#endif
-#ifdef KTRACE
- if (ISSET(p-p_traceflag, (KTRFAC_SYSCALL | KTRFAC_SYSRET)))
- return (true);
-#endif
-#ifdef PTRACE
- if (ISSET(p-p_slflag, PSL_SYSCALL))
- return (true);
-#endif
-
- return (false);
-}
-
-/*
- * Start trace of particular system call. If process is being traced,
- * this routine is called by MD syscall dispatch code just before
- * a system call is actually executed.
- */
-int
-trace_enter(register_t code, const register_t *args, int narg)
-{
- int error = 0;
-
-#ifdef SYSCALL_DEBUG
- scdebug_call(code, args);
-#endif /* SYSCALL_DEBUG */
-
- ktrsyscall(code, args, narg);
-
-#ifdef PTRACE
- if ((curlwp-l_proc-p_slflag (PSL_SYSCALL|PSL_TRACED)) ==
- (PSL_SYSCALL|PSL_TRACED)) {
- process_stoptrace();
- if (curlwp-l_proc-p_slflag PSL_SYSCALLEMU) {
- /* tracer will emulate syscall for us */
- error = EJUSTRETURN;
- }
- }
-#endif
- return error;
-}
-
-/*
- * End trace of particular system call. If process is being traced,
- * this routine is called by MD syscall dispatch code just after
- * a system call finishes.
- * MD caller guarantees the passed 'code' is within the supported
- * system call number range for emulation the process runs under.
- */
-void
-trace_exit(register_t code, register_t rval[], int error)
-{
-#ifdef PTRACE
- struct proc *p = curlwp-l_proc;
-#endif
-
-#ifdef SYSCALL_DEBUG
- scdebug_ret(code, error, rval);
-#endif /* SYSCALL_DEBUG */
-
- ktrsysret(code, error, rval);
-
-#ifdef PTRACE
- if ((p-p_slflag (PSL_SYSCALL|PSL_TRACED|PSL_SYSCALLEMU)) ==
- (PSL_SYSCALL|PSL_TRACED))
- process_stoptrace();
- CLR(p-p_slflag, PSL_SYSCALLEMU);
-#endif
-}
Index: src/sys/kern/kern_syscall.c
diff -u src/sys/kern/kern_syscall.c:1.7 src/sys/kern/kern_syscall.c:1.8
--- src/sys/kern/kern_syscall.c:1.7 Sat May 5 19:37:37 2012
+++ src/sys/kern/kern_syscall.c Mon Dec 9 16:49:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_syscall.c,v 1.7 2012/05/05 19:37:37 christos Exp $ */
+/* $NetBSD: kern_syscall.c,v 1.8 2013/12/09 16:49:43 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,9 +30,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_syscall.c,v 1.7 2012/05/05 19:37:37 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_syscall.c,v 1.8 2013/12/09 16:49:43 pooka Exp $);
+#ifdef _KERNEL_OPT
#include opt_modular.h
+#include opt_syscall_debug.h
+#include opt_ktrace.h
+#include opt_ptrace.h
+#endif
/* XXX To get syscall prototypes. */
#define SYSVSHM
@@ -47,6 +52,8 @@ __KERNEL_RCSID(0, $NetBSD: kern_syscall
#include sys/syscallvar.h
#include sys/systm.h
#include sys/xcall.h
+#include sys/ktrace.h
+#include sys/ptrace.h
int
sys_nomodule(struct lwp *l, const void *v, register_t *retval)
@@ -334,3 +341,81 @@ syscall_disestablish(const struct emul *
return 0;
}
+
+/*
+ * Return true if system call tracing is enabled for the specified process.
+ */
+bool
+trace_is_enabled(struct proc *p)
+{
+#ifdef SYSCALL_DEBUG
+ return (true);
+#endif
+#ifdef KTRACE
+ if (ISSET(p-p_traceflag, (KTRFAC_SYSCALL | KTRFAC_SYSRET)))
+ return (true);
+#endif
+#ifdef PTRACE
+ if (ISSET(p-p_slflag, PSL_SYSCALL))
+ return
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Dec 9 16:54:21 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c locks.c rump.c
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Log Message:
Support ktrace for rump kernels.
Requested by Justin Cormack on rumpkernel-users.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.132 -r1.133 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.158 -r1.159 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.65 -r1.66 src/sys/rump/librump/rumpkern/locks.c
cvs rdiff -u -r1.277 -r1.278 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.36 -r1.37 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.87 src/sys/rump/Makefile.rump:1.88
--- src/sys/rump/Makefile.rump:1.87 Tue Sep 3 19:57:02 2013
+++ src/sys/rump/Makefile.rump Mon Dec 9 16:54:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.87 2013/09/03 19:57:02 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.88 2013/12/09 16:54:20 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -24,6 +24,7 @@ CFLAGS+= -ffreestanding -fno-strict-alia
CWARNFLAGS+= -Wno-format-zero-length -Wno-pointer-sign
CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
CPPFLAGS+= -DDEBUGPRINT
+CPPFLAGS+= -DKTRACE
CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.132 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.133
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.132 Sat Sep 7 17:58:00 2013
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Mon Dec 9 16:54:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.132 2013/09/07 17:58:00 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.133 2013/12/09 16:54:20 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -76,6 +76,7 @@ SRCS+= init_sysctl_base.c \
kern_event.c \
kern_hook.c \
kern_ksyms.c \
+ kern_ktrace.c \
kern_malloc.c \
kern_module.c \
kern_mutex_obj.c \
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.158 src/sys/rump/librump/rumpkern/emul.c:1.159
--- src/sys/rump/librump/rumpkern/emul.c:1.158 Tue Apr 30 16:03:44 2013
+++ src/sys/rump/librump/rumpkern/emul.c Mon Dec 9 16:54:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.158 2013/04/30 16:03:44 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.159 2013/12/09 16:54:20 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.158 2013/04/30 16:03:44 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.159 2013/12/09 16:54:20 pooka Exp $);
#include sys/param.h
#include sys/null.h
@@ -281,20 +281,6 @@ syscall_intern(struct proc *p)
}
#endif
-int
-trace_enter(register_t code, const register_t *args, int narg)
-{
-
- return 0;
-}
-
-void
-trace_exit(register_t code, register_t rval[], int error)
-{
-
- /* nada */
-}
-
#ifdef LOCKDEBUG
void
turnstile_print(volatile void *obj, void (*pr)(const char *, ...))
Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.65 src/sys/rump/librump/rumpkern/locks.c:1.66
--- src/sys/rump/librump/rumpkern/locks.c:1.65 Wed Jul 3 17:10:28 2013
+++ src/sys/rump/librump/rumpkern/locks.c Mon Dec 9 16:54:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locks.c,v 1.65 2013/07/03 17:10:28 njoly Exp $ */
+/* $NetBSD: locks.c,v 1.66 2013/12/09 16:54:20 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: locks.c,v 1.65 2013/07/03 17:10:28 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: locks.c,v 1.66 2013/12/09 16:54:20 pooka Exp $);
#include sys/param.h
#include sys/kmem.h
@@ -55,6 +55,9 @@ static lockops_t rw_lockops = {
NULL
};
+/* not used, but need the symbols for pointer comparisons */
+syncobj_t mutex_syncobj, rw_syncobj;
+
#define ALLOCK(lock, ops) \
lockdebug_alloc(lock, ops, (uintptr_t)__builtin_return_address(0))
#define FREELOCK(lock) \
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.277 src/sys/rump/librump/rumpkern/rump.c:1.278
--- src/sys/rump/librump/rumpkern/rump.c:1.277 Mon Dec 9 16:23:10 2013
+++ src/sys/rump/librump/rumpkern/rump.c Mon Dec 9 16:54:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.277 2013/12/09 16:23:10 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.278 2013/12/09 16:54:20 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Mon Dec 9 16:56:11 UTC 2013 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: need ktrace.h now To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/sys/rump/librump/rumpkern/rump.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.278 src/sys/rump/librump/rumpkern/rump.c:1.279 --- src/sys/rump/librump/rumpkern/rump.c:1.278 Mon Dec 9 16:54:20 2013 +++ src/sys/rump/librump/rumpkern/rump.c Mon Dec 9 16:56:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.278 2013/12/09 16:54:20 pooka Exp $ */ +/* $NetBSD: rump.c,v 1.279 2013/12/09 16:56:11 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.278 2013/12/09 16:54:20 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.279 2013/12/09 16:56:11 pooka Exp $); #include sys/systm.h #define ELFSIZE ARCH_ELFSIZE @@ -72,6 +72,7 @@ __KERNEL_RCSID(0, $NetBSD: rump.c,v 1.2 #include sys/xcall.h #include sys/simplelock.h #include sys/cprng.h +#include sys/ktrace.h #include rump/rumpuser.h
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 17:03:41 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: locks.c
Log Message:
make !LOCKDEBUG work too
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/rump/librump/rumpkern/locks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.66 src/sys/rump/librump/rumpkern/locks.c:1.67
--- src/sys/rump/librump/rumpkern/locks.c:1.66 Mon Dec 9 16:54:20 2013
+++ src/sys/rump/librump/rumpkern/locks.c Mon Dec 9 17:03:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locks.c,v 1.66 2013/12/09 16:54:20 pooka Exp $ */
+/* $NetBSD: locks.c,v 1.67 2013/12/09 17:03:41 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: locks.c,v 1.66 2013/12/09 16:54:20 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: locks.c,v 1.67 2013/12/09 17:03:41 pooka Exp $);
#include sys/param.h
#include sys/kmem.h
@@ -55,9 +55,6 @@ static lockops_t rw_lockops = {
NULL
};
-/* not used, but need the symbols for pointer comparisons */
-syncobj_t mutex_syncobj, rw_syncobj;
-
#define ALLOCK(lock, ops) \
lockdebug_alloc(lock, ops, (uintptr_t)__builtin_return_address(0))
#define FREELOCK(lock) \
@@ -76,6 +73,9 @@ syncobj_t mutex_syncobj, rw_syncobj;
#define UNLOCKED(a, b)
#endif
+/* not used, but need the symbols for pointer comparisons */
+syncobj_t mutex_syncobj, rw_syncobj;
+
/*
* We map locks to pthread routines. The difference between kernel
* and rumpuser routines is that while the kernel uses static
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 17:13:17 UTC 2013
Modified Files:
src/sys/kern: syscalls.master
Log Message:
Create rump kernel wrappers for {f,}ktrace
To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/sys/kern/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.264 src/sys/kern/syscalls.master:1.265
--- src/sys/kern/syscalls.master:1.264 Thu Oct 17 18:01:11 2013
+++ src/sys/kern/syscalls.master Mon Dec 9 17:13:17 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp $
+ $NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -130,7 +130,7 @@
43 NOERR RUMP { gid_t|sys||getegid(void); }
44 STD { int|sys||profil(char *samples, size_t size, \
u_long offset, u_int scale); }
-45 STD { int|sys||ktrace(const char *fname, int ops, \
+45 STD RUMP { int|sys||ktrace(const char *fname, int ops, \
int facs, pid_t pid); }
46 COMPAT_13 MODULAR { int|sys||sigaction(int signum, \
const struct sigaction13 *nsa, \
@@ -550,7 +550,7 @@
gid_t gid); }
286 STD RUMP { pid_t|sys||getsid(pid_t pid); }
287 STD { pid_t|sys||__clone(int flags, void *stack); }
-288 STD { int|sys||fktrace(int fd, int ops, \
+288 STD RUMP { int|sys||fktrace(int fd, int ops, \
int facs, pid_t pid); }
289 STD RUMP { ssize_t|sys||preadv(int fd, \
const struct iovec *iovp, int iovcnt, \
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Mon Dec 9 17:15:11 UTC 2013 Modified Files: src/sys/kern: init_sysent.c syscalls.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/sys/kern/init_sysent.c cvs rdiff -u -r1.267 -r1.268 src/sys/kern/syscalls.c cvs rdiff -u -r1.68 -r1.69 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.93 -r1.94 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.263 -r1.264 src/sys/sys/syscall.h cvs rdiff -u -r1.246 -r1.247 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.276 src/sys/kern/init_sysent.c:1.277 --- src/sys/kern/init_sysent.c:1.276 Mon Dec 9 16:35:12 2013 +++ src/sys/kern/init_sysent.c Mon Dec 9 17:15:11 2013 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.276 2013/12/09 16:35:12 pooka Exp $ */ +/* $NetBSD: init_sysent.c,v 1.277 2013/12/09 17:15:11 pooka Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp + * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.276 2013/12/09 16:35:12 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.277 2013/12/09 17:15:11 pooka Exp $); #include opt_modular.h #include opt_ntp.h Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.267 src/sys/kern/syscalls.c:1.268 --- src/sys/kern/syscalls.c:1.267 Mon Dec 9 16:35:12 2013 +++ src/sys/kern/syscalls.c Mon Dec 9 17:15:11 2013 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.267 2013/12/09 16:35:12 pooka Exp $ */ +/* $NetBSD: syscalls.c,v 1.268 2013/12/09 17:15:11 pooka Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp + * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.267 2013/12/09 16:35:12 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.268 2013/12/09 17:15:11 pooka Exp $); #if defined(_KERNEL_OPT) #include opt_modular.h Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.68 src/sys/rump/include/rump/rump_syscalls.h:1.69 --- src/sys/rump/include/rump/rump_syscalls.h:1.68 Mon Dec 9 16:35:12 2013 +++ src/sys/rump/include/rump/rump_syscalls.h Mon Dec 9 17:15:11 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.68 2013/12/09 16:35:12 pooka Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.69 2013/12/09 17:15:11 pooka Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp + * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ @@ -272,6 +272,10 @@ #define RUMP_SYS_RENAME_EXTATTR_DELETE_FD rump___sysimpl_extattr_delete_fd #endif +#ifndef RUMP_SYS_RENAME_FKTRACE +#define RUMP_SYS_RENAME_FKTRACE rump___sysimpl_fktrace +#endif + #ifndef RUMP_SYS_RENAME_MODCTL #define RUMP_SYS_RENAME_MODCTL rump___sysimpl_modctl #endif @@ -696,6 +700,10 @@ #define RUMP_SYS_RENAME_SETGID rump___sysimpl_setgid #endif +#ifndef RUMP_SYS_RENAME_KTRACE +#define RUMP_SYS_RENAME_KTRACE rump___sysimpl_ktrace +#endif + #ifndef RUMP_SYS_RENAME_LLISTXATTR #define RUMP_SYS_RENAME_LLISTXATTR rump___sysimpl_llistxattr #endif @@ -750,6 +758,7 @@ void rump_sys_sync(void) __RENAME(RUMP_S pid_t rump_sys_getppid(void) __RENAME(RUMP_SYS_RENAME_GETPPID); int rump_sys_dup(int) __RENAME(RUMP_SYS_RENAME_DUP); gid_t rump_sys_getegid(void) __RENAME(RUMP_SYS_RENAME_GETEGID); +int rump_sys_ktrace(const char *, int, int, pid_t) __RENAME(RUMP_SYS_RENAME_KTRACE); gid_t rump_sys_getgid(void) __RENAME(RUMP_SYS_RENAME_GETGID_WITH_EGID); int rump_sys___getlogin(char *, size_t) __RENAME(RUMP_SYS_RENAME___GETLOGIN); int rump_sys___setlogin(const char *) __RENAME(RUMP_SYS_RENAME___SETLOGIN); @@ -822,6 +831,7 @@ int rump_sys_lchmod(const char *, mode_t int rump_sys_lchown(const char *, uid_t, gid_t) __RENAME(RUMP_SYS_RENAME_LCHOWN); int rump_sys_lutimes(const char *, const struct timeval *) __RENAME(RUMP_SYS_RENAME_LUTIMES); pid_t rump_sys_getsid(pid_t) __RENAME(RUMP_SYS_RENAME_GETSID); +int rump_sys_fktrace(int, int, int, pid_t) __RENAME(RUMP_SYS_RENAME_FKTRACE); ssize_t rump_sys_preadv(int, const struct iovec *, int, off_t) __RENAME(RUMP_SYS_RENAME_PREADV); ssize_t
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: dsl Date: Mon Dec 9 17:39:53 UTC 2013 Modified Files: src/sys/arch/i386/include: freebsd_machdep.h Log Message: Include machine/npx.h here. The only file that needs 'struct freebsd_save87' includes it already. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/include/freebsd_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/include/freebsd_machdep.h diff -u src/sys/arch/i386/include/freebsd_machdep.h:1.10 src/sys/arch/i386/include/freebsd_machdep.h:1.11 --- src/sys/arch/i386/include/freebsd_machdep.h:1.10 Sun Dec 8 20:45:30 2013 +++ src/sys/arch/i386/include/freebsd_machdep.h Mon Dec 9 17:39:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_machdep.h,v 1.10 2013/12/08 20:45:30 dsl Exp $ */ +/* $NetBSD: freebsd_machdep.h,v 1.11 2013/12/09 17:39:53 dsl Exp $ */ /* * Copyright (c) 1986, 1989, 1991, 1993 @@ -41,6 +41,7 @@ #define _FREEBSD_MACHDEP_H #include compat/sys/sigtypes.h +#include machine/npx.h /* * signal support
CVS commit: src/sys/sys
Module Name:src Committed By: pooka Date: Mon Dec 9 17:43:58 UTC 2013 Modified Files: src/sys/sys: ktrace.h Log Message: include necessary headers To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/sys/ktrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/ktrace.h diff -u src/sys/sys/ktrace.h:1.60 src/sys/sys/ktrace.h:1.61 --- src/sys/sys/ktrace.h:1.60 Mon Dec 9 16:45:23 2013 +++ src/sys/sys/ktrace.h Mon Dec 9 17:43:58 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ktrace.h,v 1.60 2013/12/09 16:45:23 pooka Exp $ */ +/* $NetBSD: ktrace.h,v 1.61 2013/12/09 17:43:58 pooka Exp $ */ /* * Copyright (c) 1988, 1993 @@ -35,6 +35,7 @@ #define _SYS_KTRACE_H_ #include sys/mutex.h +#include sys/lwp.h /* * operations to ktrace system call (KTROP(op))
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Dec 9 17:57:11 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Log Message:
Make ktrace a compile-time option
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.133 -r1.134 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.279 -r1.280 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.37 -r1.38 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.88 src/sys/rump/Makefile.rump:1.89
--- src/sys/rump/Makefile.rump:1.88 Mon Dec 9 16:54:20 2013
+++ src/sys/rump/Makefile.rump Mon Dec 9 17:57:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.88 2013/12/09 16:54:20 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.89 2013/12/09 17:57:11 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -24,7 +24,6 @@ CFLAGS+= -ffreestanding -fno-strict-alia
CWARNFLAGS+= -Wno-format-zero-length -Wno-pointer-sign
CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
CPPFLAGS+= -DDEBUGPRINT
-CPPFLAGS+= -DKTRACE
CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
@@ -63,6 +62,11 @@ CPPFLAGS+= -DDEBUG
CPPFLAGS+= -DLOCKDEBUG
.endif
+RUMP_KTRACE?=yes
+.if ${RUMP_KTRACE} == yes
+CPPFLAGS+= -DKTRACE
+.endif
+
# kernel libs should not get linked against libc
# XXX: actually, we would like to enable this but cannot, since it
# also leaves out libgcc, it causes problems on some platforms.
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.133 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.134
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.133 Mon Dec 9 16:54:20 2013
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Mon Dec 9 17:57:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.133 2013/12/09 16:54:20 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.134 2013/12/09 17:57:11 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -76,7 +76,6 @@ SRCS+= init_sysctl_base.c \
kern_event.c \
kern_hook.c \
kern_ksyms.c \
- kern_ktrace.c \
kern_malloc.c \
kern_module.c \
kern_mutex_obj.c \
@@ -159,6 +158,10 @@ SRCS+= subr_kmem.c subr_pool.c
SRCS+= subr_lockdebug.c
.endif
+.if ${RUMP_KTRACE} == yes
+SRCS+= kern_ktrace.c
+.endif
+
# no shlib_version because this is automatically in sync with lib/librump
SHLIB_MAJOR=0
SHLIB_MINOR=0
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.279 src/sys/rump/librump/rumpkern/rump.c:1.280
--- src/sys/rump/librump/rumpkern/rump.c:1.279 Mon Dec 9 16:56:11 2013
+++ src/sys/rump/librump/rumpkern/rump.c Mon Dec 9 17:57:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.279 2013/12/09 16:56:11 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.280 2013/12/09 17:57:11 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.279 2013/12/09 16:56:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.280 2013/12/09 17:57:11 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -371,7 +371,9 @@ rump_init(void)
inittimecounter();
ntp_init();
+#ifdef KTRACE
ktrinit();
+#endif
ts = boottime;
tc_setclock(ts);
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.37 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.38
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.37 Mon Dec 9 16:54:20 2013
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Dec 9 17:57:11 2013
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile.rumpvfs,v 1.37 2013/12/09 16:54:20 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.38 2013/12/09 17:57:11 pooka Exp $
#
+.include ${RUMPTOP}/Makefile.rump
+
+.include bsd.own.mk
+
LIB= rumpvfs
.PATH: ${RUMPTOP}/librump/rumpvfs ${RUMPTOP}/librump \
@@ -50,7 +54,9 @@ SRCS+= subr_bufq.c bufq_disksort.c bufq_
SRCS+= mfs_miniroot.c
# ktrace vfs part
+.if ${RUMP_KTRACE} == yes
SRCS+= kern_ktrace_vfs.c
+.endif
#quota2 plists
SRCS+= quota1_subr.c vfs_quotactl.c
@@ -70,7 +76,5 @@ SHLIB_MINOR=0
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
-.include ${RUMPTOP}/Makefile.rump
-
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Mon Dec 9 18:06:27 UTC 2013 Modified Files: src/sys/kern: kern_stub.c Log Message: As long as we're using #ifdef to decide which stubs get generated, might as well use __strong_alias instead of __weak_alias. Some toolchains such as the cygwin pecoff one get weak aliases a bit wrong, so avoiding unnecessary weak alises helps there. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_stub.c diff -u src/sys/kern/kern_stub.c:1.37 src/sys/kern/kern_stub.c:1.38 --- src/sys/kern/kern_stub.c:1.37 Sun Feb 19 21:06:54 2012 +++ src/sys/kern/kern_stub.c Mon Dec 9 18:06:27 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_stub.c,v 1.37 2012/02/19 21:06:54 rmind Exp $ */ +/* $NetBSD: kern_stub.c,v 1.38 2013/12/09 18:06:27 pooka Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_stub.c,v 1.37 2012/02/19 21:06:54 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_stub.c,v 1.38 2013/12/09 18:06:27 pooka Exp $); #include opt_ptrace.h #include opt_ktrace.h @@ -89,7 +89,7 @@ bool default_bus_space_handle_is_equal(b * error in case process won't see signal immediately (blocked or ignored). */ #ifndef PTRACE -__weak_alias(sys_ptrace,sys_nosys); +__strong_alias(sys_ptrace,sys_nosys); #endif /* PTRACE */ /* @@ -97,29 +97,29 @@ __weak_alias(sys_ptrace,sys_nosys); * but not kill the process: utrace() is a debugging feature. */ #ifndef KTRACE -__weak_alias(ktr_csw,nullop); /* Probes */ -__weak_alias(ktr_emul,nullop); -__weak_alias(ktr_geniov,nullop); -__weak_alias(ktr_genio,nullop); -__weak_alias(ktr_mibio,nullop); -__weak_alias(ktr_namei,nullop); -__weak_alias(ktr_namei2,nullop); -__weak_alias(ktr_psig,nullop); -__weak_alias(ktr_syscall,nullop); -__weak_alias(ktr_sysret,nullop); -__weak_alias(ktr_kuser,nullop); -__weak_alias(ktr_mib,nullop); -__weak_alias(ktr_execarg,nullop); -__weak_alias(ktr_execenv,nullop); -__weak_alias(ktr_execfd,nullop); - -__weak_alias(sys_fktrace,sys_nosys); /* Syscalls */ -__weak_alias(sys_ktrace,sys_nosys); -__weak_alias(sys_utrace,sys_nosys); +__strong_alias(ktr_csw,nullop); /* Probes */ +__strong_alias(ktr_emul,nullop); +__strong_alias(ktr_geniov,nullop); +__strong_alias(ktr_genio,nullop); +__strong_alias(ktr_mibio,nullop); +__strong_alias(ktr_namei,nullop); +__strong_alias(ktr_namei2,nullop); +__strong_alias(ktr_psig,nullop); +__strong_alias(ktr_syscall,nullop); +__strong_alias(ktr_sysret,nullop); +__strong_alias(ktr_kuser,nullop); +__strong_alias(ktr_mib,nullop); +__strong_alias(ktr_execarg,nullop); +__strong_alias(ktr_execenv,nullop); +__strong_alias(ktr_execfd,nullop); + +__strong_alias(sys_fktrace,sys_nosys); /* Syscalls */ +__strong_alias(sys_ktrace,sys_nosys); +__strong_alias(sys_utrace,sys_nosys); int ktrace_on; /* Misc */ -__weak_alias(ktruser,enosys); -__weak_alias(ktr_point,nullop); +__strong_alias(ktruser,enosys); +__strong_alias(ktr_point,nullop); #endif /* KTRACE */ __weak_alias(device_register, voidop);
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 19:18:52 UTC 2013
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
Initialize the syscall frame to 0 before setting parameters.
Otherwise things which treat syscall parameters as register_t (like
ktrace) will encounter garbage for parameters which are of smaller size
than register_t. Using memset is probably not the most optimal way,
but oh well.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.136 src/sys/kern/makesyscalls.sh:1.137
--- src/sys/kern/makesyscalls.sh:1.136 Mon Dec 9 16:32:06 2013
+++ src/sys/kern/makesyscalls.sh Mon Dec 9 19:18:52 2013
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.136 2013/12/09 16:32:06 pooka Exp $
+# $NetBSD: makesyscalls.sh,v 1.137 2013/12/09 19:18:52 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -828,6 +828,7 @@ function putent(type, compatwrap) {
argsize = sizeof(callarg)
printf(\tstruct %s%s_args callarg;\n\n,compatwrap_,funcname) \
rumpcalls
+ printf \tmemset(callarg, 0, sizeof(callarg));\n rumpcalls
for (i = 1; i = argc; i++) {
if (argname[i] == PAD) {
printf(\tSPARG(callarg, %s) = 0;\n, \
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Mon Dec 9 19:19:39 UTC 2013 Modified Files: src/sys/kern: init_sysent.c syscalls.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.277 -r1.278 src/sys/kern/init_sysent.c cvs rdiff -u -r1.268 -r1.269 src/sys/kern/syscalls.c cvs rdiff -u -r1.69 -r1.70 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.94 -r1.95 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.264 -r1.265 src/sys/sys/syscall.h cvs rdiff -u -r1.247 -r1.248 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.277 src/sys/kern/init_sysent.c:1.278 --- src/sys/kern/init_sysent.c:1.277 Mon Dec 9 17:15:11 2013 +++ src/sys/kern/init_sysent.c Mon Dec 9 19:19:39 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysent.c,v 1.277 2013/12/09 17:15:11 pooka Exp $ */ +/* $NetBSD: init_sysent.c,v 1.278 2013/12/09 19:19:39 pooka Exp $ */ /* * System call switch table. @@ -8,7 +8,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.277 2013/12/09 17:15:11 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.278 2013/12/09 19:19:39 pooka Exp $); #include opt_modular.h #include opt_ntp.h Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.268 src/sys/kern/syscalls.c:1.269 --- src/sys/kern/syscalls.c:1.268 Mon Dec 9 17:15:11 2013 +++ src/sys/kern/syscalls.c Mon Dec 9 19:19:39 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: syscalls.c,v 1.268 2013/12/09 17:15:11 pooka Exp $ */ +/* $NetBSD: syscalls.c,v 1.269 2013/12/09 19:19:39 pooka Exp $ */ /* * System call names. @@ -8,7 +8,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.268 2013/12/09 17:15:11 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.269 2013/12/09 19:19:39 pooka Exp $); #if defined(_KERNEL_OPT) #include opt_modular.h Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.69 src/sys/rump/include/rump/rump_syscalls.h:1.70 --- src/sys/rump/include/rump/rump_syscalls.h:1.69 Mon Dec 9 17:15:11 2013 +++ src/sys/rump/include/rump/rump_syscalls.h Mon Dec 9 19:19:39 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls.h,v 1.69 2013/12/09 17:15:11 pooka Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.70 2013/12/09 19:19:39 pooka Exp $ */ /* * System call protos in rump namespace. Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.94 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.95 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.94 Mon Dec 9 17:15:11 2013 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Mon Dec 9 19:19:39 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls.c,v 1.94 2013/12/09 17:15:11 pooka Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.95 2013/12/09 19:19:39 pooka Exp $ */ /* * System call vector and marshalling for rump. @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.94 2013/12/09 17:15:11 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.95 2013/12/09 19:19:39 pooka Exp $); #include sys/fstypes.h #include sys/proc.h @@ -88,6 +88,7 @@ rump___sysimpl_read(int fd, void * buf, ssize_t rv = -1; struct sys_read_args callarg; + memset(callarg, 0, sizeof(callarg)); SPARG(callarg, fd) = fd; SPARG(callarg, buf) = buf; SPARG(callarg, nbyte) = nbyte; @@ -114,6 +115,7 @@ rump___sysimpl_write(int fd, const void ssize_t rv = -1; struct sys_write_args callarg; + memset(callarg, 0, sizeof(callarg)); SPARG(callarg, fd) = fd; SPARG(callarg, buf) = buf; SPARG(callarg, nbyte) = nbyte; @@ -140,6 +142,7 @@ rump___sysimpl_open(const char * path, i int rv = -1; struct sys_open_args callarg; + memset(callarg, 0, sizeof(callarg)); SPARG(callarg, path) = path; SPARG(callarg, flags) = flags; SPARG(callarg, mode) = mode; @@ -166,6 +169,7 @@ rump___sysimpl_close(int fd) int rv = -1; struct sys_close_args callarg; + memset(callarg, 0, sizeof(callarg)); SPARG(callarg, fd) = fd; error = rsys_syscall(SYS_close, callarg, sizeof(callarg), retval); @@ -190,6 +194,7 @@ rump___sysimpl_link(const char * path, c int rv = -1; struct sys_link_args callarg; + memset(callarg, 0, sizeof(callarg)); SPARG(callarg, path) = path; SPARG(callarg, link) = link; @@ -215,6 +220,7 @@ rump___sysimpl_unlink(const char * path) int rv = -1; struct sys_unlink_args callarg; + memset(callarg, 0, sizeof(callarg)); SPARG(callarg, path) = path; error = rsys_syscall(SYS_unlink, callarg, sizeof(callarg), retval); @@ -239,6 +245,7 @@ rump___sysimpl_chdir(const char * path) int rv = -1;
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Mon Dec 9 19:31:00 UTC 2013
Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh
Log Message:
include ktrace constants
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/rump/include/rump/makerumpdefs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/makerumpdefs.sh
diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.22 src/sys/rump/include/rump/makerumpdefs.sh:1.23
--- src/sys/rump/include/rump/makerumpdefs.sh:1.22 Wed Nov 13 16:42:00 2013
+++ src/sys/rump/include/rump/makerumpdefs.sh Mon Dec 9 19:31:00 2013
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
rm -f rumpdefs.h
exec rumpdefs.h
-printf '/* $NetBSD: makerumpdefs.sh,v 1.22 2013/11/13 16:42:00 pooka Exp $ */\n\n'
+printf '/* $NetBSD: makerumpdefs.sh,v 1.23 2013/12/09 19:31:00 pooka Exp $ */\n\n'
printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n'
printf '#ifndef _RUMP_RUMPDEFS_H_\n'
printf '#define _RUMP_RUMPDEFS_H_\n\n'
@@ -103,6 +103,11 @@ sed -n '/#define[ ]*_IO.*\\$/{:t;N;/\\$
sed -n '/#define[ ]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp}' ../../../sys/ioccom.h \
| sed 's,/\*.*$,,'
+fromvers ../../../sys/ktrace.h
+sed -n '/#define[ ]*KTROP_[A-Z_]/s/KTROP_/RUMP_/gp' ../../../sys/ktrace.h | sed 's,/\*.*$,,'
+sed -n '/#define[ ]*KTR_[A-Z_]/s/KTR_/RUMP_/gp' ../../../sys/ktrace.h | sed 's,/\*.*$,,'
+sed -n '/#define[ ]*KTRFAC_[A-Z_]/{s/KTRFAC_/RUMP_/g;s/KTR_/RUMP_/g;p;}' ../../../sys/ktrace.h | sed 's,/\*.*$,,'
+
fromvers ../../../sys/module.h
getstruct ../../../sys/module.h modctl_load
getenum ../../../sys/module.h modctl MODCTL
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Mon Dec 9 19:31:36 UTC 2013
Modified Files:
src/sys/rump/include/rump: rumpdefs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/rump/include/rump/rumpdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.27 src/sys/rump/include/rump/rumpdefs.h:1.28
--- src/sys/rump/include/rump/rumpdefs.h:1.27 Wed Nov 13 16:42:30 2013
+++ src/sys/rump/include/rump/rumpdefs.h Mon Dec 9 19:31:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.27 2013/11/13 16:42:30 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.28 2013/12/09 19:31:36 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -33,7 +33,7 @@
#define RUMP_O_SEARCH 0x0080 /* skip search permission checks */
#define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */
-/* NetBSD: vnode.h,v 1.240 2013/11/07 09:48:34 hannken Exp */
+/* NetBSD: vnode.h,v 1.243 2013/12/01 17:29:40 christos Exp */
enum rump_vtype { RUMP_VNON, RUMP_VREG, RUMP_VDIR, RUMP_VBLK, RUMP_VCHR, RUMP_VLNK, RUMP_VSOCK, RUMP_VFIFO, RUMP_VBAD };
#define RUMP_LK_SHARED 0x0001
#define RUMP_LK_EXCLUSIVE 0x0002
@@ -295,7 +295,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_MSG_IOVUSRSPACE 0x400
#define RUMP_MSG_LENUSRSPACE 0x800
-/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */
+/* NetBSD: in.h,v 1.89 2013/06/27 19:38:16 christos Exp */
#define RUMP_IP_OPTIONS 1
#define RUMP_IP_HDRINCL 2
#define RUMP_IP_TOS 3
@@ -316,6 +316,8 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_IP_IPSEC_POLICY 22
#define RUMP_IP_RECVTTL 23
#define RUMP_IP_MINTTL 24
+#define RUMP_IP_PKTINFO 25
+#define RUMP_IP_RECVPKTINFO 26
#define RUMP_IP_DEFAULT_MULTICAST_TTL 1
#define RUMP_IP_DEFAULT_MULTICAST_LOOP 1
#define RUMP_IP_MAX_MEMBERSHIPS 20
@@ -377,7 +379,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_TCP_MD5SIG 0x10
#define RUMP_TCP_CONGCTL 0x20
-/* NetBSD: mount.h,v 1.209 2013/04/26 22:27:16 mlelstv Exp */
+/* NetBSD: mount.h,v 1.210 2013/11/23 13:35:36 christos Exp */
#define RUMP_MOUNT_FFS ffs
#define RUMP_MOUNT_UFS RUMP_MOUNT_FFS
#define RUMP_MOUNT_NFS nfs
@@ -470,6 +472,47 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define _RUMP_IOW(g,n,t) _RUMP_IOC(RUMP_IOC_IN, (g), (n), sizeof(t))
#define _RUMP_IOWR(g,n,t) _RUMP_IOC(RUMP_IOC_INOUT, (g), (n), sizeof(t))
+/* NetBSD: ktrace.h,v 1.61 2013/12/09 17:43:58 pooka Exp */
+#define RUMP_KTROP_SET 0
+#define RUMP_KTROP_CLEAR 1
+#define RUMP_KTROP_CLEARFILE 2
+#define RUMP_KTROP_MASK 0x3
+#define RUMP_KTR_SHIMLEN offsetof(struct ktr_header, ktr_pid)
+#define RUMP_KTR_SYSCALL 1
+#define RUMP_KTR_SYSRET 2
+#define RUMP_KTR_NAMEI 3
+#define RUMP_KTR_GENIO 4
+#define RUMP_KTR_PSIG 5
+#define RUMP_KTR_CSW 6
+#define RUMP_KTR_EMUL 7
+#define RUMP_KTR_USER 8
+#define RUMP_KTR_USER_MAXIDLEN 20
+#define RUMP_KTR_USER_MAXLEN 2048
+#define RUMP_KTR_EXEC_ARG 10
+#define RUMP_KTR_EXEC_ENV 11
+#define RUMP_KTR_SAUPCALL 13
+#define RUMP_KTR_MIB 14
+#define RUMP_KTR_EXEC_FD 15
+#define RUMP_KTRFAC_MASK 0x00ff
+#define RUMP_KTRFAC_SYSCALL (1RUMP_KTR_SYSCALL)
+#define RUMP_KTRFAC_SYSRET (1RUMP_KTR_SYSRET)
+#define RUMP_KTRFAC_NAMEI (1RUMP_KTR_NAMEI)
+#define RUMP_KTRFAC_GENIO (1RUMP_KTR_GENIO)
+#define RUMP_KTRFAC_PSIG (1RUMP_KTR_PSIG)
+#define RUMP_KTRFAC_CSW (1RUMP_KTR_CSW)
+#define RUMP_KTRFAC_EMUL (1RUMP_KTR_EMUL)
+#define RUMP_KTRFAC_USER (1RUMP_KTR_USER)
+#define RUMP_KTRFAC_EXEC_ARG (1RUMP_KTR_EXEC_ARG)
+#define RUMP_KTRFAC_EXEC_ENV (1RUMP_KTR_EXEC_ENV)
+#define RUMP_KTRFAC_MIB (1RUMP_KTR_MIB)
+#define RUMP_KTRFAC_EXEC_FD (1RUMP_KTR_EXEC_FD)
+#define RUMP_KTRFAC_PERSISTENT 0x8000
+#define RUMP_KTRFAC_INHERIT 0x4000
+#define RUMP_KTRFAC_TRC_EMUL 0x1000
+#define RUMP_KTRFAC_VER_MASK 0x0f00
+#define RUMP_KTRFAC_VER_SHIFT 24
+#define RUMP_KTRFAC_VERSION(tf) (((tf) RUMP_KTRFAC_VER_MASK) RUMP_KTRFAC_VER_SHIFT)
+
/* NetBSD: module.h,v 1.34 2013/10/23 18:57:40 mbalmer Exp */
struct rump_modctl_load {
const char *ml_filename;
@@ -486,7 +529,7 @@ enum rump_modctl {
RUMP_MODCTL_EXISTS /* enum: 0: load, 1: autoload */
};
-/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
+/* NetBSD: ufsmount.h,v 1.41 2013/08/11 04:36:17 dholland Exp */
struct rump_ufs_args {
char *fspec; /* block special device to mount */
};
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 19:47:59 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: scheduler.c
Log Message:
Reenable calls to KPREEMPT_EN/DISABLE(). I'm almost certain I commented
them out accidentally in rev 1.30.
... not that they do much in rump kernels which are always
run-to-completion, but maybe there's some driver debugging value.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/rump/librump/rumpkern/scheduler.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.34 src/sys/rump/librump/rumpkern/scheduler.c:1.35
--- src/sys/rump/librump/rumpkern/scheduler.c:1.34 Wed May 15 14:07:26 2013
+++ src/sys/rump/librump/rumpkern/scheduler.c Mon Dec 9 19:47:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scheduler.c,v 1.34 2013/05/15 14:07:26 pooka Exp $ */
+/* $NetBSD: scheduler.c,v 1.35 2013/12/09 19:47:59 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.34 2013/05/15 14:07:26 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.35 2013/12/09 19:47:59 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -513,14 +513,14 @@ void
kpreempt_disable(void)
{
- //KPREEMPT_DISABLE(curlwp);
+ KPREEMPT_DISABLE(curlwp);
}
void
kpreempt_enable(void)
{
- //KPREEMPT_ENABLE(curlwp);
+ KPREEMPT_ENABLE(curlwp);
}
void
CVS commit: [netbsd-6] src/usr.bin/gzip
Module Name:src
Committed By: bouyer
Date: Mon Dec 9 20:24:21 UTC 2013
Modified Files:
src/usr.bin/gzip [netbsd-6]: zmore
Log Message:
Pullup the following revisions, requested by pettai in ticket #982:
usr.bin/gzip/zmore: revision 1.5
fix == compatibility problem
To generate a diff of this commit:
cvs rdiff -u -r1.3.52.1 -r1.3.52.2 src/usr.bin/gzip/zmore
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/zmore
diff -u src/usr.bin/gzip/zmore:1.3.52.1 src/usr.bin/gzip/zmore:1.3.52.2
--- src/usr.bin/gzip/zmore:1.3.52.1 Thu Dec 5 18:44:26 2013
+++ src/usr.bin/gzip/zmore Mon Dec 9 20:24:21 2013
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: zmore,v 1.3.52.1 2013/12/05 18:44:26 bouyer Exp $
+# $NetBSD: zmore,v 1.3.52.2 2013/12/09 20:24:21 bouyer Exp $
#
# $OpenBSD: zmore,v 1.6 2008/08/20 09:22:02 mpf Exp $
#
@@ -41,7 +41,7 @@ while test $# -ne 0; do
esac
done
-if [ `basename $0` == zless ] ; then
+if [ `basename $0` = zless ] ; then
pager=${PAGER-less}
else
pager=${PAGER-more}
@@ -49,13 +49,13 @@ fi
# No files means read from stdin
if [ $# -eq 0 ]; then
- gzip -cdfq 21 | ${PAGER-more} $flags
+ gzip -cdfq 21 | $pager $flags
exit 0
fi
oterm=`stty -g 2/dev/null`
while test $# -ne 0; do
- gzip -cdfq $1 21 | ${PAGER-more} $flags
+ gzip -cdfq $1 21 | $pager $flags
prev=$1
shift
if tty -s test -n $oterm -a $# -gt 0; then
CVS commit: [netbsd-5] src/usr.bin/gzip
Module Name:src
Committed By: bouyer
Date: Mon Dec 9 20:24:18 UTC 2013
Modified Files:
src/usr.bin/gzip [netbsd-5]: zmore
Log Message:
Pullup the following revisions, requested by pettai in ticket #1889:
usr.bin/gzip/zmore: revision 1.5
fix == compatibility problem
To generate a diff of this commit:
cvs rdiff -u -r1.3.34.1 -r1.3.34.2 src/usr.bin/gzip/zmore
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/zmore
diff -u src/usr.bin/gzip/zmore:1.3.34.1 src/usr.bin/gzip/zmore:1.3.34.2
--- src/usr.bin/gzip/zmore:1.3.34.1 Thu Dec 5 18:46:15 2013
+++ src/usr.bin/gzip/zmore Mon Dec 9 20:24:18 2013
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: zmore,v 1.3.34.1 2013/12/05 18:46:15 bouyer Exp $
+# $NetBSD: zmore,v 1.3.34.2 2013/12/09 20:24:18 bouyer Exp $
#
# $OpenBSD: zmore,v 1.6 2008/08/20 09:22:02 mpf Exp $
#
@@ -41,7 +41,7 @@ while test $# -ne 0; do
esac
done
-if [ `basename $0` == zless ] ; then
+if [ `basename $0` = zless ] ; then
pager=${PAGER-less}
else
pager=${PAGER-more}
@@ -49,13 +49,13 @@ fi
# No files means read from stdin
if [ $# -eq 0 ]; then
- gzip -cdfq 21 | ${PAGER-more} $flags
+ gzip -cdfq 21 | $pager $flags
exit 0
fi
oterm=`stty -g 2/dev/null`
while test $# -ne 0; do
- gzip -cdfq $1 21 | ${PAGER-more} $flags
+ gzip -cdfq $1 21 | $pager $flags
prev=$1
shift
if tty -s test -n $oterm -a $# -gt 0; then
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Mon Dec 9 20:25:59 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Adjust revision list for #1889 To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.36 src/doc/CHANGES-5.3:1.1.2.37 --- src/doc/CHANGES-5.3:1.1.2.36 Sun Nov 17 18:13:40 2013 +++ src/doc/CHANGES-5.3 Mon Dec 9 20:25:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.36 2013/11/17 18:13:40 bouyer Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.37 2013/12/09 20:25:59 bouyer Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -632,7 +632,7 @@ sys/ufs/ffs/ffs_alloc.c1.144 via pat distrib/sets/lists/base/mi 1.1049 distrib/sets/lists/man/mi 1.1449 usr.bin/gzip/Makefile1.17, 1.18 -usr.bin/gzip/zmore1.4 +usr.bin/gzip/zmore1.4, 1.5 usr.bin/gzip/zmore.11.4 Added zless(1) - comes in the lastest version of zmore(1) from OpenBSD
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Mon Dec 9 20:25:28 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Adjust revision list for #982 To generate a diff of this commit: cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.61 src/doc/CHANGES-6.2:1.1.2.62 --- src/doc/CHANGES-6.2:1.1.2.61 Mon Nov 25 08:31:57 2013 +++ src/doc/CHANGES-6.2 Mon Dec 9 20:25:28 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.61 2013/11/25 08:31:57 bouyer Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.62 2013/12/09 20:25:28 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -983,7 +983,7 @@ sys/dev/ic/esiop.c1.57 via patch distrib/sets/lists/base/mi 1.1049 distrib/sets/lists/man/mi 1.1449 usr.bin/gzip/Makefile1.17, 1.18 -usr.bin/gzip/zmore1.4 +usr.bin/gzip/zmore1.4, 1.5 usr.bin/gzip/zmore.11.4 Added zless(1) - comes in the lastest version of zmore(1) from OpenBSD
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: pooka
Date: Mon Dec 9 20:44:00 UTC 2013
Modified Files:
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Log Message:
Now that Makefile.rump is included here first, do not override any
SRCS it adds. This is required for linksyms_sun.c used when linking
with the Solaris linker.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.38 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.39
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.38 Mon Dec 9 17:57:11 2013
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Dec 9 20:44:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.38 2013/12/09 17:57:11 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.39 2013/12/09 20:44:00 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -18,7 +18,7 @@ LIB= rumpvfs
#
# Source modules, first the ones specifically implemented for librump.
#
-SRCS= rump_vfs.c devnodes.c devnull.c rumpblk.c rumpfs.c vm_vfs.c
+SRCS+= rump_vfs.c devnodes.c devnull.c rumpblk.c rumpfs.c vm_vfs.c
SRCS+= rumpvfs_if_wrappers.c
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 21:11:15 UTC 2013
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
need string.h now for !_KERNEL
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.137 src/sys/kern/makesyscalls.sh:1.138
--- src/sys/kern/makesyscalls.sh:1.137 Mon Dec 9 19:18:52 2013
+++ src/sys/kern/makesyscalls.sh Mon Dec 9 21:11:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.137 2013/12/09 19:18:52 pooka Exp $
+# $NetBSD: makesyscalls.sh,v 1.138 2013/12/09 21:11:15 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -233,6 +233,7 @@ NR == 1 {
printf #include errno.h\n rumpcalls
printf #include stdint.h\n rumpcalls
printf #include stdlib.h\n\n rumpcalls
+ printf #include string.h\n\n rumpcalls
printf #include srcsys/syscall.h\n rumpcalls
printf #include srcsys/syscallargs.h\n\n rumpcalls
printf #include rump/rumpclient.h\n\n rumpcalls
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Mon Dec 9 21:12:45 UTC 2013
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
one newline is enough
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.138 src/sys/kern/makesyscalls.sh:1.139
--- src/sys/kern/makesyscalls.sh:1.138 Mon Dec 9 21:11:15 2013
+++ src/sys/kern/makesyscalls.sh Mon Dec 9 21:12:45 2013
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.138 2013/12/09 21:11:15 pooka Exp $
+# $NetBSD: makesyscalls.sh,v 1.139 2013/12/09 21:12:45 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -232,7 +232,7 @@ NR == 1 {
printf #ifdef RUMP_CLIENT\n rumpcalls
printf #include errno.h\n rumpcalls
printf #include stdint.h\n rumpcalls
- printf #include stdlib.h\n\n rumpcalls
+ printf #include stdlib.h\n rumpcalls
printf #include string.h\n\n rumpcalls
printf #include srcsys/syscall.h\n rumpcalls
printf #include srcsys/syscallargs.h\n\n rumpcalls
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Mon Dec 9 21:13:22 UTC 2013 Modified Files: src/sys/kern: init_sysent.c syscalls.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/sys/kern/init_sysent.c cvs rdiff -u -r1.269 -r1.270 src/sys/kern/syscalls.c cvs rdiff -u -r1.70 -r1.71 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.95 -r1.96 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.265 -r1.266 src/sys/sys/syscall.h cvs rdiff -u -r1.248 -r1.249 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.278 src/sys/kern/init_sysent.c:1.279 --- src/sys/kern/init_sysent.c:1.278 Mon Dec 9 19:19:39 2013 +++ src/sys/kern/init_sysent.c Mon Dec 9 21:13:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysent.c,v 1.278 2013/12/09 19:19:39 pooka Exp $ */ +/* $NetBSD: init_sysent.c,v 1.279 2013/12/09 21:13:22 pooka Exp $ */ /* * System call switch table. @@ -8,7 +8,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.278 2013/12/09 19:19:39 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.279 2013/12/09 21:13:22 pooka Exp $); #include opt_modular.h #include opt_ntp.h Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.269 src/sys/kern/syscalls.c:1.270 --- src/sys/kern/syscalls.c:1.269 Mon Dec 9 19:19:39 2013 +++ src/sys/kern/syscalls.c Mon Dec 9 21:13:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: syscalls.c,v 1.269 2013/12/09 19:19:39 pooka Exp $ */ +/* $NetBSD: syscalls.c,v 1.270 2013/12/09 21:13:22 pooka Exp $ */ /* * System call names. @@ -8,7 +8,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.269 2013/12/09 19:19:39 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.270 2013/12/09 21:13:22 pooka Exp $); #if defined(_KERNEL_OPT) #include opt_modular.h Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.70 src/sys/rump/include/rump/rump_syscalls.h:1.71 --- src/sys/rump/include/rump/rump_syscalls.h:1.70 Mon Dec 9 19:19:39 2013 +++ src/sys/rump/include/rump/rump_syscalls.h Mon Dec 9 21:13:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls.h,v 1.70 2013/12/09 19:19:39 pooka Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.71 2013/12/09 21:13:22 pooka Exp $ */ /* * System call protos in rump namespace. Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.95 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.96 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.95 Mon Dec 9 19:19:39 2013 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Mon Dec 9 21:13:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls.c,v 1.95 2013/12/09 19:19:39 pooka Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.96 2013/12/09 21:13:22 pooka Exp $ */ /* * System call vector and marshalling for rump. @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.95 2013/12/09 19:19:39 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.96 2013/12/09 21:13:22 pooka Exp $); #include sys/fstypes.h #include sys/proc.h @@ -25,6 +25,7 @@ __KERNEL_RCSID(0, $NetBSD: rump_syscall #include errno.h #include stdint.h #include stdlib.h +#include string.h #include srcsys/syscall.h #include srcsys/syscallargs.h Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.265 src/sys/sys/syscall.h:1.266 --- src/sys/sys/syscall.h:1.265 Mon Dec 9 19:19:39 2013 +++ src/sys/sys/syscall.h Mon Dec 9 21:13:21 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.h,v 1.265 2013/12/09 19:19:39 pooka Exp $ */ +/* $NetBSD: syscall.h,v 1.266 2013/12/09 21:13:21 pooka Exp $ */ /* * System call numbers. Index: src/sys/sys/syscallargs.h diff -u src/sys/sys/syscallargs.h:1.248 src/sys/sys/syscallargs.h:1.249 --- src/sys/sys/syscallargs.h:1.248 Mon Dec 9 19:19:39 2013 +++ src/sys/sys/syscallargs.h Mon Dec 9 21:13:21 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: syscallargs.h,v 1.248 2013/12/09 19:19:39 pooka Exp $ */ +/* $NetBSD: syscallargs.h,v 1.249 2013/12/09 21:13:21 pooka Exp $ */ /* * System call argument lists.
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Tue Dec 10 01:05:00 UTC 2013 Modified Files: src/sbin/gpt: add.c resize.c set.c unset.c Log Message: Explicitly state which partition was added/modified. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sbin/gpt/add.c cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/resize.c cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/set.c src/sbin/gpt/unset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/add.c diff -u src/sbin/gpt/add.c:1.23 src/sbin/gpt/add.c:1.24 --- src/sbin/gpt/add.c:1.23 Sun Dec 8 09:32:51 2013 +++ src/sbin/gpt/add.c Tue Dec 10 01:05:00 2013 @@ -29,7 +29,7 @@ __FBSDID($FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $); #endif #ifdef __RCSID -__RCSID($NetBSD: add.c,v 1.23 2013/12/08 09:32:51 jnemeth Exp $); +__RCSID($NetBSD: add.c,v 1.24 2013/12/10 01:05:00 jnemeth Exp $); #endif #include sys/types.h @@ -180,7 +180,7 @@ add(int fd) gpt_write(fd, lbt); gpt_write(fd, tpg); - printf(Partition added, use:\n); + printf(Partition %d added, use:\n, i + 1); printf(\tdkctl %s addwedge wedgename % PRIu64 % PRIu64 type\n, device_arg, map-map_start, map-map_size); printf(to create a wedge for it\n); Index: src/sbin/gpt/resize.c diff -u src/sbin/gpt/resize.c:1.7 src/sbin/gpt/resize.c:1.8 --- src/sbin/gpt/resize.c:1.7 Sun Dec 8 09:32:51 2013 +++ src/sbin/gpt/resize.c Tue Dec 10 01:05:00 2013 @@ -29,7 +29,7 @@ __FBSDID($FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $); #endif #ifdef __RCSID -__RCSID($NetBSD: resize.c,v 1.7 2013/12/08 09:32:51 jnemeth Exp $); +__RCSID($NetBSD: resize.c,v 1.8 2013/12/10 01:05:00 jnemeth Exp $); #endif #include sys/types.h @@ -165,7 +165,7 @@ resize(int fd) gpt_write(fd, lbt); gpt_write(fd, tpg); - printf(Partition resized, use:\n); + printf(Partition %d resized, use:\n, entry); printf(\tdkctl %s addwedge wedgename % PRIu64 % PRIu64 type\n, device_arg, map-map_start, newsize); printf(to create a wedge for it\n); Index: src/sbin/gpt/set.c diff -u src/sbin/gpt/set.c:1.1 src/sbin/gpt/set.c:1.2 --- src/sbin/gpt/set.c:1.1 Mon Dec 9 08:03:17 2013 +++ src/sbin/gpt/set.c Tue Dec 10 01:05:00 2013 @@ -29,7 +29,7 @@ __FBSDID($FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $); #endif #ifdef __RCSID -__RCSID($NetBSD: set.c,v 1.1 2013/12/09 08:03:17 jnemeth Exp $); +__RCSID($NetBSD: set.c,v 1.2 2013/12/10 01:05:00 jnemeth Exp $); #endif #include sys/types.h @@ -131,7 +131,7 @@ set(int fd) gpt_write(fd, lbt); gpt_write(fd, tpg); - printf(Partition attributes updated\n); + printf(Partition %d attributes updated\n, entry); } int Index: src/sbin/gpt/unset.c diff -u src/sbin/gpt/unset.c:1.1 src/sbin/gpt/unset.c:1.2 --- src/sbin/gpt/unset.c:1.1 Mon Dec 9 08:03:17 2013 +++ src/sbin/gpt/unset.c Tue Dec 10 01:05:00 2013 @@ -29,7 +29,7 @@ __FBSDID($FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $); #endif #ifdef __RCSID -__RCSID($NetBSD: unset.c,v 1.1 2013/12/09 08:03:17 jnemeth Exp $); +__RCSID($NetBSD: unset.c,v 1.2 2013/12/10 01:05:00 jnemeth Exp $); #endif #include sys/types.h @@ -131,7 +131,7 @@ unset(int fd) gpt_write(fd, lbt); gpt_write(fd, tpg); - printf(Partition attributes updated\n); + printf(Partition %d attributes updated\n, entry); } int
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: riz Date: Tue Dec 10 01:09:32 UTC 2013 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Fix the build setlists for MKLINT=yes + MKRUMP=yes To generate a diff of this commit: cvs rdiff -u -r1.1868 -r1.1869 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1868 src/distrib/sets/lists/comp/mi:1.1869 --- src/distrib/sets/lists/comp/mi:1.1868 Tue Dec 3 16:13:49 2013 +++ src/distrib/sets/lists/comp/mi Tue Dec 10 01:09:31 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1868 2013/12/03 16:13:49 njoly Exp $ +# $NetBSD: mi,v 1.1869 2013/12/10 01:09:31 riz Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4043,6 +4043,7 @@ ./usr/libdata/lint/llib-lrt.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lrumpclient.ln comp-c-lintlib lint,rump ./usr/libdata/lint/llib-lrumphijack.ln comp-c-lintlib lint,rump +./usr/libdata/lint/llib-lrumpnet_netbt.ln comp-c-lintlib lint,rump ./usr/libdata/lint/llib-lrumpuser.ln comp-c-lintlib lint,rump ./usr/libdata/lint/llib-lsaslc.ln comp-c-lintlib lint,crypto ./usr/libdata/lint/llib-lsdp.ln comp-obsolete obsolete
