Author: markj
Date: Wed Dec 16 23:39:27 2015
New Revision: 292384
URL: https://svnweb.freebsd.org/changeset/base/292384
Log:
Fix style issues around existing SDT probes.
- Use SDT_PROBE<N>() instead of SDT_PROBE(). This has no functional effect
at the moment, but will be needed for some future changes.
- Don't hardcode the module component of the probe identifier. This is
set automatically by the SDT framework.
MFC after: 1 week
Modified:
head/sys/cam/ctl/ctl_backend_block.c
head/sys/compat/linux/linux_dtrace.h
head/sys/kern/kern_exec.c
head/sys/kern/kern_exit.c
head/sys/kern/kern_fork.c
head/sys/kern/kern_proc.c
head/sys/kern/kern_racct.c
head/sys/kern/kern_sig.c
head/sys/kern/kern_timeout.c
head/sys/kern/vfs_cache.c
head/sys/netinet/in_kdtrace.c
head/sys/netinet/in_kdtrace.h
head/sys/netinet/sctp_cc_functions.c
head/sys/security/mac/mac_framework.c
head/sys/security/mac/mac_internal.h
Modified: head/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend_block.c Wed Dec 16 23:23:12 2015
(r292383)
+++ head/sys/cam/ctl/ctl_backend_block.c Wed Dec 16 23:39:27 2015
(r292384)
@@ -610,10 +610,10 @@ ctl_be_block_flush_file(struct ctl_be_bl
ctl_complete_beio(beio);
}
-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");
+SDT_PROBE_DEFINE1(cbb, , read, file_start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, , write, file_start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, , read, file_done,"uint64_t");
+SDT_PROBE_DEFINE1(cbb, , write, file_done, "uint64_t");
static void
ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
@@ -638,10 +638,10 @@ ctl_be_block_dispatch_file(struct ctl_be
bzero(&xuio, sizeof(xuio));
if (beio->bio_cmd == BIO_READ) {
- SDT_PROBE(cbb, kernel, read, file_start, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , read, file_start);
xuio.uio_rw = UIO_READ;
} else {
- SDT_PROBE(cbb, kernel, write, file_start, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , write, file_start);
xuio.uio_rw = UIO_WRITE;
}
xuio.uio_offset = beio->io_offset;
@@ -684,7 +684,7 @@ ctl_be_block_dispatch_file(struct ctl_be
error = VOP_READ(be_lun->vn, &xuio, flags, file_data->cred);
VOP_UNLOCK(be_lun->vn, 0);
- SDT_PROBE(cbb, kernel, read, file_done, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , read, file_done);
if (error == 0 && xuio.uio_resid > 0) {
/*
* If we red less then requested (EOF), then
@@ -733,7 +733,7 @@ ctl_be_block_dispatch_file(struct ctl_be
VOP_UNLOCK(be_lun->vn, 0);
vn_finished_write(mountpoint);
- SDT_PROBE(cbb, kernel, write, file_done, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , write, file_done);
}
mtx_lock(&be_lun->io_lock);
@@ -869,10 +869,10 @@ ctl_be_block_dispatch_zvol(struct ctl_be
bzero(&xuio, sizeof(xuio));
if (beio->bio_cmd == BIO_READ) {
- SDT_PROBE(cbb, kernel, read, file_start, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , read, file_start);
xuio.uio_rw = UIO_READ;
} else {
- SDT_PROBE(cbb, kernel, write, file_start, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , write, file_start);
xuio.uio_rw = UIO_WRITE;
}
xuio.uio_offset = beio->io_offset;
@@ -903,9 +903,9 @@ ctl_be_block_dispatch_zvol(struct ctl_be
error = ENXIO;
if (beio->bio_cmd == BIO_READ)
- SDT_PROBE(cbb, kernel, read, file_done, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , read, file_done);
else
- SDT_PROBE(cbb, kernel, write, file_done, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , write, file_done);
mtx_lock(&be_lun->io_lock);
devstat_end_transaction(beio->lun->disk_stats, beio->io_len,
@@ -1501,10 +1501,10 @@ ctl_be_block_cw_dispatch(struct ctl_be_b
}
}
-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");
+SDT_PROBE_DEFINE1(cbb, , read, start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, , write, start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, , read, alloc_done, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, , write, alloc_done, "uint64_t");
static void
ctl_be_block_next(struct ctl_be_block_io *beio)
@@ -1549,9 +1549,9 @@ ctl_be_block_dispatch(struct ctl_be_bloc
lbalen = ARGS(io);
if (lbalen->flags & CTL_LLF_WRITE) {
- SDT_PROBE(cbb, kernel, write, start, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , write, start);
} else {
- SDT_PROBE(cbb, kernel, read, start, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , read, start);
}
beio = ctl_alloc_beio(softc);
@@ -1638,10 +1638,10 @@ ctl_be_block_dispatch(struct ctl_be_bloc
* need to get the data from the user first.
*/
if (beio->bio_cmd == BIO_READ) {
- SDT_PROBE(cbb, kernel, read, alloc_done, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , read, alloc_done);
be_lun->dispatch(be_lun, beio);
} else {
- SDT_PROBE(cbb, kernel, write, alloc_done, 0, 0, 0, 0, 0);
+ SDT_PROBE0(cbb, , write, alloc_done);
#ifdef CTL_TIME_IO
getbinuptime(&io->io_hdr.dma_start_bt);
#endif
Modified: head/sys/compat/linux/linux_dtrace.h
==============================================================================
--- head/sys/compat/linux/linux_dtrace.h Wed Dec 16 23:23:12 2015
(r292383)
+++ head/sys/compat/linux/linux_dtrace.h Wed Dec 16 23:39:27 2015
(r292384)
@@ -72,8 +72,8 @@
#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)
-#define LIN_SDT_PROBE0(a, b, c)
SDT_PROBE1(LINUX_DTRACE, a, b, \
- c, 0)
+#define LIN_SDT_PROBE0(a, b, c)
SDT_PROBE0(LINUX_DTRACE, a, b, \
+ c)
#define LIN_SDT_PROBE1(a, b, c, d)
SDT_PROBE1(LINUX_DTRACE, a, b, \
c, d)
#define LIN_SDT_PROBE2(a, b, c, d, e)
SDT_PROBE2(LINUX_DTRACE, a, b, \
Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c Wed Dec 16 23:23:12 2015 (r292383)
+++ head/sys/kern/kern_exec.c Wed Dec 16 23:39:27 2015 (r292384)
@@ -94,9 +94,9 @@ dtrace_execexit_func_t dtrace_fasttrap_e
#endif
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE1(proc, kernel, , exec, "char *");
-SDT_PROBE_DEFINE1(proc, kernel, , exec__failure, "int");
-SDT_PROBE_DEFINE1(proc, kernel, , exec__success, "char *");
+SDT_PROBE_DEFINE1(proc, , , exec, "char *");
+SDT_PROBE_DEFINE1(proc, , , exec__failure, "int");
+SDT_PROBE_DEFINE1(proc, , , exec__success, "char *");
MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments");
@@ -423,7 +423,7 @@ do_execve(td, args, mac_p)
| AUDITVNODE1, UIO_SYSSPACE, args->fname, td);
}
- SDT_PROBE1(proc, kernel, , exec, args->fname);
+ SDT_PROBE1(proc, , , exec, args->fname);
interpret:
if (args->fname != NULL) {
@@ -851,7 +851,7 @@ interpret:
vfs_mark_atime(imgp->vp, td->td_ucred);
- SDT_PROBE1(proc, kernel, , exec__success, args->fname);
+ SDT_PROBE1(proc, , , exec__success, args->fname);
VOP_UNLOCK(imgp->vp, 0);
done1:
@@ -923,7 +923,7 @@ exec_fail:
p->p_flag &= ~P_INEXEC;
PROC_UNLOCK(p);
- SDT_PROBE1(proc, kernel, , exec__failure, error);
+ SDT_PROBE1(proc, , , exec__failure, error);
done2:
#ifdef MAC
Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c Wed Dec 16 23:23:12 2015 (r292383)
+++ head/sys/kern/kern_exit.c Wed Dec 16 23:39:27 2015 (r292384)
@@ -94,7 +94,7 @@ dtrace_execexit_func_t dtrace_fasttrap_e
#endif
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE1(proc, kernel, , exit, "int");
+SDT_PROBE_DEFINE1(proc, , , exit, "int");
/* Hook for NFS teardown procedure. */
void (*nlminfo_release_p)(struct proc *p);
@@ -569,7 +569,7 @@ exit1(struct thread *td, int rval, int s
reason = CLD_DUMPED;
else if (WIFSIGNALED(signo))
reason = CLD_KILLED;
- SDT_PROBE1(proc, kernel, , exit, reason);
+ SDT_PROBE1(proc, , , exit, reason);
#endif
/*
Modified: head/sys/kern/kern_fork.c
==============================================================================
--- head/sys/kern/kern_fork.c Wed Dec 16 23:23:12 2015 (r292383)
+++ head/sys/kern/kern_fork.c Wed Dec 16 23:39:27 2015 (r292384)
@@ -89,8 +89,7 @@ dtrace_fork_func_t dtrace_fasttrap_fork;
#endif
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE3(proc, kernel, , create, "struct proc *",
- "struct proc *", "int");
+SDT_PROBE_DEFINE3(proc, , , create, "struct proc *", "struct proc *", "int");
#ifndef _SYS_SYSPROTO_H_
struct fork_args {
@@ -748,7 +747,7 @@ do_fork(struct thread *td, int flags, st
* Tell any interested parties about the new process.
*/
knote_fork(&p1->p_klist, p2->p_pid);
- SDT_PROBE3(proc, kernel, , create, p2, p1, flags);
+ SDT_PROBE3(proc, , , create, p2, p1, flags);
/*
* Wait until debugger is attached to child.
Modified: head/sys/kern/kern_proc.c
==============================================================================
--- head/sys/kern/kern_proc.c Wed Dec 16 23:23:12 2015 (r292383)
+++ head/sys/kern/kern_proc.c Wed Dec 16 23:39:27 2015 (r292384)
@@ -92,18 +92,15 @@ __FBSDID("$FreeBSD$");
#endif
SDT_PROVIDER_DEFINE(proc);
-SDT_PROBE_DEFINE4(proc, kernel, ctor, entry, "struct proc *", "int",
- "void *", "int");
-SDT_PROBE_DEFINE4(proc, kernel, ctor, return, "struct proc *", "int",
- "void *", "int");
-SDT_PROBE_DEFINE4(proc, kernel, dtor, entry, "struct proc *", "int",
- "void *", "struct thread *");
-SDT_PROBE_DEFINE3(proc, kernel, dtor, return, "struct proc *", "int",
- "void *");
-SDT_PROBE_DEFINE3(proc, kernel, init, entry, "struct proc *", "int",
+SDT_PROBE_DEFINE4(proc, , ctor, entry, "struct proc *", "int", "void *",
"int");
-SDT_PROBE_DEFINE3(proc, kernel, init, return, "struct proc *", "int",
+SDT_PROBE_DEFINE4(proc, , ctor, return, "struct proc *", "int", "void *",
"int");
+SDT_PROBE_DEFINE4(proc, , dtor, entry, "struct proc *", "int", "void *",
+ "struct thread *");
+SDT_PROBE_DEFINE3(proc, , dtor, return, "struct proc *", "int", "void *");
+SDT_PROBE_DEFINE3(proc, , init, entry, "struct proc *", "int", "int");
+SDT_PROBE_DEFINE3(proc, , init, return, "struct proc *", "int", "int");
MALLOC_DEFINE(M_PGRP, "pgrp", "process group header");
MALLOC_DEFINE(M_SESSION, "session", "session header");
@@ -196,9 +193,9 @@ proc_ctor(void *mem, int size, void *arg
struct proc *p;
p = (struct proc *)mem;
- SDT_PROBE4(proc, kernel, ctor , entry, p, size, arg, flags);
+ SDT_PROBE4(proc, , ctor , entry, p, size, arg, flags);
EVENTHANDLER_INVOKE(process_ctor, p);
- SDT_PROBE4(proc, kernel, ctor , return, p, size, arg, flags);
+ SDT_PROBE4(proc, , ctor , return, p, size, arg, flags);
return (0);
}
@@ -214,7 +211,7 @@ proc_dtor(void *mem, int size, void *arg
/* INVARIANTS checks go here */
p = (struct proc *)mem;
td = FIRST_THREAD_IN_PROC(p);
- SDT_PROBE4(proc, kernel, dtor, entry, p, size, arg, td);
+ SDT_PROBE4(proc, , dtor, entry, p, size, arg, td);
if (td != NULL) {
#ifdef INVARIANTS
KASSERT((p->p_numthreads == 1),
@@ -227,7 +224,7 @@ proc_dtor(void *mem, int size, void *arg
EVENTHANDLER_INVOKE(process_dtor, p);
if (p->p_ksi != NULL)
KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue"));
- SDT_PROBE3(proc, kernel, dtor, return, p, size, arg);
+ SDT_PROBE3(proc, , dtor, return, p, size, arg);
}
/*
@@ -239,7 +236,7 @@ proc_init(void *mem, int size, int flags
struct proc *p;
p = (struct proc *)mem;
- SDT_PROBE3(proc, kernel, init, entry, p, size, flags);
+ SDT_PROBE3(proc, , init, entry, p, size, flags);
p->p_sched = (struct p_sched *)&p[1];
mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK |
MTX_NEW);
mtx_init(&p->p_slock, "process slock", NULL, MTX_SPIN | MTX_NEW);
@@ -251,7 +248,7 @@ proc_init(void *mem, int size, int flags
TAILQ_INIT(&p->p_threads); /* all threads in proc */
EVENTHANDLER_INVOKE(process_init, p);
p->p_stats = pstats_alloc();
- SDT_PROBE3(proc, kernel, init, return, p, size, flags);
+ SDT_PROBE3(proc, , init, return, p, size, flags);
return (0);
}
Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c Wed Dec 16 23:23:12 2015 (r292383)
+++ head/sys/kern/kern_racct.c Wed Dec 16 23:39:27 2015 (r292384)
@@ -102,30 +102,32 @@ static void racct_add_cred_locked(struct
uint64_t amount);
SDT_PROVIDER_DEFINE(racct);
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add, "struct proc *", "int",
- "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add__failure,
+SDT_PROBE_DEFINE3(racct, , rusage, add,
"struct proc *", "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add__cred, "struct ucred *",
- "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add__force, "struct proc *",
- "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, set, "struct proc *", "int",
- "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, set__failure,
+SDT_PROBE_DEFINE3(racct, , rusage, add__failure,
"struct proc *", "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, sub, "struct proc *", "int",
- "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, sub__cred, "struct ucred *",
- "int", "uint64_t");
-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 *",
+SDT_PROBE_DEFINE3(racct, , rusage, add__cred,
+ "struct ucred *", "int", "uint64_t");
+SDT_PROBE_DEFINE3(racct, , rusage, add__force,
+ "struct proc *", "int", "uint64_t");
+SDT_PROBE_DEFINE3(racct, , rusage, set,
+ "struct proc *", "int", "uint64_t");
+SDT_PROBE_DEFINE3(racct, , rusage, set__failure,
+ "struct proc *", "int", "uint64_t");
+SDT_PROBE_DEFINE3(racct, , rusage, sub,
+ "struct proc *", "int", "uint64_t");
+SDT_PROBE_DEFINE3(racct, , rusage, sub__cred,
+ "struct ucred *", "int", "uint64_t");
+SDT_PROBE_DEFINE1(racct, , racct, create,
"struct racct *");
-SDT_PROBE_DEFINE2(racct, kernel, racct, join__failure,
- "struct racct *", "struct racct *");
-SDT_PROBE_DEFINE2(racct, kernel, racct, leave, "struct racct *",
+SDT_PROBE_DEFINE1(racct, , racct, destroy,
"struct racct *");
+SDT_PROBE_DEFINE2(racct, , racct, join,
+ "struct racct *", "struct racct *");
+SDT_PROBE_DEFINE2(racct, , racct, join__failure,
+ "struct racct *", "struct racct *");
+SDT_PROBE_DEFINE2(racct, , racct, leave,
+ "struct racct *", "struct racct *");
int racct_types[] = {
[RACCT_CPU] =
@@ -445,7 +447,7 @@ racct_create(struct racct **racctp)
if (!racct_enable)
return;
- SDT_PROBE1(racct, kernel, racct, create, racctp);
+ SDT_PROBE1(racct, , racct, create, racctp);
KASSERT(*racctp == NULL, ("racct already allocated"));
@@ -460,7 +462,7 @@ racct_destroy_locked(struct racct **racc
ASSERT_RACCT_ENABLED();
- SDT_PROBE1(racct, kernel, racct, destroy, racctp);
+ SDT_PROBE1(racct, , racct, destroy, racctp);
mtx_assert(&racct_lock, MA_OWNED);
KASSERT(racctp != NULL, ("NULL racctp"));
@@ -538,7 +540,7 @@ racct_add_locked(struct proc *p, int res
ASSERT_RACCT_ENABLED();
- SDT_PROBE3(racct, kernel, rusage, add, p, resource, amount);
+ SDT_PROBE3(racct, , rusage, add, p, resource, amount);
/*
* We need proc lock to dereference p->p_ucred.
@@ -548,8 +550,7 @@ racct_add_locked(struct proc *p, int res
#ifdef RCTL
error = rctl_enforce(p, resource, amount);
if (error && RACCT_IS_DENIABLE(resource)) {
- SDT_PROBE3(racct, kernel, rusage, add__failure, p, resource,
- amount);
+ SDT_PROBE3(racct, , rusage, add__failure, p, resource, amount);
return (error);
}
#endif
@@ -584,7 +585,7 @@ racct_add_cred_locked(struct ucred *cred
ASSERT_RACCT_ENABLED();
- SDT_PROBE3(racct, kernel, rusage, add__cred, cred, resource, amount);
+ SDT_PROBE3(racct, , rusage, add__cred, cred, resource, amount);
racct_adjust_resource(cred->cr_ruidinfo->ui_racct, resource, amount);
for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
@@ -622,7 +623,7 @@ racct_add_force(struct proc *p, int reso
if (!racct_enable)
return;
- SDT_PROBE3(racct, kernel, rusage, add__force, p, resource, amount);
+ SDT_PROBE3(racct, , rusage, add__force, p, resource, amount);
/*
* We need proc lock to dereference p->p_ucred.
@@ -646,7 +647,7 @@ racct_set_locked(struct proc *p, int res
ASSERT_RACCT_ENABLED();
- SDT_PROBE3(racct, kernel, rusage, set, p, resource, amount);
+ SDT_PROBE3(racct, , rusage, set, p, resource, amount);
/*
* We need proc lock to dereference p->p_ucred.
@@ -678,8 +679,8 @@ 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_PROBE3(racct, kernel, rusage, set__failure, p,
- resource, amount);
+ SDT_PROBE3(racct, , rusage, set__failure, p, resource,
+ amount);
return (error);
}
}
@@ -722,7 +723,7 @@ racct_set_force_locked(struct proc *p, i
ASSERT_RACCT_ENABLED();
- SDT_PROBE3(racct, kernel, rusage, set, p, resource, amount);
+ SDT_PROBE3(racct, , rusage, set, p, resource, amount);
/*
* We need proc lock to dereference p->p_ucred.
@@ -833,7 +834,7 @@ racct_sub(struct proc *p, int resource,
if (!racct_enable)
return;
- SDT_PROBE3(racct, kernel, rusage, sub, p, resource, amount);
+ SDT_PROBE3(racct, , rusage, sub, p, resource, amount);
/*
* We need proc lock to dereference p->p_ucred.
@@ -860,7 +861,7 @@ racct_sub_cred_locked(struct ucred *cred
ASSERT_RACCT_ENABLED();
- SDT_PROBE3(racct, kernel, rusage, sub__cred, cred, resource, amount);
+ SDT_PROBE3(racct, , rusage, sub__cred, cred, resource, amount);
#ifdef notyet
KASSERT(RACCT_CAN_DROP(resource),
Modified: head/sys/kern/kern_sig.c
==============================================================================
--- head/sys/kern/kern_sig.c Wed Dec 16 23:23:12 2015 (r292383)
+++ head/sys/kern/kern_sig.c Wed Dec 16 23:39:27 2015 (r292384)
@@ -94,11 +94,11 @@ __FBSDID("$FreeBSD$");
#define ONSIG 32 /* NSIG for osig* syscalls. XXX. */
SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE3(proc, kernel, , signal__send, "struct thread *",
- "struct proc *", "int");
-SDT_PROBE_DEFINE2(proc, kernel, , signal__clear, "int",
- "ksiginfo_t *");
-SDT_PROBE_DEFINE3(proc, kernel, , signal__discard,
+SDT_PROBE_DEFINE3(proc, , , signal__send,
+ "struct thread *", "struct proc *", "int");
+SDT_PROBE_DEFINE2(proc, , , signal__clear,
+ "int", "ksiginfo_t *");
+SDT_PROBE_DEFINE3(proc, , , signal__discard,
"struct thread *", "struct proc *", "int");
static int coredump(struct thread *);
@@ -1308,7 +1308,7 @@ kern_sigtimedwait(struct thread *td, sig
reschedule_signals(p, new_block, 0);
if (error == 0) {
- SDT_PROBE2(proc, kernel, , signal__clear, sig, ksi);
+ SDT_PROBE2(proc, , , signal__clear, sig, ksi);
if (ksi->ksi_code == SI_TIMER)
itimer_accept(p, ksi->ksi_timerid, ksi);
@@ -2121,7 +2121,7 @@ tdsendsignal(struct proc *p, struct thre
} else
sigqueue = &td->td_sigqueue;
- SDT_PROBE3(proc, kernel, , signal__send, td, p, sig);
+ SDT_PROBE3(proc, , , signal__send, td, p, sig);
/*
* If the signal is being ignored,
@@ -2132,7 +2132,7 @@ tdsendsignal(struct proc *p, struct thre
*/
mtx_lock(&ps->ps_mtx);
if (SIGISMEMBER(ps->ps_sigignore, sig)) {
- SDT_PROBE3(proc, kernel, , signal__discard, td, p, sig);
+ SDT_PROBE3(proc, , , signal__discard, td, p, sig);
mtx_unlock(&ps->ps_mtx);
if (ksi && (ksi->ksi_flags & KSI_INS))
Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c Wed Dec 16 23:23:12 2015
(r292383)
+++ head/sys/kern/kern_timeout.c Wed Dec 16 23:39:27 2015
(r292384)
@@ -69,10 +69,8 @@ DPCPU_DECLARE(sbintime_t, hardclocktime)
#endif
SDT_PROVIDER_DEFINE(callout_execute);
-SDT_PROBE_DEFINE1(callout_execute, kernel, , callout__start,
- "struct callout *");
-SDT_PROBE_DEFINE1(callout_execute, kernel, , callout__end,
- "struct callout *");
+SDT_PROBE_DEFINE1(callout_execute, , , callout__start, "struct callout *");
+SDT_PROBE_DEFINE1(callout_execute, , , callout__end, "struct callout *");
#ifdef CALLOUT_PROFILING
static int avg_depth;
@@ -721,9 +719,9 @@ softclock_call_cc(struct callout *c, str
sbt1 = sbinuptime();
#endif
THREAD_NO_SLEEPING();
- SDT_PROBE1(callout_execute, kernel, , callout__start, c);
+ SDT_PROBE1(callout_execute, , , callout__start, c);
c_func(c_arg);
- SDT_PROBE1(callout_execute, kernel, , callout__end, c);
+ SDT_PROBE1(callout_execute, , , callout__end, c);
THREAD_SLEEPING_OK();
#if defined(DIAGNOSTIC) || defined(CALLOUT_PROFILING)
sbt2 = sbinuptime();
Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c Wed Dec 16 23:23:12 2015 (r292383)
+++ head/sys/kern/vfs_cache.c Wed Dec 16 23:39:27 2015 (r292384)
@@ -417,7 +417,6 @@ cache_zap(ncp)
rw_assert(&cache_lock, RA_WLOCKED);
CTR2(KTR_VFS, "cache_zap(%p) vp %p", ncp, ncp->nc_vp);
-#ifdef KDTRACE_HOOKS
if (ncp->nc_vp != NULL) {
SDT_PROBE3(vfs, namecache, zap, done, ncp->nc_dvp,
nc_get_name(ncp), ncp->nc_vp);
@@ -425,7 +424,6 @@ cache_zap(ncp)
SDT_PROBE2(vfs, namecache, zap_negative, done, ncp->nc_dvp,
nc_get_name(ncp));
}
-#endif
vp = NULL;
LIST_REMOVE(ncp, nc_hash);
if (ncp->nc_flag & NCF_ISDOTDOT) {
Modified: head/sys/netinet/in_kdtrace.c
==============================================================================
--- head/sys/netinet/in_kdtrace.c Wed Dec 16 23:23:12 2015
(r292383)
+++ head/sys/netinet/in_kdtrace.c Wed Dec 16 23:39:27 2015
(r292384)
@@ -122,7 +122,7 @@ SDT_PROBE_DEFINE2_XLATE(tcp, , , debug__
SDT_PROBE_DEFINE3_XLATE(tcp, , , debug__drop,
"struct tcpcb *", "tcpsinfo_t *" ,
"struct tcphdr *", "tcpinfo_t *",
- "uint8_t *", "ipinfo_t *")
+ "uint8_t *", "ipinfo_t *");
SDT_PROBE_DEFINE6_XLATE(tcp, , , state__change,
"void *", "void *",
Modified: head/sys/netinet/in_kdtrace.h
==============================================================================
--- head/sys/netinet/in_kdtrace.h Wed Dec 16 23:23:12 2015
(r292383)
+++ head/sys/netinet/in_kdtrace.h Wed Dec 16 23:39:27 2015
(r292384)
@@ -32,13 +32,13 @@
SDT_PROBE6(ip, , , probe, arg0, arg1, arg2, arg3, arg4, arg5)
#define UDP_PROBE(probe, arg0, arg1, arg2, arg3, arg4)
\
SDT_PROBE5(udp, , , probe, arg0, arg1, arg2, arg3, arg4)
-#define TCP_PROBE1(probe, arg0) \
+#define TCP_PROBE1(probe, arg0)
\
SDT_PROBE1(tcp, , , probe, arg0)
-#define TCP_PROBE2(probe, arg0, arg1) \
+#define TCP_PROBE2(probe, arg0, arg1)
\
SDT_PROBE2(tcp, , , probe, arg0, arg1)
-#define TCP_PROBE3(probe, arg0, arg1, arg2) \
+#define TCP_PROBE3(probe, arg0, arg1, arg2)
\
SDT_PROBE3(tcp, , , probe, arg0, arg1, arg2)
-#define TCP_PROBE4(probe, arg0, arg1, arg2, arg3) \
+#define TCP_PROBE4(probe, arg0, arg1, arg2, arg3)
\
SDT_PROBE4(tcp, , , probe, arg0, arg1, arg2, arg3)
#define TCP_PROBE5(probe, arg0, arg1, arg2, arg3, arg4)
\
SDT_PROBE5(tcp, , , probe, arg0, arg1, arg2, arg3, arg4)
Modified: head/sys/netinet/sctp_cc_functions.c
==============================================================================
--- head/sys/netinet/sctp_cc_functions.c Wed Dec 16 23:23:12 2015
(r292383)
+++ head/sys/netinet/sctp_cc_functions.c Wed Dec 16 23:39:27 2015
(r292384)
@@ -95,7 +95,7 @@ sctp_set_initial_cc_param(struct sctp_tc
}
sctp_enforce_cwnd_limit(assoc, net);
net->ssthresh = assoc->peers_rwnd;
- SDT_PROBE(sctp, cwnd, net, init,
+ SDT_PROBE5(sctp, cwnd, net, init,
stcb->asoc.my_vtag, ((stcb->sctp_ep->sctp_lport << 16) |
(stcb->rport)), net,
0, net->cwnd);
if (SCTP_BASE_SYSCTL(sctp_logging_level) &
@@ -193,7 +193,7 @@ sctp_cwnd_update_after_fr(struct sctp_tc
}
net->cwnd = net->ssthresh;
sctp_enforce_cwnd_limit(asoc, net);
- SDT_PROBE(sctp, cwnd, net, fr,
+ SDT_PROBE5(sctp, cwnd, net, fr,
stcb->asoc.my_vtag,
((stcb->sctp_ep->sctp_lport << 16) | (stcb->rport)), net,
old_cwnd, net->cwnd);
if (SCTP_BASE_SYSCTL(sctp_logging_level) &
SCTP_CWND_MONITOR_ENABLE) {
@@ -261,7 +261,7 @@ cc_bw_same(struct sctp_tcb *stcb, struct
*/
/* Probe point 5 */
probepoint |= ((5 << 16) | 1);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -282,7 +282,7 @@ cc_bw_same(struct sctp_tcb *stcb, struct
oth |= net->cc_mod.rtcc.step_cnt;
oth <<= 16;
oth |= net->cc_mod.rtcc.last_step_state;
- SDT_PROBE(sctp, cwnd, net, rttstep,
+ SDT_PROBE5(sctp, cwnd, net, rttstep,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) |
net->rtt),
@@ -306,7 +306,7 @@ cc_bw_same(struct sctp_tcb *stcb, struct
*/
/* Probe point 6 */
probepoint |= ((6 << 16) | 0);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -318,7 +318,7 @@ cc_bw_same(struct sctp_tcb *stcb, struct
oth |= net->cc_mod.rtcc.step_cnt;
oth <<= 16;
oth |= net->cc_mod.rtcc.last_step_state;
- SDT_PROBE(sctp, cwnd, net, rttstep,
+ SDT_PROBE5(sctp, cwnd, net, rttstep,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -349,7 +349,7 @@ cc_bw_same(struct sctp_tcb *stcb, struct
*/
/* Probe point 7 */
probepoint |= ((7 << 16) | net->cc_mod.rtcc.ret_from_eq);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -398,7 +398,7 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
/* We caused it maybe.. back off? */
/* PROBE POINT 1 */
probepoint |= ((1 << 16) | 1);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -416,7 +416,7 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
}
/* Probe point 2 */
probepoint |= ((2 << 16) | 0);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -429,7 +429,7 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
oth |= net->cc_mod.rtcc.step_cnt;
oth <<= 16;
oth |= net->cc_mod.rtcc.last_step_state;
- SDT_PROBE(sctp, cwnd, net, rttstep,
+ SDT_PROBE5(sctp, cwnd, net, rttstep,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -453,7 +453,7 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
/* bw & rtt decreased */
/* Probe point 3 */
probepoint |= ((3 << 16) | 0);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -465,7 +465,7 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
oth |= net->cc_mod.rtcc.step_cnt;
oth <<= 16;
oth |= net->cc_mod.rtcc.last_step_state;
- SDT_PROBE(sctp, cwnd, net, rttstep,
+ SDT_PROBE5(sctp, cwnd, net, rttstep,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -485,7 +485,7 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
/* The bw decreased but rtt stayed the same */
/* Probe point 4 */
probepoint |= ((4 << 16) | 0);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -497,7 +497,7 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
oth |= net->cc_mod.rtcc.step_cnt;
oth <<= 16;
oth |= net->cc_mod.rtcc.last_step_state;
- SDT_PROBE(sctp, cwnd, net, rttstep,
+ SDT_PROBE5(sctp, cwnd, net, rttstep,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -535,7 +535,7 @@ cc_bw_increase(struct sctp_tcb *stcb, st
*/
/* PROBE POINT 0 */
probepoint = (((uint64_t) net->cwnd) << 32);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -547,7 +547,7 @@ cc_bw_increase(struct sctp_tcb *stcb, st
oth |= net->cc_mod.rtcc.step_cnt;
oth <<= 16;
oth |= net->cc_mod.rtcc.last_step_state;
- SDT_PROBE(sctp, cwnd, net, rttstep,
+ SDT_PROBE5(sctp, cwnd, net, rttstep,
vtag,
((net->cc_mod.rtcc.lbw << 32) | nbw),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -647,7 +647,7 @@ cc_bw_limit(struct sctp_tcb *stcb, struc
/* Can't determine do not change */
probepoint |= ((0xd << 16) | inst_ind);
}
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((nbw << 32) | inst_bw),
((net->cc_mod.rtcc.lbw_rtt << 32) | rtt),
@@ -807,7 +807,7 @@ sctp_cwnd_update_after_sack_common(struc
(((uint32_t) (stcb->sctp_ep->sctp_lport))
<< 16) |
(stcb->rport);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
nbw,
((net->cc_mod.rtcc.lbw_rtt << 32) |
net->rtt),
@@ -906,7 +906,7 @@ sctp_cwnd_update_after_sack_common(struc
sctp_log_cwnd(stcb, net, incr,
SCTP_CWND_LOG_FROM_SS);
}
- SDT_PROBE(sctp, cwnd, net, ack,
+ SDT_PROBE5(sctp, cwnd, net, ack,
stcb->asoc.my_vtag,
((stcb->sctp_ep->sctp_lport << 16)
| (stcb->rport)),
net,
@@ -969,7 +969,7 @@ sctp_cwnd_update_after_sack_common(struc
}
net->cwnd += incr;
sctp_enforce_cwnd_limit(asoc, net);
- SDT_PROBE(sctp, cwnd, net, ack,
+ SDT_PROBE5(sctp, cwnd, net, ack,
stcb->asoc.my_vtag,
((stcb->sctp_ep->sctp_lport << 16)
| (stcb->rport)),
net,
@@ -1001,7 +1001,7 @@ sctp_cwnd_update_exit_pf_common(struct s
old_cwnd = net->cwnd;
net->cwnd = net->mtu;
- SDT_PROBE(sctp, cwnd, net, ack,
+ SDT_PROBE5(sctp, cwnd, net, ack,
stcb->asoc.my_vtag, ((stcb->sctp_ep->sctp_lport << 16) |
(stcb->rport)), net,
old_cwnd, net->cwnd);
SCTPDBG(SCTP_DEBUG_INDATA1, "Destination %p moved from PF to reachable
with cwnd %d.\n",
@@ -1072,7 +1072,7 @@ sctp_cwnd_update_after_timeout(struct sc
}
net->cwnd = net->mtu;
net->partial_bytes_acked = 0;
- SDT_PROBE(sctp, cwnd, net, to,
+ SDT_PROBE5(sctp, cwnd, net, to,
stcb->asoc.my_vtag,
((stcb->sctp_ep->sctp_lport << 16) | (stcb->rport)),
net,
@@ -1132,7 +1132,7 @@ sctp_cwnd_update_after_ecn_echo_common(s
net->RTO <<= 1;
}
net->cwnd = net->ssthresh;
- SDT_PROBE(sctp, cwnd, net, ecn,
+ SDT_PROBE5(sctp, cwnd, net, ecn,
stcb->asoc.my_vtag,
((stcb->sctp_ep->sctp_lport << 16) | (stcb->rport)),
net,
@@ -1251,7 +1251,7 @@ sctp_cwnd_update_after_packet_dropped(st
sctp_enforce_cwnd_limit(&stcb->asoc, net);
if (net->cwnd - old_cwnd != 0) {
/* log only changes */
- SDT_PROBE(sctp, cwnd, net, pd,
+ SDT_PROBE5(sctp, cwnd, net, pd,
stcb->asoc.my_vtag,
((stcb->sctp_ep->sctp_lport << 16) | (stcb->rport)),
net,
@@ -1274,7 +1274,7 @@ sctp_cwnd_update_after_output(struct sct
if (burst_limit) {
net->cwnd = (net->flight_size + (burst_limit * net->mtu));
sctp_enforce_cwnd_limit(&stcb->asoc, net);
- SDT_PROBE(sctp, cwnd, net, bl,
+ SDT_PROBE5(sctp, cwnd, net, bl,
stcb->asoc.my_vtag,
((stcb->sctp_ep->sctp_lport << 16) | (stcb->rport)),
net,
@@ -1350,7 +1350,7 @@ sctp_cwnd_new_rtcc_transmission_begins(s
probepoint = (((uint64_t) net->cwnd) << 32);
/* Probe point 8 */
probepoint |= ((8 << 16) | 0);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
((net->cc_mod.rtcc.lbw << 32) | 0),
((net->cc_mod.rtcc.lbw_rtt << 32) | net->rtt),
@@ -1413,7 +1413,7 @@ sctp_set_rtcc_initial_cc_param(struct sc
vtag = (net->rtt << 32) |
(((uint32_t) (stcb->sctp_ep->sctp_lport)) << 16) |
(stcb->rport);
- SDT_PROBE(sctp, cwnd, net, rttvar,
+ SDT_PROBE5(sctp, cwnd, net, rttvar,
vtag,
0,
0,
Modified: head/sys/security/mac/mac_framework.c
==============================================================================
--- head/sys/security/mac/mac_framework.c Wed Dec 16 23:23:12 2015
(r292383)
+++ head/sys/security/mac/mac_framework.c Wed Dec 16 23:39:27 2015
(r292384)
@@ -93,11 +93,11 @@ __FBSDID("$FreeBSD$");
SDT_PROVIDER_DEFINE(mac);
SDT_PROVIDER_DEFINE(mac_framework);
-SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, "int",
+SDT_PROBE_DEFINE2(mac, , policy, modevent, "int",
"struct mac_policy_conf *");
-SDT_PROBE_DEFINE1(mac, kernel, policy, register,
+SDT_PROBE_DEFINE1(mac, , policy, register,
"struct mac_policy_conf *");
-SDT_PROBE_DEFINE1(mac, kernel, policy, unregister,
+SDT_PROBE_DEFINE1(mac, , policy, unregister,
"struct mac_policy_conf *");
/*
@@ -444,7 +444,7 @@ mac_policy_register(struct mac_policy_co
(*(mpc->mpc_ops->mpo_init))(mpc);
mac_policy_update();
- SDT_PROBE(mac, kernel, policy, register, mpc, 0, 0, 0, 0);
+ SDT_PROBE1(mac, , policy, register, mpc);
printf("Security policy loaded: %s (%s)\n", mpc->mpc_fullname,
mpc->mpc_name);
@@ -491,7 +491,7 @@ mac_policy_unregister(struct mac_policy_
mac_policy_update();
mac_policy_xunlock();
- SDT_PROBE(mac, kernel, policy, unregister, mpc, 0, 0, 0, 0);
+ SDT_PROBE1(mac, , policy, unregister, mpc);
printf("Security policy unload: %s (%s)\n", mpc->mpc_fullname,
mpc->mpc_name);
@@ -517,7 +517,7 @@ mac_policy_modevent(module_t mod, int ty
}
#endif
- SDT_PROBE(mac, kernel, policy, modevent, type, mpc, 0, 0, 0);
+ SDT_PROBE2(mac, , policy, modevent, type, mpc);
switch (type) {
case MOD_LOAD:
if (mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_NOTLATE &&
Modified: head/sys/security/mac/mac_internal.h
==============================================================================
--- head/sys/security/mac/mac_internal.h Wed Dec 16 23:23:12 2015
(r292383)
+++ head/sys/security/mac/mac_internal.h Wed Dec 16 23:39:27 2015
(r292384)
@@ -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, \
+ SDT_PROBE_DEFINE5(mac_framework, , name, mac__check__err, \
"int", arg0, arg1, arg2, arg3); \
- SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac__check__ok, \
+ SDT_PROBE_DEFINE5(mac_framework, , 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, \
+ SDT_PROBE_DEFINE4(mac_framework, , name, mac__check__err, \
"int", arg0, arg1, arg2); \
- SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac__check__ok, \
+ SDT_PROBE_DEFINE4(mac_framework, , 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, \
+ SDT_PROBE_DEFINE3(mac_framework, , name, mac__check__err, \
"int", arg0, arg1); \
- SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__check__ok, \
+ SDT_PROBE_DEFINE3(mac_framework, , name, mac__check__ok, \
"int", arg0, arg1);
#define MAC_CHECK_PROBE_DEFINE1(name, arg0)
\
- SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac__check__err, \
+ SDT_PROBE_DEFINE2(mac_framework, , name, mac__check__err, \
"int", arg0); \
- SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac__check__ok, \
+ SDT_PROBE_DEFINE2(mac_framework, , 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_PROBE5(mac_framework, , name, mac__check__err, \
error, arg0, arg1, arg2, arg3); \
} else { \
- SDT_PROBE(mac_framework, kernel, name, mac__check__ok, \
+ SDT_PROBE5(mac_framework, , name, mac__check__ok, \
0, arg0, arg1, arg2, arg3); \
} \
} while (0)
@@ -116,18 +116,18 @@ SDT_PROVIDER_DECLARE(mac_framework); /*
#endif
#define MAC_GRANT_PROBE_DEFINE2(name, arg0, arg1)
\
- SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__grant__err, \
+ SDT_PROBE_DEFINE3(mac_framework, , name, mac__grant__err, \
"int", arg0, arg1); \
- SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__grant__ok, \
+ SDT_PROBE_DEFINE3(mac_framework, , 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, \
- error, arg0, arg1, 0, 0); \
+ SDT_PROBE3(mac_framework, , name, mac__grant__err, \
+ error, arg0, arg1); \
} else { \
- SDT_PROBE(mac_framework, kernel, name, mac__grant__ok, \
- error, arg0, arg1, 0, 0); \
+ SDT_PROBE3(mac_framework, , name, mac__grant__ok, \
+ error, arg0, arg1); \
} \
} while (0)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
