Author: avg
Date: Mon Feb 17 13:58:50 2014
New Revision: 262057
URL: http://svnweb.freebsd.org/changeset/base/262057
Log:
MFC r258622,258675: dtrace sdt: remove the ugly sname parameter of
SDT_PROBE_DEFINE
Modified:
stable/9/sys/cam/ctl/ctl_backend_block.c
stable/9/sys/cddl/dev/dtrace/dtrace_test.c
stable/9/sys/cddl/dev/sdt/sdt.c
stable/9/sys/compat/linux/linux_dtrace.h
stable/9/sys/dev/xen/blkback/blkback.c
stable/9/sys/kern/kern_clock.c
stable/9/sys/kern/kern_exec.c
stable/9/sys/kern/kern_exit.c
stable/9/sys/kern/kern_fork.c
stable/9/sys/kern/kern_priv.c
stable/9/sys/kern/kern_proc.c
stable/9/sys/kern/kern_racct.c
stable/9/sys/kern/kern_sig.c
stable/9/sys/kern/kern_synch.c
stable/9/sys/kern/kern_thread.c
stable/9/sys/kern/kern_timeout.c
stable/9/sys/kern/sched_4bsd.c
stable/9/sys/kern/sched_ule.c
stable/9/sys/kern/subr_devstat.c
stable/9/sys/kern/subr_turnstile.c
stable/9/sys/kern/vfs_cache.c
stable/9/sys/kern/vfs_lookup.c
stable/9/sys/kern/vfs_syscalls.c
stable/9/sys/net/vnet.c
stable/9/sys/netinet/sctp_dtrace_define.h
stable/9/sys/opencrypto/deflate.c
stable/9/sys/security/mac/mac_framework.c
stable/9/sys/security/mac/mac_internal.h
stable/9/sys/sys/sdt.h
stable/9/sys/tools/vnode_if.awk
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/net/ (props changed)
stable/9/sys/sys/ (props changed)
Modified: stable/9/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- stable/9/sys/cam/ctl/ctl_backend_block.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/cam/ctl/ctl_backend_block.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -634,10 +634,10 @@ ctl_be_block_flush_file(struct ctl_be_bl
ctl_complete_beio(beio);
}
-SDT_PROBE_DEFINE1(cbb, kernel, read, file_start, file_start, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, write, file_start, file_start, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, read, file_done, file_done,"uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, write, file_done, file_done, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, read, file_start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, write, file_start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, read, file_done,"uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, write, file_done, "uint64_t");
static void
ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
@@ -968,10 +968,10 @@ ctl_be_block_cw_dispatch(struct ctl_be_b
}
}
-SDT_PROBE_DEFINE1(cbb, kernel, read, start, start, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, write, start, start, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, read, alloc_done, alloc_done, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, write, alloc_done, alloc_done, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, read, start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, write, start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, read, alloc_done, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, write, alloc_done, "uint64_t");
static void
ctl_be_block_dispatch(struct ctl_be_block_lun *be_lun,
Modified: stable/9/sys/cddl/dev/dtrace/dtrace_test.c
==============================================================================
--- stable/9/sys/cddl/dev/dtrace/dtrace_test.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/cddl/dev/dtrace/dtrace_test.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -41,7 +41,7 @@
SDT_PROVIDER_DEFINE(test);
-SDT_PROBE_DEFINE7(test, , , sdttest, sdttest, "int", "int", "int", "int",
"int",
+SDT_PROBE_DEFINE7(test, , , sdttest, "int", "int", "int", "int", "int",
"int", "int");
/*
Modified: stable/9/sys/cddl/dev/sdt/sdt.c
==============================================================================
--- stable/9/sys/cddl/dev/sdt/sdt.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/cddl/dev/sdt/sdt.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -138,6 +138,8 @@ sdt_create_probe(struct sdt_probe *probe
char mod[DTRACE_MODNAMELEN];
char func[DTRACE_FUNCNAMELEN];
char name[DTRACE_NAMELEN];
+ const char *from;
+ char *to;
size_t len;
TAILQ_FOREACH(prov, &sdt_prov_list, prov_entry)
@@ -161,7 +163,18 @@ sdt_create_probe(struct sdt_probe *probe
* in the C compiler, so we have to respect const vs non-const.
*/
strlcpy(func, probe->func, sizeof(func));
- strlcpy(name, probe->name, sizeof(name));
+
+ from = probe->name;
+ to = name;
+ for (len = 0; len < (sizeof(name) - 1) && *from != '\0';
+ len++, from++, to++) {
+ if (from[0] == '_' && from[1] == '_') {
+ *to = '-';
+ from++;
+ } else
+ *to = *from;
+ }
+ *to = '\0';
if (dtrace_probe_lookup(prov->id, mod, func, name) != DTRACE_IDNONE)
return;
Modified: stable/9/sys/compat/linux/linux_dtrace.h
==============================================================================
--- stable/9/sys/compat/linux/linux_dtrace.h Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/compat/linux/linux_dtrace.h Mon Feb 17 13:58:50 2014
(r262057)
@@ -48,27 +48,27 @@
LINUX_DTRACE, a, b, c)
#define _LIN_SDT_PROBE_DEFINE0(a, b, c, d)
SDT_PROBE_DEFINE(a, \
- b, c, d, d)
+ b, c, d)
#define LIN_SDT_PROBE_DEFINE0(a, b, c)
_LIN_SDT_PROBE_DEFINE0(\
LINUX_DTRACE, a, b, c)
#define _LIN_SDT_PROBE_DEFINE1(a, b, c, d, e)
SDT_PROBE_DEFINE1(a, \
- b, c, d, d, e)
+ b, c, d, e)
#define LIN_SDT_PROBE_DEFINE1(a, b, c, d)
_LIN_SDT_PROBE_DEFINE1(\
LINUX_DTRACE, a, b, c, d)
#define _LIN_SDT_PROBE_DEFINE2(a, b, c, d, e, f)
SDT_PROBE_DEFINE2(a, \
- b, c, d, d, e, f)
+ b, c, d, e, f)
#define LIN_SDT_PROBE_DEFINE2(a, b, c, d, e)
_LIN_SDT_PROBE_DEFINE2(\
LINUX_DTRACE, a, b, c, d, e)
#define _LIN_SDT_PROBE_DEFINE3(a, b, c, d, e, f, g)
SDT_PROBE_DEFINE3(a, \
- b, c, d, d, e, f, g)
+ b, c, d, e, f, g)
#define LIN_SDT_PROBE_DEFINE3(a, b, c, d, e, f)
_LIN_SDT_PROBE_DEFINE3(\
LINUX_DTRACE, a, b, c, d, e, f)
#define _LIN_SDT_PROBE_DEFINE4(a, b, c, d, e, f, g, h)
SDT_PROBE_DEFINE4(a, \
- b, c, d, d, e, f, g, h)
+ b, c, d, e, f, g, h)
#define LIN_SDT_PROBE_DEFINE4(a, b, c, d, e, f, g)
_LIN_SDT_PROBE_DEFINE4(\
LINUX_DTRACE, a, b, c, d, e, f, g)
#define _LIN_SDT_PROBE_DEFINE5(a, b, c, d, e, f, g, h, i) \
- SDT_PROBE_DEFINE5(a, b, c, d, d, e, f, g, h, i)
+ SDT_PROBE_DEFINE5(a, b, c, d, e, f, g, h, i)
#define LIN_SDT_PROBE_DEFINE5(a, b, c, d, e, f, g, h)
_LIN_SDT_PROBE_DEFINE5(\
LINUX_DTRACE, a, b, c, d, e, f, g, h)
Modified: stable/9/sys/dev/xen/blkback/blkback.c
==============================================================================
--- stable/9/sys/dev/xen/blkback/blkback.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/dev/xen/blkback/blkback.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -2037,10 +2037,10 @@ xbb_intr(void *arg)
}
SDT_PROVIDER_DEFINE(xbb);
-SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_dev, flush, flush, "int");
-SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, read, read, "int", "uint64_t",
+SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_dev, flush, "int");
+SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, read, "int", "uint64_t",
"uint64_t");
-SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, write, write, "int",
+SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, write, "int",
"uint64_t", "uint64_t");
/*----------------------------- Backend Handlers
-----------------------------*/
@@ -2218,10 +2218,10 @@ fail_free_bios:
return (error);
}
-SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_file, flush, flush, "int");
-SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, read, read, "int",
"uint64_t",
+SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_file, flush, "int");
+SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, read, "int", "uint64_t",
"uint64_t");
-SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, write, write, "int",
+SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, write, "int",
"uint64_t", "uint64_t");
/**
Modified: stable/9/sys/kern/kern_clock.c
==============================================================================
--- stable/9/sys/kern/kern_clock.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_clock.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -93,7 +93,7 @@ SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_
static struct mtx time_lock;
SDT_PROVIDER_DECLARE(sched);
-SDT_PROBE_DEFINE2(sched, , , tick, tick, "struct thread *", "struct proc *");
+SDT_PROBE_DEFINE2(sched, , , tick, "struct thread *", "struct proc *");
static int
sysctl_kern_cp_time(SYSCTL_HANDLER_ARGS)
Modified: stable/9/sys/kern/kern_exec.c
==============================================================================
--- stable/9/sys/kern/kern_exec.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_exec.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -95,9 +95,9 @@ dtrace_execexit_func_t dtrace_fasttrap_e
#endif
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE1(proc, kernel, , exec, exec, "char *");
-SDT_PROBE_DEFINE1(proc, kernel, , exec_failure, exec-failure, "int");
-SDT_PROBE_DEFINE1(proc, kernel, , exec_success, exec-success, "char *");
+SDT_PROBE_DEFINE1(proc, kernel, , exec, "char *");
+SDT_PROBE_DEFINE1(proc, kernel, , exec__failure, "int");
+SDT_PROBE_DEFINE1(proc, kernel, , exec__success, "char *");
MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments");
@@ -839,7 +839,7 @@ interpret:
vfs_mark_atime(imgp->vp, td->td_ucred);
- SDT_PROBE(proc, kernel, , exec_success, args->fname, 0, 0, 0, 0);
+ SDT_PROBE(proc, kernel, , exec__success, args->fname, 0, 0, 0, 0);
done1:
/*
@@ -921,7 +921,7 @@ exec_fail:
p->p_flag &= ~P_INEXEC;
PROC_UNLOCK(p);
- SDT_PROBE(proc, kernel, , exec_failure, error, 0, 0, 0, 0);
+ SDT_PROBE(proc, kernel, , exec__failure, error, 0, 0, 0, 0);
done2:
#ifdef MAC
Modified: stable/9/sys/kern/kern_exit.c
==============================================================================
--- stable/9/sys/kern/kern_exit.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_exit.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -94,7 +94,7 @@ dtrace_execexit_func_t dtrace_fasttrap_e
#endif
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE1(proc, kernel, , exit, exit, "int");
+SDT_PROBE_DEFINE1(proc, kernel, , exit, "int");
/* Hook for NFS teardown procedure. */
void (*nlminfo_release_p)(struct proc *p);
Modified: stable/9/sys/kern/kern_fork.c
==============================================================================
--- stable/9/sys/kern/kern_fork.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_fork.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -89,7 +89,7 @@ dtrace_fork_func_t dtrace_fasttrap_fork;
#endif
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE3(proc, kernel, , create, create, "struct proc *",
+SDT_PROBE_DEFINE3(proc, kernel, , create, "struct proc *",
"struct proc *", "int");
#ifndef _SYS_SYSPROTO_H_
Modified: stable/9/sys/kern/kern_priv.c
==============================================================================
--- stable/9/sys/kern/kern_priv.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_priv.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -65,8 +65,8 @@ SYSCTL_INT(_security_bsd, OID_AUTO, unpr
TUNABLE_INT("security.bsd.unprivileged_mlock", &unprivileged_mlock);
SDT_PROVIDER_DEFINE(priv);
-SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv_ok, priv-ok, "int");
-SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv_err, priv-err, "int");
+SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv__ok, "int");
+SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv__err, "int");
/*
* Check a credential for privilege. Lots of good reasons to deny privilege;
@@ -160,9 +160,9 @@ priv_check_cred(struct ucred *cred, int
error = EPERM;
out:
if (error)
- SDT_PROBE1(priv, kernel, priv_check, priv_err, priv);
+ SDT_PROBE1(priv, kernel, priv_check, priv__err, priv);
else
- SDT_PROBE1(priv, kernel, priv_check, priv_ok, priv);
+ SDT_PROBE1(priv, kernel, priv_check, priv__ok, priv);
return (error);
}
Modified: stable/9/sys/kern/kern_proc.c
==============================================================================
--- stable/9/sys/kern/kern_proc.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_proc.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -91,17 +91,17 @@ __FBSDID("$FreeBSD$");
#endif
SDT_PROVIDER_DEFINE(proc);
-SDT_PROBE_DEFINE4(proc, kernel, ctor, entry, entry, "struct proc *", "int",
+SDT_PROBE_DEFINE4(proc, kernel, ctor, entry, "struct proc *", "int",
"void *", "int");
-SDT_PROBE_DEFINE4(proc, kernel, ctor, return, return, "struct proc *", "int",
+SDT_PROBE_DEFINE4(proc, kernel, ctor, return, "struct proc *", "int",
"void *", "int");
-SDT_PROBE_DEFINE4(proc, kernel, dtor, entry, entry, "struct proc *", "int",
+SDT_PROBE_DEFINE4(proc, kernel, dtor, entry, "struct proc *", "int",
"void *", "struct thread *");
-SDT_PROBE_DEFINE3(proc, kernel, dtor, return, return, "struct proc *", "int",
+SDT_PROBE_DEFINE3(proc, kernel, dtor, return, "struct proc *", "int",
"void *");
-SDT_PROBE_DEFINE3(proc, kernel, init, entry, entry, "struct proc *", "int",
+SDT_PROBE_DEFINE3(proc, kernel, init, entry, "struct proc *", "int",
"int");
-SDT_PROBE_DEFINE3(proc, kernel, init, return, return, "struct proc *", "int",
+SDT_PROBE_DEFINE3(proc, kernel, init, return, "struct proc *", "int",
"int");
MALLOC_DEFINE(M_PGRP, "pgrp", "process group header");
Modified: stable/9/sys/kern/kern_racct.c
==============================================================================
--- stable/9/sys/kern/kern_racct.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_racct.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -96,29 +96,29 @@ static void racct_add_cred_locked(struct
uint64_t amount);
SDT_PROVIDER_DEFINE(racct);
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add, add, "struct proc *", "int",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, add, "struct proc *", "int",
"uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add_failure, add-failure,
+SDT_PROBE_DEFINE3(racct, kernel, rusage, add__failure,
"struct proc *", "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add_cred, add-cred, "struct ucred *",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, add__cred, "struct ucred *",
"int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add_force, add-force, "struct proc *",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, add__force, "struct proc *",
"int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, set, set, "struct proc *", "int",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, set, "struct proc *", "int",
"uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, set_failure, set-failure,
+SDT_PROBE_DEFINE3(racct, kernel, rusage, set__failure,
"struct proc *", "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, sub, sub, "struct proc *", "int",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, sub, "struct proc *", "int",
"uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, sub_cred, sub-cred, "struct ucred *",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, sub__cred, "struct ucred *",
"int", "uint64_t");
-SDT_PROBE_DEFINE1(racct, kernel, racct, create, create, "struct racct *");
-SDT_PROBE_DEFINE1(racct, kernel, racct, destroy, destroy, "struct racct *");
-SDT_PROBE_DEFINE2(racct, kernel, racct, join, join, "struct racct *",
+SDT_PROBE_DEFINE1(racct, kernel, racct, create, "struct racct *");
+SDT_PROBE_DEFINE1(racct, kernel, racct, destroy, "struct racct *");
+SDT_PROBE_DEFINE2(racct, kernel, racct, join, "struct racct *",
"struct racct *");
-SDT_PROBE_DEFINE2(racct, kernel, racct, join_failure, join-failure,
+SDT_PROBE_DEFINE2(racct, kernel, racct, join__failure,
"struct racct *", "struct racct *");
-SDT_PROBE_DEFINE2(racct, kernel, racct, leave, leave, "struct racct *",
+SDT_PROBE_DEFINE2(racct, kernel, racct, leave, "struct racct *",
"struct racct *");
int racct_types[] = {
@@ -527,7 +527,7 @@ racct_add_locked(struct proc *p, int res
#ifdef RCTL
error = rctl_enforce(p, resource, amount);
if (error && RACCT_IS_DENIABLE(resource)) {
- SDT_PROBE(racct, kernel, rusage, add_failure, p, resource,
+ SDT_PROBE(racct, kernel, rusage, add__failure, p, resource,
amount, 0, 0);
return (error);
}
@@ -558,7 +558,7 @@ racct_add_cred_locked(struct ucred *cred
{
struct prison *pr;
- SDT_PROBE(racct, kernel, rusage, add_cred, cred, resource, amount,
+ SDT_PROBE(racct, kernel, rusage, add__cred, cred, resource, amount,
0, 0);
racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, amount);
@@ -591,7 +591,7 @@ void
racct_add_force(struct proc *p, int resource, uint64_t amount)
{
- SDT_PROBE(racct, kernel, rusage, add_force, p, resource, amount, 0, 0);
+ SDT_PROBE(racct, kernel, rusage, add__force, p, resource, amount, 0, 0);
/*
* We need proc lock to dereference p->p_ucred.
@@ -645,7 +645,7 @@ racct_set_locked(struct proc *p, int res
if (diff_proc > 0) {
error = rctl_enforce(p, resource, diff_proc);
if (error && RACCT_IS_DENIABLE(resource)) {
- SDT_PROBE(racct, kernel, rusage, set_failure, p,
+ SDT_PROBE(racct, kernel, rusage, set__failure, p,
resource, amount, 0, 0);
return (error);
}
@@ -805,7 +805,7 @@ racct_sub_cred_locked(struct ucred *cred
{
struct prison *pr;
- SDT_PROBE(racct, kernel, rusage, sub_cred, cred, resource, amount,
+ SDT_PROBE(racct, kernel, rusage, sub__cred, cred, resource, amount,
0, 0);
#ifdef notyet
Modified: stable/9/sys/kern/kern_sig.c
==============================================================================
--- stable/9/sys/kern/kern_sig.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_sig.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -93,11 +93,11 @@ __FBSDID("$FreeBSD$");
#define ONSIG 32 /* NSIG for osig* syscalls. XXX. */
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE3(proc, kernel, , signal_send, signal-send, "struct thread *",
+SDT_PROBE_DEFINE3(proc, kernel, , signal__send, "struct thread *",
"struct proc *", "int");
-SDT_PROBE_DEFINE2(proc, kernel, , signal_clear, signal-clear, "int",
+SDT_PROBE_DEFINE2(proc, kernel, , signal__clear, "int",
"ksiginfo_t *");
-SDT_PROBE_DEFINE3(proc, kernel, , signal_discard, signal-discard,
+SDT_PROBE_DEFINE3(proc, kernel, , signal__discard,
"struct thread *", "struct proc *", "int");
static int coredump(struct thread *);
@@ -1252,7 +1252,7 @@ kern_sigtimedwait(struct thread *td, sig
reschedule_signals(p, new_block, 0);
if (error == 0) {
- SDT_PROBE(proc, kernel, , signal_clear, sig, ksi, 0, 0, 0);
+ SDT_PROBE(proc, kernel, , signal__clear, sig, ksi, 0, 0, 0);
if (ksi->ksi_code == SI_TIMER)
itimer_accept(p, ksi->ksi_timerid, ksi);
@@ -2053,7 +2053,7 @@ tdsendsignal(struct proc *p, struct thre
sigqueue = &td->td_sigqueue;
}
- SDT_PROBE(proc, kernel, , signal_send, td, p, sig, 0, 0 );
+ SDT_PROBE(proc, kernel, , signal__send, td, p, sig, 0, 0 );
/*
* If the signal is being ignored,
@@ -2064,7 +2064,7 @@ tdsendsignal(struct proc *p, struct thre
*/
mtx_lock(&ps->ps_mtx);
if (SIGISMEMBER(ps->ps_sigignore, sig)) {
- SDT_PROBE(proc, kernel, , signal_discard, td, p, sig, 0, 0 );
+ SDT_PROBE(proc, kernel, , signal__discard, td, p, sig, 0, 0 );
mtx_unlock(&ps->ps_mtx);
if (ksi && (ksi->ksi_flags & KSI_INS))
Modified: stable/9/sys/kern/kern_synch.c
==============================================================================
--- stable/9/sys/kern/kern_synch.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_synch.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -108,18 +108,18 @@ SYSCTL_INT(_kern, OID_AUTO, fscale, CTLF
static void loadav(void *arg);
SDT_PROVIDER_DECLARE(sched);
-SDT_PROBE_DEFINE(sched, , , preempt, preempt);
+SDT_PROBE_DEFINE(sched, , , preempt);
/*
* These probes reference Solaris features that are not implemented in FreeBSD.
* Create the probes anyway for compatibility with existing D scripts; they'll
* just never fire.
*/
-SDT_PROBE_DEFINE(sched, , , cpucaps_sleep, cpucaps-sleep);
-SDT_PROBE_DEFINE(sched, , , cpucaps_wakeup, cpucaps-wakeup);
-SDT_PROBE_DEFINE(sched, , , schedctl_nopreempt, schedctl-nopreempt);
-SDT_PROBE_DEFINE(sched, , , schedctl_preempt, schedctl-preempt);
-SDT_PROBE_DEFINE(sched, , , schedctl_yield, schedctl-yield);
+SDT_PROBE_DEFINE(sched, , , cpucaps__sleep);
+SDT_PROBE_DEFINE(sched, , , cpucaps__wakeup);
+SDT_PROBE_DEFINE(sched, , , schedctl__nopreempt);
+SDT_PROBE_DEFINE(sched, , , schedctl__preempt);
+SDT_PROBE_DEFINE(sched, , , schedctl__yield);
void
sleepinit(void)
Modified: stable/9/sys/kern/kern_thread.c
==============================================================================
--- stable/9/sys/kern/kern_thread.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_thread.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
#include <sys/eventhandler.h>
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE(proc, , , lwp_exit, lwp-exit);
+SDT_PROBE_DEFINE(proc, , , lwp__exit);
/*
Modified: stable/9/sys/kern/kern_timeout.c
==============================================================================
--- stable/9/sys/kern/kern_timeout.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/kern_timeout.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -61,9 +61,9 @@ __FBSDID("$FreeBSD$");
#endif
SDT_PROVIDER_DEFINE(callout_execute);
-SDT_PROBE_DEFINE1(callout_execute, kernel, , callout_start, callout-start,
+SDT_PROBE_DEFINE1(callout_execute, kernel, , callout__start,
"struct callout *");
-SDT_PROBE_DEFINE1(callout_execute, kernel, , callout_end, callout-end,
+SDT_PROBE_DEFINE1(callout_execute, kernel, , callout__end,
"struct callout *");
static int avg_depth;
@@ -514,9 +514,9 @@ softclock_call_cc(struct callout *c, str
binuptime(&bt1);
#endif
THREAD_NO_SLEEPING();
- SDT_PROBE(callout_execute, kernel, , callout_start, c, 0, 0, 0, 0);
+ SDT_PROBE(callout_execute, kernel, , callout__start, c, 0, 0, 0, 0);
c_func(c_arg);
- SDT_PROBE(callout_execute, kernel, , callout_end, c, 0, 0, 0, 0);
+ SDT_PROBE(callout_execute, kernel, , callout__end, c, 0, 0, 0, 0);
THREAD_SLEEPING_OK();
#ifdef DIAGNOSTIC
binuptime(&bt2);
Modified: stable/9/sys/kern/sched_4bsd.c
==============================================================================
--- stable/9/sys/kern/sched_4bsd.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/sched_4bsd.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -255,20 +255,20 @@ SYSCTL_INT(_kern_sched, OID_AUTO, follow
SDT_PROVIDER_DEFINE(sched);
-SDT_PROBE_DEFINE3(sched, , , change_pri, change-pri, "struct thread *",
+SDT_PROBE_DEFINE3(sched, , , change__pri, "struct thread *",
"struct proc *", "uint8_t");
-SDT_PROBE_DEFINE3(sched, , , dequeue, dequeue, "struct thread *",
+SDT_PROBE_DEFINE3(sched, , , dequeue, "struct thread *",
"struct proc *", "void *");
-SDT_PROBE_DEFINE4(sched, , , enqueue, enqueue, "struct thread *",
+SDT_PROBE_DEFINE4(sched, , , enqueue, "struct thread *",
"struct proc *", "void *", "int");
-SDT_PROBE_DEFINE4(sched, , , lend_pri, lend-pri, "struct thread *",
+SDT_PROBE_DEFINE4(sched, , , lend__pri, "struct thread *",
"struct proc *", "uint8_t", "struct thread *");
-SDT_PROBE_DEFINE2(sched, , , load_change, load-change, "int", "int");
-SDT_PROBE_DEFINE2(sched, , , off_cpu, off-cpu, "struct thread *",
+SDT_PROBE_DEFINE2(sched, , , load__change, "int", "int");
+SDT_PROBE_DEFINE2(sched, , , off__cpu, "struct thread *",
"struct proc *");
-SDT_PROBE_DEFINE(sched, , , on_cpu, on-cpu);
-SDT_PROBE_DEFINE(sched, , , remain_cpu, remain-cpu);
-SDT_PROBE_DEFINE2(sched, , , surrender, surrender, "struct thread *",
+SDT_PROBE_DEFINE(sched, , , on__cpu);
+SDT_PROBE_DEFINE(sched, , , remain__cpu);
+SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *",
"struct proc *");
static __inline void
@@ -277,7 +277,7 @@ sched_load_add(void)
sched_tdcnt++;
KTR_COUNTER0(KTR_SCHED, "load", "global load", sched_tdcnt);
- SDT_PROBE2(sched, , , load_change, NOCPU, sched_tdcnt);
+ SDT_PROBE2(sched, , , load__change, NOCPU, sched_tdcnt);
}
static __inline void
@@ -286,7 +286,7 @@ sched_load_rem(void)
sched_tdcnt--;
KTR_COUNTER0(KTR_SCHED, "load", "global load", sched_tdcnt);
- SDT_PROBE2(sched, , , load_change, NOCPU, sched_tdcnt);
+ SDT_PROBE2(sched, , , load__change, NOCPU, sched_tdcnt);
}
/*
* Arrange to reschedule if necessary, taking the priorities and
@@ -836,12 +836,12 @@ sched_priority(struct thread *td, u_char
KTR_POINT3(KTR_SCHED, "thread", sched_tdname(td), "priority change",
"prio:%d", td->td_priority, "new prio:%d", prio, KTR_ATTR_LINKED,
sched_tdname(curthread));
- SDT_PROBE3(sched, , , change_pri, td, td->td_proc, prio);
+ SDT_PROBE3(sched, , , change__pri, td, td->td_proc, prio);
if (td != curthread && prio > td->td_priority) {
KTR_POINT3(KTR_SCHED, "thread", sched_tdname(curthread),
"lend prio", "prio:%d", td->td_priority, "new prio:%d",
prio, KTR_ATTR_LINKED, sched_tdname(td));
- SDT_PROBE4(sched, , , lend_pri, td, td->td_proc, prio,
+ SDT_PROBE4(sched, , , lend__pri, td, td->td_proc, prio,
curthread);
}
THREAD_LOCK_ASSERT(td, MA_OWNED);
@@ -1033,7 +1033,7 @@ sched_switch(struct thread *td, struct t
PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT);
#endif
- SDT_PROBE2(sched, , , off_cpu, newtd, newtd->td_proc);
+ SDT_PROBE2(sched, , , off__cpu, newtd, newtd->td_proc);
/* I feel sleepy */
lock_profile_release_lock(&sched_lock.lock_object);
@@ -1067,13 +1067,13 @@ sched_switch(struct thread *td, struct t
* need to reap it.
*/
- SDT_PROBE0(sched, , , on_cpu);
+ SDT_PROBE0(sched, , , on__cpu);
#ifdef HWPMC_HOOKS
if (PMC_PROC_IS_USING_PMCS(td->td_proc))
PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_IN);
#endif
} else
- SDT_PROBE0(sched, , , remain_cpu);
+ SDT_PROBE0(sched, , , remain__cpu);
#ifdef SMP
if (td->td_flags & TDF_IDLETD)
Modified: stable/9/sys/kern/sched_ule.c
==============================================================================
--- stable/9/sys/kern/sched_ule.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/sched_ule.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -333,20 +333,20 @@ SYSINIT(sched_initticks, SI_SUB_CLOCKS,
SDT_PROVIDER_DEFINE(sched);
-SDT_PROBE_DEFINE3(sched, , , change_pri, change-pri, "struct thread *",
+SDT_PROBE_DEFINE3(sched, , , change__pri, "struct thread *",
"struct proc *", "uint8_t");
-SDT_PROBE_DEFINE3(sched, , , dequeue, dequeue, "struct thread *",
+SDT_PROBE_DEFINE3(sched, , , dequeue, "struct thread *",
"struct proc *", "void *");
-SDT_PROBE_DEFINE4(sched, , , enqueue, enqueue, "struct thread *",
+SDT_PROBE_DEFINE4(sched, , , enqueue, "struct thread *",
"struct proc *", "void *", "int");
-SDT_PROBE_DEFINE4(sched, , , lend_pri, lend-pri, "struct thread *",
+SDT_PROBE_DEFINE4(sched, , , lend__pri, "struct thread *",
"struct proc *", "uint8_t", "struct thread *");
-SDT_PROBE_DEFINE2(sched, , , load_change, load-change, "int", "int");
-SDT_PROBE_DEFINE2(sched, , , off_cpu, off-cpu, "struct thread *",
+SDT_PROBE_DEFINE2(sched, , , load__change, "int", "int");
+SDT_PROBE_DEFINE2(sched, , , off__cpu, "struct thread *",
"struct proc *");
-SDT_PROBE_DEFINE(sched, , , on_cpu, on-cpu);
-SDT_PROBE_DEFINE(sched, , , remain_cpu, remain-cpu);
-SDT_PROBE_DEFINE2(sched, , , surrender, surrender, "struct thread *",
+SDT_PROBE_DEFINE(sched, , , on__cpu);
+SDT_PROBE_DEFINE(sched, , , remain__cpu);
+SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *",
"struct proc *");
/*
@@ -531,7 +531,7 @@ tdq_load_add(struct tdq *tdq, struct thr
if ((td->td_flags & TDF_NOLOAD) == 0)
tdq->tdq_sysload++;
KTR_COUNTER0(KTR_SCHED, "load", tdq->tdq_loadname, tdq->tdq_load);
- SDT_PROBE2(sched, , , load_change, (int)TDQ_ID(tdq), tdq->tdq_load);
+ SDT_PROBE2(sched, , , load__change, (int)TDQ_ID(tdq), tdq->tdq_load);
}
/*
@@ -551,7 +551,7 @@ tdq_load_rem(struct tdq *tdq, struct thr
if ((td->td_flags & TDF_NOLOAD) == 0)
tdq->tdq_sysload--;
KTR_COUNTER0(KTR_SCHED, "load", tdq->tdq_loadname, tdq->tdq_load);
- SDT_PROBE2(sched, , , load_change, (int)TDQ_ID(tdq), tdq->tdq_load);
+ SDT_PROBE2(sched, , , load__change, (int)TDQ_ID(tdq), tdq->tdq_load);
}
/*
@@ -1622,12 +1622,12 @@ sched_thread_priority(struct thread *td,
KTR_POINT3(KTR_SCHED, "thread", sched_tdname(td), "prio",
"prio:%d", td->td_priority, "new prio:%d", prio,
KTR_ATTR_LINKED, sched_tdname(curthread));
- SDT_PROBE3(sched, , , change_pri, td, td->td_proc, prio);
+ SDT_PROBE3(sched, , , change__pri, td, td->td_proc, prio);
if (td != curthread && prio < td->td_priority) {
KTR_POINT3(KTR_SCHED, "thread", sched_tdname(curthread),
"lend prio", "prio:%d", td->td_priority, "new prio:%d",
prio, KTR_ATTR_LINKED, sched_tdname(td));
- SDT_PROBE4(sched, , , lend_pri, td, td->td_proc, prio,
+ SDT_PROBE4(sched, , , lend__pri, td, td->td_proc, prio,
curthread);
}
ts = td->td_sched;
@@ -1880,7 +1880,7 @@ sched_switch(struct thread *td, struct t
if (PMC_PROC_IS_USING_PMCS(td->td_proc))
PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT);
#endif
- SDT_PROBE2(sched, , , off_cpu, newtd, newtd->td_proc);
+ SDT_PROBE2(sched, , , off__cpu, newtd, newtd->td_proc);
lock_profile_release_lock(&TDQ_LOCKPTR(tdq)->lock_object);
TDQ_LOCKPTR(tdq)->mtx_lock = (uintptr_t)newtd;
sched_pctcpu_update(newtd->td_sched, 0);
@@ -1906,14 +1906,14 @@ sched_switch(struct thread *td, struct t
lock_profile_obtain_lock_success(
&TDQ_LOCKPTR(tdq)->lock_object, 0, 0, __FILE__, __LINE__);
- SDT_PROBE0(sched, , , on_cpu);
+ SDT_PROBE0(sched, , , on__cpu);
#ifdef HWPMC_HOOKS
if (PMC_PROC_IS_USING_PMCS(td->td_proc))
PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_IN);
#endif
} else {
thread_unblock_switch(td, mtx);
- SDT_PROBE0(sched, , , remain_cpu);
+ SDT_PROBE0(sched, , , remain__cpu);
}
/*
* Assert that all went well and return.
Modified: stable/9/sys/kern/subr_devstat.c
==============================================================================
--- stable/9/sys/kern/subr_devstat.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/subr_devstat.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -49,19 +49,19 @@ __FBSDID("$FreeBSD$");
SDT_PROVIDER_DEFINE(io);
-SDT_PROBE_DEFINE2(io, , , start, start, "struct bio *", "struct devstat *");
-SDT_PROBE_DEFINE2(io, , , done, done, "struct bio *", "struct devstat *");
-SDT_PROBE_DEFINE2(io, , , wait_start, wait-start, "struct bio *",
+SDT_PROBE_DEFINE2(io, , , start, "struct bio *", "struct devstat *");
+SDT_PROBE_DEFINE2(io, , , done, "struct bio *", "struct devstat *");
+SDT_PROBE_DEFINE2(io, , , wait__start, "struct bio *",
"struct devstat *");
-SDT_PROBE_DEFINE2(io, , , wait_done, wait-done, "struct bio *",
+SDT_PROBE_DEFINE2(io, , , wait__done, "struct bio *",
"struct devstat *");
#define DTRACE_DEVSTAT_START() SDT_PROBE2(io, , , start, NULL,
ds)
#define DTRACE_DEVSTAT_BIO_START() SDT_PROBE2(io, , , start, bp,
ds)
#define DTRACE_DEVSTAT_DONE() SDT_PROBE2(io, , , done, NULL,
ds)
#define DTRACE_DEVSTAT_BIO_DONE() SDT_PROBE2(io, , , done, bp, ds)
-#define DTRACE_DEVSTAT_WAIT_START() SDT_PROBE2(io, , , wait_start,
NULL, ds)
-#define DTRACE_DEVSTAT_WAIT_DONE() SDT_PROBE2(io, , , wait_done,
NULL, ds)
+#define DTRACE_DEVSTAT_WAIT_START() SDT_PROBE2(io, , , wait__start,
NULL, ds)
+#define DTRACE_DEVSTAT_WAIT_DONE() SDT_PROBE2(io, , , wait__done,
NULL, ds)
static int devstat_num_devs;
static long devstat_generation = 1;
Modified: stable/9/sys/kern/subr_turnstile.c
==============================================================================
--- stable/9/sys/kern/subr_turnstile.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/subr_turnstile.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -170,8 +170,8 @@ static int turnstile_init(void *mem, int
static void turnstile_fini(void *mem, int size);
SDT_PROVIDER_DECLARE(sched);
-SDT_PROBE_DEFINE(sched, , , sleep, sleep);
-SDT_PROBE_DEFINE2(sched, , , wakeup, wakeup, "struct thread *",
+SDT_PROBE_DEFINE(sched, , , sleep);
+SDT_PROBE_DEFINE2(sched, , , wakeup, "struct thread *",
"struct proc *");
/*
Modified: stable/9/sys/kern/vfs_cache.c
==============================================================================
--- stable/9/sys/kern/vfs_cache.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/vfs_cache.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -62,28 +62,28 @@ __FBSDID("$FreeBSD$");
#include <vm/uma.h>
SDT_PROVIDER_DECLARE(vfs);
-SDT_PROBE_DEFINE3(vfs, namecache, enter, done, done, "struct vnode *", "char
*",
+SDT_PROBE_DEFINE3(vfs, namecache, enter, done, "struct vnode *", "char *",
"struct vnode *");
-SDT_PROBE_DEFINE2(vfs, namecache, enter_negative, done, done, "struct vnode *",
+SDT_PROBE_DEFINE2(vfs, namecache, enter_negative, done, "struct vnode *",
"char *");
-SDT_PROBE_DEFINE1(vfs, namecache, fullpath, entry, entry, "struct vnode *");
-SDT_PROBE_DEFINE3(vfs, namecache, fullpath, hit, hit, "struct vnode *",
+SDT_PROBE_DEFINE1(vfs, namecache, fullpath, entry, "struct vnode *");
+SDT_PROBE_DEFINE3(vfs, namecache, fullpath, hit, "struct vnode *",
"char *", "struct vnode *");
-SDT_PROBE_DEFINE1(vfs, namecache, fullpath, miss, miss, "struct vnode *");
-SDT_PROBE_DEFINE3(vfs, namecache, fullpath, return, return, "int",
+SDT_PROBE_DEFINE1(vfs, namecache, fullpath, miss, "struct vnode *");
+SDT_PROBE_DEFINE3(vfs, namecache, fullpath, return, "int",
"struct vnode *", "char *");
-SDT_PROBE_DEFINE3(vfs, namecache, lookup, hit, hit, "struct vnode *", "char *",
+SDT_PROBE_DEFINE3(vfs, namecache, lookup, hit, "struct vnode *", "char *",
"struct vnode *");
-SDT_PROBE_DEFINE2(vfs, namecache, lookup, hit_negative, hit-negative,
+SDT_PROBE_DEFINE2(vfs, namecache, lookup, hit__negative,
"struct vnode *", "char *");
-SDT_PROBE_DEFINE2(vfs, namecache, lookup, miss, miss, "struct vnode *",
+SDT_PROBE_DEFINE2(vfs, namecache, lookup, miss, "struct vnode *",
"char *");
-SDT_PROBE_DEFINE1(vfs, namecache, purge, done, done, "struct vnode *");
-SDT_PROBE_DEFINE1(vfs, namecache, purge_negative, done, done, "struct vnode
*");
-SDT_PROBE_DEFINE1(vfs, namecache, purgevfs, done, done, "struct mount *");
-SDT_PROBE_DEFINE3(vfs, namecache, zap, done, done, "struct vnode *", "char *",
+SDT_PROBE_DEFINE1(vfs, namecache, purge, done, "struct vnode *");
+SDT_PROBE_DEFINE1(vfs, namecache, purge_negative, done, "struct vnode *");
+SDT_PROBE_DEFINE1(vfs, namecache, purgevfs, done, "struct mount *");
+SDT_PROBE_DEFINE3(vfs, namecache, zap, done, "struct vnode *", "char *",
"struct vnode *");
-SDT_PROBE_DEFINE2(vfs, namecache, zap_negative, done, done, "struct vnode *",
+SDT_PROBE_DEFINE2(vfs, namecache, zap_negative, done, "struct vnode *",
"char *");
/*
@@ -614,7 +614,7 @@ negative_success:
nchstats.ncs_neghits++;
if (ncp->nc_flag & NCF_WHITE)
cnp->cn_flags |= ISWHITEOUT;
- SDT_PROBE(vfs, namecache, lookup, hit_negative, dvp, nc_get_name(ncp),
+ SDT_PROBE(vfs, namecache, lookup, hit__negative, dvp, nc_get_name(ncp),
0, 0, 0);
cache_out_ts(ncp, tsp, ticksp);
CACHE_WUNLOCK();
Modified: stable/9/sys/kern/vfs_lookup.c
==============================================================================
--- stable/9/sys/kern/vfs_lookup.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/vfs_lookup.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -70,9 +70,9 @@ __FBSDID("$FreeBSD$");
#undef NAMEI_DIAGNOSTIC
SDT_PROVIDER_DECLARE(vfs);
-SDT_PROBE_DEFINE3(vfs, namei, lookup, entry, entry, "struct vnode *", "char *",
+SDT_PROBE_DEFINE3(vfs, namei, lookup, entry, "struct vnode *", "char *",
"unsigned long");
-SDT_PROBE_DEFINE2(vfs, namei, lookup, return, return, "int", "struct vnode *");
+SDT_PROBE_DEFINE2(vfs, namei, lookup, return, "int", "struct vnode *");
/*
* Allocation zone for namei
Modified: stable/9/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/9/sys/kern/vfs_syscalls.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/kern/vfs_syscalls.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -91,8 +91,8 @@ __FBSDID("$FreeBSD$");
MALLOC_DEFINE(M_FADVISE, "fadvise", "posix_fadvise(2) information");
SDT_PROVIDER_DEFINE(vfs);
-SDT_PROBE_DEFINE2(vfs, , stat, mode, mode, "char *", "int");
-SDT_PROBE_DEFINE2(vfs, , stat, reg, reg, "char *", "int");
+SDT_PROBE_DEFINE2(vfs, , stat, mode, "char *", "int");
+SDT_PROBE_DEFINE2(vfs, , stat, reg, "char *", "int");
static int chroot_refuse_vdir_fds(struct filedesc *fdp);
static int getutimes(const struct timeval *, enum uio_seg, struct timespec *);
Modified: stable/9/sys/net/vnet.c
==============================================================================
--- stable/9/sys/net/vnet.c Mon Feb 17 13:53:01 2014 (r262056)
+++ stable/9/sys/net/vnet.c Mon Feb 17 13:58:50 2014 (r262057)
@@ -210,14 +210,14 @@ static TAILQ_HEAD(, vnet_data_free) vnet
static struct sx vnet_data_free_lock;
SDT_PROVIDER_DEFINE(vnet);
-SDT_PROBE_DEFINE1(vnet, functions, vnet_alloc, entry, entry, "int");
-SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, alloc, alloc, "int",
+SDT_PROBE_DEFINE1(vnet, functions, vnet_alloc, entry, "int");
+SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, alloc, "int",
"struct vnet *");
-SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, return, return,
+SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, return,
"int", "struct vnet *");
-SDT_PROBE_DEFINE2(vnet, functions, vnet_destroy, entry, entry,
+SDT_PROBE_DEFINE2(vnet, functions, vnet_destroy, entry,
"int", "struct vnet *");
-SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, return, entry,
+SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, return,
"int");
#ifdef DDB
Modified: stable/9/sys/netinet/sctp_dtrace_define.h
==============================================================================
--- stable/9/sys/netinet/sctp_dtrace_define.h Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/netinet/sctp_dtrace_define.h Mon Feb 17 13:58:50 2014
(r262057)
@@ -45,7 +45,7 @@ SDT_PROVIDER_DEFINE(sctp);
/* Cwnd probe - tracks changes in the congestion window on a netp */
/********************************************************/
/* Initial */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, init, init,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, init,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -56,7 +56,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, init,
"int"); /* The new value of the cwnd */
/* ACK-INCREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, ack, ack,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, ack,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -67,14 +67,14 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, ack,
"int"); /* The new value of the cwnd */
/* ACK-INCREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, rttvar, rttvar,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, rttvar,
"uint64_t", /* The Vtag << 32 | localport << 16 |
remoteport */
"uint64_t", /* obw | nbw */
"uint64_t", /* bwrtt | newrtt */
"uint64_t", /* flight */
"uint64_t"); /* (cwnd << 32) | point << 16 | retval(0/1) */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, rttstep, rttstep,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, rttstep,
"uint64_t", /* The Vtag << 32 | localport << 16 |
remoteport */
"uint64_t", /* obw | nbw */
"uint64_t", /* bwrtt | newrtt */
@@ -82,7 +82,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, rttst
"uint64_t"); /* (cwnd << 32) | point << 16 | retval(0/1) */
/* FastRetransmit-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, fr, fr,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, fr,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -93,7 +93,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, fr, f
"int"); /* The new value of the cwnd */
/* TimeOut-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, to, to,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, to,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -104,7 +104,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, to, t
"int"); /* The new value of the cwnd */
/* BurstLimit-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, bl, bl,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, bl,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -115,7 +115,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, bl, b
"int"); /* The new value of the cwnd */
/* ECN-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, ecn, ecn,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, ecn,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -126,7 +126,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, ecn,
"int"); /* The new value of the cwnd */
/* PacketDrop-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, pd, pd,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, pd,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -139,7 +139,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, pd, p
/********************************************************/
/* Rwnd probe - tracks changes in the receiver window for an assoc */
/********************************************************/
-SDT_PROBE_DEFINE4(sctp, rwnd, assoc, val, val,
+SDT_PROBE_DEFINE4(sctp, rwnd, assoc, val,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -151,7 +151,7 @@ SDT_PROBE_DEFINE4(sctp, rwnd, assoc, val
/********************************************************/
/* flight probe - tracks changes in the flight size on a net or assoc */
/********************************************************/
-SDT_PROBE_DEFINE5(sctp, flightsize, net, val, val,
+SDT_PROBE_DEFINE5(sctp, flightsize, net, val,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
@@ -164,7 +164,7 @@ SDT_PROBE_DEFINE5(sctp, flightsize, net,
/********************************************************/
/* The total flight version */
/********************************************************/
-SDT_PROBE_DEFINE4(sctp, flightsize, assoc, val, val,
+SDT_PROBE_DEFINE4(sctp, flightsize, assoc, val,
"uint32_t", /* The Vtag for this end */
"uint32_t", /*
* The port number of the local side << 16 | port number
Modified: stable/9/sys/opencrypto/deflate.c
==============================================================================
--- stable/9/sys/opencrypto/deflate.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/opencrypto/deflate.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -50,13 +50,13 @@ __FBSDID("$FreeBSD$");
#include <opencrypto/deflate.h>
SDT_PROVIDER_DECLARE(opencrypto);
-SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, entry, entry,
+SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, entry,
"int", "u_int32_t");
-SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, bad, bad,
+SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, bad,
"int", "int", "int", "int", "int");
-SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, iter, iter,
+SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, iter,
"int", "int", "int", "int", "int");
-SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, return, return,
+SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, return,
"int", "u_int32_t");
int window_inflate = -1 * MAX_WBITS;
Modified: stable/9/sys/security/mac/mac_framework.c
==============================================================================
--- stable/9/sys/security/mac/mac_framework.c Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/security/mac/mac_framework.c Mon Feb 17 13:58:50 2014
(r262057)
@@ -94,11 +94,11 @@ __FBSDID("$FreeBSD$");
SDT_PROVIDER_DEFINE(mac);
SDT_PROVIDER_DEFINE(mac_framework);
-SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, modevent, "int",
+SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, "int",
"struct mac_policy_conf *");
-SDT_PROBE_DEFINE1(mac, kernel, policy, register, register,
+SDT_PROBE_DEFINE1(mac, kernel, policy, register,
"struct mac_policy_conf *");
-SDT_PROBE_DEFINE1(mac, kernel, policy, unregister, unregister,
+SDT_PROBE_DEFINE1(mac, kernel, policy, unregister,
"struct mac_policy_conf *");
/*
Modified: stable/9/sys/security/mac/mac_internal.h
==============================================================================
--- stable/9/sys/security/mac/mac_internal.h Mon Feb 17 13:53:01 2014
(r262056)
+++ stable/9/sys/security/mac/mac_internal.h Mon Feb 17 13:58:50 2014
(r262057)
@@ -74,35 +74,35 @@ SDT_PROVIDER_DECLARE(mac); /* MAC Frame
SDT_PROVIDER_DECLARE(mac_framework); /* Entry points to MAC. */
#define MAC_CHECK_PROBE_DEFINE4(name, arg0, arg1, arg2, arg3)
\
- SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac_check_err, \
- mac-check-ok, "int", arg0, arg1, arg2, arg3); \
- SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac_check_ok, \
- mac-check-ok, "int", arg0, arg1, arg2, arg3);
+ SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac__check__err, \
+ "int", arg0, arg1, arg2, arg3); \
+ SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac__check__ok, \
+ "int", arg0, arg1, arg2, arg3);
#define MAC_CHECK_PROBE_DEFINE3(name, arg0, arg1, arg2)
\
- SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac_check_err, \
- mac-check-err, "int", arg0, arg1, arg2); \
- SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac_check_ok, \
- mac-check-ok, "int", arg0, arg1, arg2);
+ SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac__check__err, \
+ "int", arg0, arg1, arg2); \
+ SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac__check__ok, \
+ "int", arg0, arg1, arg2);
#define MAC_CHECK_PROBE_DEFINE2(name, arg0, arg1)
\
- SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_check_err, \
- mac-check-err, "int", arg0, arg1); \
- SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_check_ok, \
- mac-check-ok, "int", arg0, arg1);
+ SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__check__err, \
+ "int", arg0, arg1); \
+ SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__check__ok, \
+ "int", arg0, arg1);
#define MAC_CHECK_PROBE_DEFINE1(name, arg0)
\
- SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac_check_err, \
- mac-check-err, "int", arg0); \
- SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac_check_ok, \
- mac-check-ok, "int", arg0);
+ SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac__check__err, \
+ "int", arg0); \
+ SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac__check__ok, \
+ "int", arg0);
#define MAC_CHECK_PROBE4(name, error, arg0, arg1, arg2, arg3) do {
\
if (error) { \
- SDT_PROBE(mac_framework, kernel, name, mac_check_err, \
+ SDT_PROBE(mac_framework, kernel, name, mac__check__err, \
error, arg0, arg1, arg2, arg3); \
} else { \
- SDT_PROBE(mac_framework, kernel, name, mac_check_ok, \
+ SDT_PROBE(mac_framework, kernel, name, mac__check__ok, \
0, arg0, arg1, arg2, arg3); \
} \
} while (0)
@@ -116,17 +116,17 @@ SDT_PROVIDER_DECLARE(mac_framework); /*
#endif
#define MAC_GRANT_PROBE_DEFINE2(name, arg0, arg1)
\
- SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_err, \
- mac-grant-err, "int", arg0, arg1); \
- SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_ok, \
- mac-grant-ok, "int", arg0, arg1);
+ SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__grant__err, \
+ "int", arg0, arg1); \
+ SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__grant__ok, \
+ "int", arg0, arg1);
#define MAC_GRANT_PROBE2(name, error, arg0, arg1) do {
\
if (error) { \
- SDT_PROBE(mac_framework, kernel, name, mac_grant_err, \
+ SDT_PROBE(mac_framework, kernel, name, mac__grant__err, \
error, arg0, arg1, 0, 0); \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
