PERFORCE change 133837 for review
John Birrell
jb at FreeBSD.org
Mon Jan 21 17:49:39 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=133837
Change 133837 by jb at jb_freebsd1 on 2008/01/22 01:49:31
Change the SDT implementation to allow the same probe to be
called from more than one place. This separates the definition
from the actual probe call.
Affected files ...
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#26 edit
.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#19 edit
.. //depot/projects/dtrace/src/sys/sys/sdt.h#12 edit
Differences ...
==== //depot/projects/dtrace/src/sys/kern/kern_fork.c#26 (text+ko) ====
@@ -78,6 +78,10 @@
#include <vm/uma.h>
SDT_PROVIDER_DECLARE(proc);
+SDT_PROBE_DEFINE(proc, kernel, , create);
+SDT_PROBE_ARGTYPE(proc, kernel, , create, 0, "struct proc *");
+SDT_PROBE_ARGTYPE(proc, kernel, , create, 1, "struct proc *");
+SDT_PROBE_ARGTYPE(proc, kernel, , create, 2, "int");
#ifndef _SYS_SYSPROTO_H_
struct fork_args {
@@ -720,9 +724,6 @@
PROC_UNLOCK(p1);
SDT_PROBE(proc, kernel, , create, p2, p1, flags, 0, 0);
- SDT_PROBE_ARGTYPE(proc, kernel, , create, 0, "struct proc *");
- SDT_PROBE_ARGTYPE(proc, kernel, , create, 1, "struct proc *");
- SDT_PROBE_ARGTYPE(proc, kernel, , create, 2, "int");
/*
* Preserve synchronization semantics of vfork. If waiting for
==== //depot/projects/dtrace/src/sys/kern/kern_proc.c#19 (text+ko) ====
@@ -79,6 +79,33 @@
#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");
@@ -147,16 +174,8 @@
p = (struct proc *)mem;
SDT_PROBE(proc, kernel, ctor , entry, p, size, arg, flags, 0);
- 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");
EVENTHANDLER_INVOKE(process_ctor, p);
SDT_PROBE(proc, kernel, ctor , return, p, size, arg, flags, 0);
- 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");
return (0);
}
@@ -173,10 +192,6 @@
p = (struct proc *)mem;
td = FIRST_THREAD_IN_PROC(p);
SDT_PROBE(proc, kernel, dtor , entry, p, size, arg, td, 0);
- 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 *");
if (td != NULL) {
#ifdef INVARIANTS
KASSERT((p->p_numthreads == 1),
@@ -195,9 +210,6 @@
if (p->p_ksi != NULL)
KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue"));
SDT_PROBE(proc, kernel, dtor , return, p, size, arg, 0, 0);
- 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 *");
}
/*
@@ -210,9 +222,6 @@
p = (struct proc *)mem;
SDT_PROBE(proc, kernel, init , entry, p, size, flags, 0, 0);
- 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");
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);
@@ -221,9 +230,6 @@
EVENTHANDLER_INVOKE(process_init, p);
p->p_stats = pstats_alloc();
SDT_PROBE(proc, kernel, init , return, p, size, flags, 0, 0);
- 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");
return (0);
}
==== //depot/projects/dtrace/src/sys/sys/sdt.h#12 (text+ko) ====
@@ -48,6 +48,8 @@
#define SDT_PROVIDER_DEFINE(prov)
#define SDT_PROVIDER_DECLARE(prov)
+#define SDT_PROBE_DEFINE(prov, mod, func, name)
+#define SDT_PROBE_DECLARE(prov, mod, func, name)
#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type)
@@ -121,8 +123,8 @@
#define SDT_PROVIDER_DECLARE(prov) \
extern struct sdt_provider sdt_provider_##prov[1]
-#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \
- static struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = { \
+#define SDT_PROBE_DEFINE(prov, mod, func, name) \
+ struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = { \
{ sizeof(struct sdt_probe), 0, sdt_provider_##prov, \
{ NULL, NULL }, { NULL, NULL }, #mod, #func, #name, 0, 0 } \
}; \
@@ -131,14 +133,19 @@
sdt_##prov##_##mod##_##func##_##name ); \
SYSUNINIT(sdt_##prov##_##mod##_##func##_##name##_uninit, \
SI_SUB_KDTRACE, SI_ORDER_SECOND + 1, sdt_probe_deregister, \
- sdt_##prov##_##mod##_##func##_##name ); \
+ sdt_##prov##_##mod##_##func##_##name )
+
+#define SDT_PROBE_DECLARE(prov, mod, func, name) \
+ extern struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1]
+
+#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \
if (sdt_##prov##_##mod##_##func##_##name->id) \
(*sdt_probe_func)(sdt_##prov##_##mod##_##func##_##name->id, \
(uintptr_t) arg0, (uintptr_t) arg1, (uintptr_t) arg2, \
(uintptr_t) arg3, (uintptr_t) arg4)
#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type) \
- static struct sdt_argtype sdt_##prov##_##mod##_##func##_##name##num[1] \
+ struct sdt_argtype sdt_##prov##_##mod##_##func##_##name##num[1] \
= { { num, type, { NULL, NULL }, \
sdt_##prov##_##mod##_##func##_##name } \
}; \
More information about the p4-projects
mailing list