Delete ktracing of context switches: it's unused, and not particularly useful,

and doing VOP_WRITE() from inside tsleep/msleep makes the locking too
complicated, making it harder to move forward on MP changes.

ok deraadt@ kettenis@

3 files changed, 3 insertions, 39 deletions

diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index b4e930149b2..29403528cde 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_ktrace.c,v 1.76 2015/08/22 20:18:49 deraadt Exp $	*/
+/*	$OpenBSD: kern_ktrace.c,v 1.77 2015/09/07 15:38:45 guenther Exp $	*/
 /*	$NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $	*/
 
 /*
@@ -313,21 +313,6 @@ ktrpsig(struct proc *p, int sig, sig_t action, int mask, int code,
 }
 
 void
-ktrcsw(struct proc *p, int out, int user)
-{
-	struct ktr_header kth;
-	struct ktr_csw kc;
-
-	atomic_setbits_int(&p->p_flag, P_INKTR);
-	ktrinitheader(&kth, p, KTR_CSW);
-	kc.out = out;
-	kc.user = user;
-
-	ktrwrite(p, &kth, &kc, sizeof(kc));
-	atomic_clearbits_int(&p->p_flag, P_INKTR);
-}
-
-void
 ktrstruct(struct proc *p, const char *name, const void *data, size_t datalen)
 {
 	struct ktr_header kth;
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 7a49c354ae5..7c1ff231854 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_synch.c,v 1.121 2015/05/12 09:30:35 mikeb Exp $	*/
+/*	$OpenBSD: kern_synch.c,v 1.122 2015/09/07 15:38:45 guenther Exp $	*/
 /*	$NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $	*/
 
 /*
@@ -234,11 +234,6 @@ sleep_setup(struct sleep_state *sls, const volatile void *ident, int prio,
 		panic("tsleep: not SONPROC");
 #endif
 
-#ifdef KTRACE
-	if (KTRPOINT(p, KTR_CSW))
-		ktrcsw(p, 1, 0);
-#endif
-
 	sls->sls_catch = 0;
 	sls->sls_do_sleep = 1;
 	sls->sls_sig = 1;
@@ -279,11 +274,6 @@ sleep_finish(struct sleep_state *sls, int do_sleep)
 	 * we need to clear it before the ktrace.
 	 */
 	atomic_clearbits_int(&p->p_flag, P_SINTR);
-
-#ifdef KTRACE
-	if (KTRPOINT(p, KTR_CSW))
-		ktrcsw(p, 0, 0);
-#endif
 }
 
 void
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 94fd788e6f7..2eec62f2758 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ktrace.h,v 1.23 2015/07/28 05:50:41 guenther Exp $	*/
+/*	$OpenBSD: ktrace.h,v 1.24 2015/09/07 15:38:45 guenther Exp $	*/
 /*	$NetBSD: ktrace.h,v 1.12 1996/02/04 02:12:29 christos Exp $	*/
 
 /*
@@ -129,15 +129,6 @@ struct ktr_psig {
 };
 
 /*
- * KTR_CSW - trace context switches
- */
-#define KTR_CSW		6
-struct ktr_csw {
-	int	out;	/* 1 if switch out, 0 if switch in */
-	int	user;	/* 1 if usermode (ivcsw), 0 if kernel (vcsw) */
-};
-
-/*
  * KTR_EMUL - emulation change
  */
 #define KTR_EMUL	7
@@ -176,7 +167,6 @@ struct ktr_user {
 #define KTRFAC_NAMEI	(1<<KTR_NAMEI)
 #define KTRFAC_GENIO	(1<<KTR_GENIO)
 #define	KTRFAC_PSIG	(1<<KTR_PSIG)
-#define KTRFAC_CSW	(1<<KTR_CSW)
 #define KTRFAC_EMUL	(1<<KTR_EMUL)
 #define KTRFAC_STRUCT   (1<<KTR_STRUCT)
 #define KTRFAC_USER	(1<<KTR_USER)
@@ -198,7 +188,6 @@ __END_DECLS
 
 #else
 
-void ktrcsw(struct proc *, int, int);
 void ktremul(struct proc *);
 void ktrgenio(struct proc *, int, enum uio_rw, struct iovec *, ssize_t);
 void ktrnamei(struct proc *, char *);