- Replace the unused KTR_IDLELOOP trace class with a new KTR_WITNESS trace

  class to trace witness events.
- Make the ktr_cpu field of ktr_entry be a standard field rather than one
  present only in the KTR_EXTEND case.
- Move the default definition of KTR_ENTRIES from sys/ktr.h to
  kern/kern_ktr.c.  It has not been needed in the header file since KTR
  was un-inlined.
- Minor include cleanup in kern/kern_ktr.c.
- Fiddle with the ktr_cpumask in ktr_tracepoint() to disable KTR events
  on the current CPU while we are processing an event.
- Set the current CPU inside of the critical section to ensure we don't
  migrate CPU's after the critical section but before we set the CPU.

1 files changed, 6 insertions, 9 deletions

diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index 5c39adb..fe087c7 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -65,7 +65,7 @@
 #define KTR_NFS		0x00040000		/* The obvious */
 #define KTR_VOP		0x00080000		/* The obvious */
 #define KTR_VM		0x00100000		/* The virtual memory system */
-#define KTR_IDLELOOP	0x00200000		/* checks done in the idle process */
+#define KTR_WITNESS	0x00200000
 #define	KTR_RUNQ	0x00400000		/* Run queue */
 #define	KTR_ALL		0x007fffff
 
@@ -91,16 +91,17 @@
 
 #include <sys/time.h>
 
-struct ktr_entry {
-	struct	timespec ktr_tv;
-#ifdef KTR_EXTEND
 #ifndef KTRDESCSIZE
 #define KTRDESCSIZE 80
 #endif
+
+struct ktr_entry {
+	struct	timespec ktr_tv;
+	int	ktr_cpu;
+#ifdef KTR_EXTEND
 	char	ktr_desc[KTRDESCSIZE];
 	const	char *ktr_filename;
 	int	ktr_line;
-	int	ktr_cpu;
 #else
 	const	char *ktr_desc;
 	u_long	ktr_parm1;
@@ -125,10 +126,6 @@ extern struct ktr_entry ktr_buf[];
 #endif /* !LOCORE */
 #ifdef KTR
 
-#ifndef KTR_ENTRIES
-#define	KTR_ENTRIES	1024
-#endif
-
 #ifdef KTR_EXTEND
 void	ktr_tracepoint(u_int mask, const char *filename, u_int line,
 		       const char *format, ...) __printflike(4, 5);