PERFORCE change 95643 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=95643

Change 95643 by jb at jb_freebsd2 on 2006/04/20 01:02:57

	Update two more of the ioctl definitions for the probe structure 
	copyin/out.
	
	Add a few hacks to work around Solaris-isms.
	
	This is mostly a work-in-progress update to ensure that what's in the
	P4 project tree will build OK for others.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#4 (text) ====

@@ -55,7 +55,13 @@
 #include <sys/systm.h>
 #else
 #include <opensolaris/compat/sys/processor.h>
+#include <sys/param.h>
 #include <sys/ioccom.h>
+#include <sys/ucred.h>
+typedef struct ucred cred_t;
+struct modctl {
+	int	something;	/* XXX */
+};
 #endif
 #include <sys/ctf_api.h>
 #if defined(sun)
@@ -1188,9 +1194,11 @@
 #define	DTRACEIOC_REPLICATE	(DTRACEIOC | 18)	/* replicate enab */
 #else
 #define	DTRACEIOC_PROVIDER	_IO('x',1)		/* provider query */
-#define	DTRACEIOC_PROBES	_IO('x',2)		/* probe query */
+#define	DTRACEIOC_PROBES	_IOWR('x',2,dtrace_probedesc_t)
+							/* probe query */
 #define	DTRACEIOC_BUFSNAP	_IO('x',4)		/* snapshot buffer */
-#define	DTRACEIOC_PROBEMATCH	_IO('x',5)		/* match probes */
+#define	DTRACEIOC_PROBEMATCH	_IOWR('x',5,dtrace_probedesc_t)
+							/* match probes */
 #define	DTRACEIOC_ENABLE	_IO('x',6)		/* enable probes */
 #define	DTRACEIOC_AGGSNAP	_IO('x',7)		/* snapshot agg. */
 #define	DTRACEIOC_EPROBE	_IO('x',8)		/* get eprobe desc. */
@@ -1969,9 +1977,7 @@
  */
 typedef struct dtrace_pops {
 	void (*dtps_provide)(void *arg, const dtrace_probedesc_t *spec);
-#ifdef DOODAD
 	void (*dtps_provide_module)(void *arg, struct modctl *mp);
-#endif
 	void (*dtps_enable)(void *arg, dtrace_id_t id, void *parg);
 	void (*dtps_disable)(void *arg, dtrace_id_t id, void *parg);
 	void (*dtps_suspend)(void *arg, dtrace_id_t id, void *parg);
@@ -1986,10 +1992,8 @@
 
 typedef uintptr_t	dtrace_provider_id_t;
 
-#ifdef DOODAD
 extern int dtrace_register(const char *, const dtrace_pattr_t *, uint32_t,
     cred_t *, const dtrace_pops_t *, void *, dtrace_provider_id_t *);
-#endif
 extern int dtrace_unregister(dtrace_provider_id_t);
 extern int dtrace_condense(dtrace_provider_id_t);
 extern void dtrace_invalidate(dtrace_provider_id_t);
@@ -2244,6 +2248,15 @@
 #define	DTRACE_CPUFLAG_CLEAR(flag) \
 	(cpu_core[CPU->cpu_id].cpuc_dtrace_flags &= ~(flag))
 
+#if !defined(sun)
+void cmn_err(int, const char *, ...);
+#define CE_CONT		0
+#define CE_NOTE		1
+#define CE_WARN		2
+#define CE_PANIC	3
+#define CE_IGNORE	4
+#endif
+
 #endif /* _KERNEL */
 
 #endif	/* _ASM */