PERFORCE change 133378 for review

[John Birrell]

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

Change 133378 by jb at jb_freebsd1 on 2008/01/16 00:59:37

	Add some statically defined DTrace probes to the process
	ctor, init and dtor.
	
	If the KDTRACE_HOOKS kernel option isn't set, these macros
	expand to nothing.
	
	If KDTRACE_HOOKS is defined, the extra instructions executed
	for an unenabled probe are effectively:
	
	if (sdt_global_struct.id) {
		... probe
	}
	
	where 'sdt_global_struct' is the global instance of
	'struct sdt_probe'.

Affected files ...

.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#17 edit

Differences ...

==== //depot/projects/dtrace/src/sys/kern/kern_proc.c#17 (text+ko) ====

@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.261 2008/01/10 22:11:20 rwatson Exp $");
 
 #include "opt_ddb.h"
+#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
 #include "opt_stack.h"
@@ -55,6 +56,7 @@
 #include <sys/filedesc.h>
 #include <sys/tty.h>
 #include <sys/signalvar.h>
+#include <sys/sdt.h>
 #include <sys/sx.h>
 #include <sys/user.h>
 #include <sys/jail.h>
@@ -76,6 +78,8 @@
 #include <vm/vm_object.h>
 #include <vm/uma.h>
 
+SDT_PROVIDER_DEFINE(proc);
+
 MALLOC_DEFINE(M_PGRP, "pgrp", "process group header");
 MALLOC_DEFINE(M_SESSION, "session", "session header");
 static MALLOC_DEFINE(M_PROC, "proc", "Proc structures");
@@ -142,7 +146,9 @@
 	struct proc *p;
 
 	p = (struct proc *)mem;
+	SDT_PROBE(proc, kernel, ctor , entry, p, size, arg, flags, 0);
 	EVENTHANDLER_INVOKE(process_ctor, p);
+	SDT_PROBE(proc, kernel, ctor , return, p, size, arg, flags, 0);
 	return (0);
 }
 
@@ -158,6 +164,7 @@
 	/* INVARIANTS checks go here */
 	p = (struct proc *)mem;
 	td = FIRST_THREAD_IN_PROC(p);
+	SDT_PROBE(proc, kernel, dtor , entry, p, size, arg, td, 0);
 	if (td != NULL) {
 #ifdef INVARIANTS
 		KASSERT((p->p_numthreads == 1),
@@ -175,6 +182,7 @@
 	EVENTHANDLER_INVOKE(process_dtor, p);
 	if (p->p_ksi != NULL)
 		KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue"));
+	SDT_PROBE(proc, kernel, dtor , return, p, size, arg, 0, 0);
 }
 
 /*
@@ -186,6 +194,7 @@
 	struct proc *p;
 
 	p = (struct proc *)mem;
+	SDT_PROBE(proc, kernel, init , entry, p, size, flags, 0, 0);
 	p->p_sched = (struct p_sched *)&p[1];
 	bzero(&p->p_mtx, sizeof(struct mtx));
 	mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK);
@@ -193,6 +202,7 @@
 	TAILQ_INIT(&p->p_threads);	     /* all threads in proc */
 	EVENTHANDLER_INVOKE(process_init, p);
 	p->p_stats = pstats_alloc();
+	SDT_PROBE(proc, kernel, init , return, p, size, flags, 0, 0);
 	return (0);
 }