PERFORCE change 134446 for review

[John Birrell]

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

Change 134446 by jb at jb_freebsd1 on 2008/01/30 06:07:37

	IFdtrace

Affected files ...

.. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#6 edit

Differences ...

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

@@ -32,6 +32,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.252.2.3 2008/01/18 10:02:51 kib Exp $");
 
+#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
 
@@ -49,6 +50,7 @@
 #include <sys/sysctl.h>
 #include <sys/filedesc.h>
 #include <sys/tty.h>
+#include <sys/sdt.h>
 #include <sys/signalvar.h>
 #include <sys/sx.h>
 #include <sys/user.h>
@@ -66,6 +68,35 @@
 #include <vm/vm_map.h>
 #include <vm/uma.h>
 
+SDT_PROVIDER_DEFINE(proc);
+SDT_PROBE_DEFINE(proc, kernel, ctor , entry);
+SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 0, "struct proc *");
+SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 1, "int");
+SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 2, "void *");
+SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 3, "int");
+SDT_PROBE_DEFINE(proc, kernel, ctor , return);
+SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 0, "struct proc *");
+SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 1, "int");
+SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 2, "void *");
+SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 3, "int");
+SDT_PROBE_DEFINE(proc, kernel, dtor , entry);
+SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 0, "struct proc *");
+SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 1, "int");
+SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 2, "void *");
+SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 3, "struct thread *");
+SDT_PROBE_DEFINE(proc, kernel, dtor , return);
+SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 0, "struct proc *");
+SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 1, "int");
+SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 2, "void *");
+SDT_PROBE_DEFINE(proc, kernel, init , entry);
+SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 0, "struct proc *");
+SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 1, "int");
+SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 2, "int");
+SDT_PROBE_DEFINE(proc, kernel, init , return);
+SDT_PROBE_ARGTYPE(proc, kernel, init , return, 0, "struct proc *");
+SDT_PROBE_ARGTYPE(proc, kernel, init , return, 1, "int");
+SDT_PROBE_ARGTYPE(proc, kernel, init , return, 2, "int");
+
 MALLOC_DEFINE(M_PGRP, "pgrp", "process group header");
 MALLOC_DEFINE(M_SESSION, "session", "session header");
 static MALLOC_DEFINE(M_PROC, "proc", "Proc structures");
@@ -131,7 +162,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);
 }
 
@@ -147,6 +180,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),
@@ -165,6 +199,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);
 }
 
 /*
@@ -176,6 +211,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);
@@ -183,6 +219,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);
 }