diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2013-11-26 08:46:27 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2013-11-26 08:46:27 +0000 |
| commit | d9fae5ab88a2c170075941d3cd9ba4a2a61893ed (patch) | |
| tree | 71130e514f6da98b3b2d804eaad8f664edfb52a9 /sys/security | |
| parent | 7689abaedcfb6009b374012fe345db47379c4f5e (diff) | |
| download | src-d9fae5ab88a2c170075941d3cd9ba4a2a61893ed.tar.gz src-d9fae5ab88a2c170075941d3cd9ba4a2a61893ed.zip | |
dtrace sdt: remove the ugly sname parameter of SDT_PROBE_DEFINE
In its stead use the Solaris / illumos approach of emulating '-' (dash)
in probe names with '__' (two consecutive underscores).
Reviewed by: markj
MFC after: 3 weeks
Notes
Notes:
svn path=/head/; revision=258622
Diffstat (limited to 'sys/security')
| -rw-r--r-- | sys/security/mac/mac_framework.c | 6 | ||||
| -rw-r--r-- | sys/security/mac/mac_internal.h | 48 |
2 files changed, 27 insertions, 27 deletions
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 5fa2736a896c..d2416eb721d3 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -93,11 +93,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 *"); /* diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index 6b1c50c1cf9a..ceb1e8727d98 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -74,35 +74,35 @@ SDT_PROVIDER_DECLARE(mac); /* MAC Framework-level events. */ 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); /* Entry points to MAC. */ #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); \ } else { \ - SDT_PROBE(mac_framework, kernel, name, mac_grant_ok, \ + SDT_PROBE(mac_framework, kernel, name, mac__grant__ok, \ error, arg0, arg1, 0, 0); \ } \ } while (0) |