Module Name: src
Committed By: joerg
Date: Wed Apr 27 00:00:47 UTC 2011
Modified Files:
src/sys/kern: kern_ktrace.c kern_stub.c
src/sys/sys: ktrace.h
src/usr.bin/kdump: kdump.c
src/usr.bin/ktrace: ktrace.1 ktrace.h subr.c
Log Message:
Remove Mach specific trace points.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/kern/kern_ktrace.c
cvs rdiff -u -r1.30 -r1.31 src/sys/kern/kern_stub.c
cvs rdiff -u -r1.56 -r1.57 src/sys/sys/ktrace.h
cvs rdiff -u -r1.110 -r1.111 src/usr.bin/kdump/kdump.c
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/ktrace/ktrace.1
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/ktrace/ktrace.h
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/ktrace/subr.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_ktrace.c
diff -u src/sys/kern/kern_ktrace.c:1.155 src/sys/kern/kern_ktrace.c:1.156
--- src/sys/kern/kern_ktrace.c:1.155 Fri Nov 19 06:44:42 2010
+++ src/sys/kern/kern_ktrace.c Wed Apr 27 00:00:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.155 2010/11/19 06:44:42 dholland Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.156 2011/04/27 00:00:46 joerg Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.155 2010/11/19 06:44:42 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.156 2011/04/27 00:00:46 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -965,39 +965,6 @@
}
void
-ktr_mmsg(const void *msgh, size_t size)
-{
- lwp_t *l = curlwp;
-
- if (!KTRPOINT(l->l_proc, KTR_MMSG))
- return;
-
- ktr_kmem(l, KTR_MMSG, msgh, size);
-}
-
-void
-ktr_mool(const void *kaddr, size_t size, const void *uaddr)
-{
- struct ktrace_entry *kte;
- struct ktr_mool *kp;
- struct ktr_mool *bf;
- lwp_t *l = curlwp;
-
- if (!KTRPOINT(l->l_proc, KTR_MOOL))
- return;
-
- if (ktealloc(&kte, (void *)&kp, l, KTR_MOOL, size + sizeof(*kp)))
- return;
-
- kp->uaddr = uaddr;
- kp->size = size;
- bf = kp + 1; /* Skip uaddr and size */
- (void)memcpy(bf, kaddr, size);
-
- ktraddentry(l, kte, KTA_WAITOK);
-}
-
-void
ktr_saupcall(struct lwp *l, int type, int nevent, int nint, void *sas,
void *ap, void *ksas)
{
Index: src/sys/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.30 src/sys/kern/kern_stub.c:1.31
--- src/sys/kern/kern_stub.c:1.30 Mon Jan 31 23:07:16 2011
+++ src/sys/kern/kern_stub.c Wed Apr 27 00:00:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_stub.c,v 1.30 2011/01/31 23:07:16 dyoung Exp $ */
+/* $NetBSD: kern_stub.c,v 1.31 2011/04/27 00:00:46 joerg 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.30 2011/01/31 23:07:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.31 2011/04/27 00:00:46 joerg Exp $");
#include "opt_ptrace.h"
#include "opt_ktrace.h"
@@ -107,9 +107,7 @@
__weak_alias(ktr_syscall,nullop);
__weak_alias(ktr_sysret,nullop);
__weak_alias(ktr_kuser,nullop);
-__weak_alias(ktr_mmsg,nullop);
__weak_alias(ktr_mib,nullop);
-__weak_alias(ktr_mool,nullop);
__weak_alias(ktr_execarg,nullop);
__weak_alias(ktr_execenv,nullop);
Index: src/sys/sys/ktrace.h
diff -u src/sys/sys/ktrace.h:1.56 src/sys/sys/ktrace.h:1.57
--- src/sys/sys/ktrace.h:1.56 Sun Jan 11 02:45:55 2009
+++ src/sys/sys/ktrace.h Wed Apr 27 00:00:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ktrace.h,v 1.56 2009/01/11 02:45:55 christos Exp $ */
+/* $NetBSD: ktrace.h,v 1.57 2011/04/27 00:00:46 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -190,25 +190,6 @@
};
/*
- * KTR_MMSG - Mach message
- */
-#define KTR_MMSG 9
-struct ktr_mmsg {
- /*
- * This is a Mach message header
- */
- int ktr_bits;
- int ktr_size;
- int ktr_remote_port;
- int ktr_local_port;
- int ktr_reserved;
- int ktr_id;
- /*
- * Followed by ktr_size - sizeof(mach_msg_header_t) of message payload
- */
-};
-
-/*
* KTR_EXEC_ARG, KTR_EXEC_ENV - Arguments and environment from exec
*/
#define KTR_EXEC_ARG 10
@@ -216,16 +197,6 @@
/* record contains arg/env string */
/*
- * KTR_MOOL - Mach Out Of Line data
- */
-#define KTR_MOOL 12
-struct ktr_mool {
- const void *uaddr; /* User address */
- size_t size; /* Data len */
- /* Followed by size bytes of data */
-};
-
-/*
* KTR_SAUPCALL - scheduler activated upcall.
*/
#define KTR_SAUPCALL 13
@@ -259,10 +230,8 @@
#define KTRFAC_CSW (1<<KTR_CSW)
#define KTRFAC_EMUL (1<<KTR_EMUL)
#define KTRFAC_USER (1<<KTR_USER)
-#define KTRFAC_MMSG (1<<KTR_MMSG)
#define KTRFAC_EXEC_ARG (1<<KTR_EXEC_ARG)
#define KTRFAC_EXEC_ENV (1<<KTR_EXEC_ENV)
-#define KTRFAC_MOOL (1<<KTR_MOOL)
#define KTRFAC_SAUPCALL (1<<KTR_SAUPCALL)
#define KTRFAC_MIB (1<<KTR_MIB)
/*
@@ -314,9 +283,7 @@
void ktr_syscall(register_t, const register_t [], int);
void ktr_sysret(register_t, int, register_t *);
void ktr_kuser(const char *, void *, size_t);
-void ktr_mmsg(const void *, size_t);
void ktr_mib(const int *a , u_int b);
-void ktr_mool(const void *, size_t, const void *);
void ktr_execarg(const void *, size_t);
void ktr_execenv(const void *, size_t);
void ktr_saupcall(struct lwp *, int, int, int, void *, void *, void *);
@@ -405,13 +372,6 @@
}
static inline void
-ktrmmsg(const void *a, size_t b)
-{
- if (__predict_false(ktrace_on))
- ktr_mmsg(a, b);
-}
-
-static inline void
ktrmib(const int *a , u_int b)
{
if (__predict_false(ktrace_on))
@@ -419,13 +379,6 @@
}
static inline void
-ktrmool(const void *a, size_t b, const void *c)
-{
- if (__predict_false(ktrace_on))
- ktr_mool(a, b, c);
-}
-
-static inline void
ktrexecarg(const void *a, size_t b)
{
if (__predict_false(ktrace_on))
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.110 src/usr.bin/kdump/kdump.c:1.111
--- src/usr.bin/kdump/kdump.c:1.110 Tue Apr 26 15:51:32 2011
+++ src/usr.bin/kdump/kdump.c Wed Apr 27 00:00:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.110 2011/04/26 15:51:32 joerg Exp $ */
+/* $NetBSD: kdump.c,v 1.111 2011/04/27 00:00:47 joerg Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kdump.c,v 1.110 2011/04/26 15:51:32 joerg Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.111 2011/04/27 00:00:47 joerg Exp $");
#endif
#endif /* not lint */
@@ -114,8 +114,6 @@
static void ktrpsig(void *, int);
static void ktrcsw(struct ktr_csw *);
static void ktruser(struct ktr_user *, int);
-static void ktrmmsg(struct ktr_mmsg *, int);
-static void ktrmool(struct ktr_mool *, int);
static void ktrmib(int *, int);
static void usage(void) __dead;
static void eprint(int);
@@ -292,12 +290,6 @@
case KTR_USER:
ktruser(m, ktrlen);
break;
- case KTR_MMSG:
- ktrmmsg(m, ktrlen);
- break;
- case KTR_MOOL:
- ktrmool(m, ktrlen);
- break;
case KTR_EXEC_ARG:
case KTR_EXEC_ENV:
visdump_buf(m, ktrlen, col);
@@ -365,12 +357,6 @@
case KTR_USER:
type = "MISC";
break;
- case KTR_MMSG:
- type = "MMSG";
- break;
- case KTR_MOOL:
- type = "MOOL";
- break;
case KTR_EXEC_ENV:
type = "ENV";
break;
@@ -1030,36 +1016,6 @@
}
static void
-ktrmmsg(struct ktr_mmsg *mmsg, int len)
-{
- const char *reply;
- int id;
-
- id = mmsg->ktr_id;
- if ((id / 100) % 2) { /* Message reply */
- reply = " reply";
- id -= 100;
- } else {
- reply = "";
- }
-
- printf("unknown service%s [%d]\n", reply, mmsg->ktr_id);
-
- hexdump_buf(mmsg, len, word_size ? word_size : 4);
-}
-
-static void
-ktrmool(struct ktr_mool *mool, int len)
-{
- size_t size = mool->size;
-
- printf("%ld/0x%lx bytes at %p\n",
- (u_long)size, (u_long)size, mool->uaddr);
- mool++;
- hexdump_buf(mool, size, word_size ? word_size : 4);
-}
-
-static void
ktrmib(int *namep, int len)
{
size_t i;
Index: src/usr.bin/ktrace/ktrace.1
diff -u src/usr.bin/ktrace/ktrace.1:1.39 src/usr.bin/ktrace/ktrace.1:1.40
--- src/usr.bin/ktrace/ktrace.1:1.39 Mon Aug 27 16:35:47 2007
+++ src/usr.bin/ktrace/ktrace.1 Wed Apr 27 00:00:47 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: ktrace.1,v 1.39 2007/08/27 16:35:47 dsl Exp $
+.\" $NetBSD: ktrace.1,v 1.40 2011/04/27 00:00:47 joerg Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)ktrace.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd August 27, 2007
+.Dd April 27, 2011
.Dt KTRACE 1
.Os
.Sh NAME
@@ -184,12 +184,6 @@
.It Cm i
trace
.Tn I/O
-.It Cm l
-trace Mach out of line data when running Mach binaries with COMPAT_MACH
-(currently limited to i386 and powerpc ports).
-.It Cm m
-trace Mach messages when running Mach binaries with COMPAT_MACH
-(currently limited to i386 and powerpc ports).
.It Cm n
trace namei translations
.It Cm S
Index: src/usr.bin/ktrace/ktrace.h
diff -u src/usr.bin/ktrace/ktrace.h:1.19 src/usr.bin/ktrace/ktrace.h:1.20
--- src/usr.bin/ktrace/ktrace.h:1.19 Sat Feb 16 07:19:23 2008
+++ src/usr.bin/ktrace/ktrace.h Wed Apr 27 00:00:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ktrace.h,v 1.19 2008/02/16 07:19:23 matt Exp $ */
+/* $NetBSD: ktrace.h,v 1.20 2011/04/27 00:00:47 joerg Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -32,8 +32,7 @@
*/
#define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \
- KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_EMUL | KTRFAC_USER | \
- KTRFAC_MMSG | KTRFAC_MOOL)
+ KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_EMUL | KTRFAC_USER)
#define ALL_POINTS KTRFAC_MASK
Index: src/usr.bin/ktrace/subr.c
diff -u src/usr.bin/ktrace/subr.c:1.16 src/usr.bin/ktrace/subr.c:1.17
--- src/usr.bin/ktrace/subr.c:1.16 Fri Feb 9 22:08:49 2007
+++ src/usr.bin/ktrace/subr.c Wed Apr 27 00:00:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr.c,v 1.16 2007/02/09 22:08:49 ad Exp $ */
+/* $NetBSD: subr.c,v 1.17 2011/04/27 00:00:47 joerg Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: subr.c,v 1.16 2007/02/09 22:08:49 ad Exp $");
+__RCSID("$NetBSD: subr.c,v 1.17 2011/04/27 00:00:47 joerg Exp $");
#endif
#endif /* not lint */
@@ -79,12 +79,6 @@
case 'n':
fac = KTRFAC_NAMEI;
break;
- case 'm':
- fac = KTRFAC_MMSG;
- break;
- case 'l':
- fac = KTRFAC_MOOL;
- break;
case 's':
fac = KTRFAC_PSIG;
break;
