svn commit: r297227 - in head/sys: kern sys
George V. Neville-Neil
gnn at FreeBSD.org
Thu Mar 24 08:26:08 UTC 2016
Author: gnn
Date: Thu Mar 24 08:26:06 2016
New Revision: 297227
URL: https://svnweb.freebsd.org/changeset/base/297227
Log:
Move mbuf provider under SDT to indicate that it is FreeBSD specific
and not a stable interface.
Reviewed by: markj
MFC after: 2 weeks
Sponsored by: Rubicon Communications (Netgate)
Differential Revision: https://reviews.freebsd.org/D5716
Modified:
head/sys/kern/uipc_mbuf.c
head/sys/sys/mbuf.h
Modified: head/sys/kern/uipc_mbuf.c
==============================================================================
--- head/sys/kern/uipc_mbuf.c Thu Mar 24 08:25:05 2016 (r297226)
+++ head/sys/kern/uipc_mbuf.c Thu Mar 24 08:26:06 2016 (r297227)
@@ -49,48 +49,46 @@ __FBSDID("$FreeBSD$");
#include <sys/uio.h>
#include <sys/sdt.h>
-SDT_PROVIDER_DEFINE(mbuf);
-
-SDT_PROBE_DEFINE5_XLATE(mbuf, , , m__init,
+SDT_PROBE_DEFINE5_XLATE(sdt, , , m__init,
"struct mbuf *", "mbufinfo_t *",
"uint32_t", "uint32_t",
"uint16_t", "uint16_t",
"uint32_t", "uint32_t",
"uint32_t", "uint32_t");
-SDT_PROBE_DEFINE3_XLATE(mbuf, , , m__gethdr,
+SDT_PROBE_DEFINE3_XLATE(sdt, , , m__gethdr,
"uint32_t", "uint32_t",
"uint16_t", "uint16_t",
"struct mbuf *", "mbufinfo_t *");
-SDT_PROBE_DEFINE3_XLATE(mbuf, , , m__get,
+SDT_PROBE_DEFINE3_XLATE(sdt, , , m__get,
"uint32_t", "uint32_t",
"uint16_t", "uint16_t",
"struct mbuf *", "mbufinfo_t *");
-SDT_PROBE_DEFINE4_XLATE(mbuf, , , m__getcl,
+SDT_PROBE_DEFINE4_XLATE(sdt, , , m__getcl,
"uint32_t", "uint32_t",
"uint16_t", "uint16_t",
"uint32_t", "uint32_t",
"struct mbuf *", "mbufinfo_t *");
-SDT_PROBE_DEFINE3_XLATE(mbuf, , , m__clget,
+SDT_PROBE_DEFINE3_XLATE(sdt, , , m__clget,
"struct mbuf *", "mbufinfo_t *",
"uint32_t", "uint32_t",
"uint32_t", "uint32_t");
-SDT_PROBE_DEFINE4_XLATE(mbuf, , , m__cljget,
+SDT_PROBE_DEFINE4_XLATE(sdt, , , m__cljget,
"struct mbuf *", "mbufinfo_t *",
"uint32_t", "uint32_t",
"uint32_t", "uint32_t",
"void*", "void*");
-SDT_PROBE_DEFINE(mbuf, , , m__cljset);
+SDT_PROBE_DEFINE(sdt, , , m__cljset);
-SDT_PROBE_DEFINE1_XLATE(mbuf, , , m__free,
+SDT_PROBE_DEFINE1_XLATE(sdt, , , m__free,
"struct mbuf *", "mbufinfo_t *");
-SDT_PROBE_DEFINE1_XLATE(mbuf, , , m__freem,
+SDT_PROBE_DEFINE1_XLATE(sdt, , , m__freem,
"struct mbuf *", "mbufinfo_t *");
#include <security/mac/mac_framework.h>
Modified: head/sys/sys/mbuf.h
==============================================================================
--- head/sys/sys/mbuf.h Thu Mar 24 08:25:05 2016 (r297226)
+++ head/sys/sys/mbuf.h Thu Mar 24 08:26:06 2016 (r297227)
@@ -48,27 +48,25 @@
#include <sys/sdt.h>
#define MBUF_PROBE1(probe, arg0) \
- SDT_PROBE1(mbuf, , , probe, arg0)
+ SDT_PROBE1(sdt, , , probe, arg0)
#define MBUF_PROBE2(probe, arg0, arg1) \
- SDT_PROBE2(mbuf, , , probe, arg0, arg1)
+ SDT_PROBE2(sdt, , , probe, arg0, arg1)
#define MBUF_PROBE3(probe, arg0, arg1, arg2) \
- SDT_PROBE3(mbuf, , , probe, arg0, arg1, arg2)
+ SDT_PROBE3(sdt, , , probe, arg0, arg1, arg2)
#define MBUF_PROBE4(probe, arg0, arg1, arg2, arg3) \
- SDT_PROBE4(mbuf, , , probe, arg0, arg1, arg2, arg3)
+ SDT_PROBE4(sdt, , , probe, arg0, arg1, arg2, arg3)
#define MBUF_PROBE5(probe, arg0, arg1, arg2, arg3, arg4) \
- SDT_PROBE5(mbuf, , , probe, arg0, arg1, arg2, arg3, arg4)
+ SDT_PROBE5(sdt, , , probe, arg0, arg1, arg2, arg3, arg4)
-SDT_PROVIDER_DECLARE(mbuf);
-
-SDT_PROBE_DECLARE(mbuf, , , m__init);
-SDT_PROBE_DECLARE(mbuf, , , m__gethdr);
-SDT_PROBE_DECLARE(mbuf, , , m__get);
-SDT_PROBE_DECLARE(mbuf, , , m__getcl);
-SDT_PROBE_DECLARE(mbuf, , , m__clget);
-SDT_PROBE_DECLARE(mbuf, , , m__cljget);
-SDT_PROBE_DECLARE(mbuf, , , m__cljset);
-SDT_PROBE_DECLARE(mbuf, , , m__free);
-SDT_PROBE_DECLARE(mbuf, , , m__freem);
+SDT_PROBE_DECLARE(sdt, , , m__init);
+SDT_PROBE_DECLARE(sdt, , , m__gethdr);
+SDT_PROBE_DECLARE(sdt, , , m__get);
+SDT_PROBE_DECLARE(sdt, , , m__getcl);
+SDT_PROBE_DECLARE(sdt, , , m__clget);
+SDT_PROBE_DECLARE(sdt, , , m__cljget);
+SDT_PROBE_DECLARE(sdt, , , m__cljset);
+SDT_PROBE_DECLARE(sdt, , , m__free);
+SDT_PROBE_DECLARE(sdt, , , m__freem);
#endif /* _KERNEL */
More information about the svn-src-all
mailing list