xnu-4570.20.62.tar.gz

[apple/xnu.git] / bsd / dev / dtrace / sdt_subr.c

diff --git a/bsd/dev/dtrace/sdt_subr.c b/bsd/dev/dtrace/sdt_subr.c
index 82ab01989bd8db0cfb2d2c310ebd81a086602422..ad71d1ffed35ed72e4113af4c7c17a453f1a778d 100644 (file)
--- a/bsd/dev/dtrace/sdt_subr.c
+++ b/bsd/dev/dtrace/sdt_subr.c
@@ -172,14 +172,14 @@ sdt_argdesc_t sdt_args[] = {
        { "io", "wait-done", 0, 0, "struct buf *", "bufinfo_t *" },
        { "io", "wait-done", 1, 0, "struct buf *", "devinfo_t *" },
        { "io", "wait-done", 2, 0, "struct buf *", "fileinfo_t *" },
-#if defined(__APPLE__)
+
+       /* APPLE NOTE: add vfs journaling support */
        { "io", "journal-start", 0, 0, "struct buf *", "bufinfo_t *" },
        { "io", "journal-start", 1, 0, "struct buf *", "devinfo_t *" },
        { "io", "journal-start", 2, 0, "struct buf *", "fileinfo_t *" },
        { "io", "journal-done", 0, 0, "struct buf *", "bufinfo_t *" },
        { "io", "journal-done", 1, 0, "struct buf *", "devinfo_t *" },
        { "io", "journal-done", 2, 0, "struct buf *", "fileinfo_t *" },
-#endif /* __APPLE__ */
 
        { "mib", NULL, 0, 0, "int", NULL },
 
@@ -887,11 +887,7 @@ sdt_argdesc_t sdt_args[] = {
        { "mptcp", "checksum-result", 0, 0, "struct tcpcb *", "tcpsinfo_t *" },
        { "mptcp", "checksum-result", 1, 1, "struct mbuf *", "pktinfo_t *" },
        { "mptcp", "checksum-result", 2, 2, "uint32_t", "uint32_t" },
-       { "mptcp", "session-create", 0, 0, "struct socket *", "socketinfo_t *"},
-       { "mptcp", "session-create", 1, 1, "struct sockbuf *", "socketbuf_t *"},
-       { "mptcp", "session-create", 2, 2, "struct sockbuf *", "socketbuf_t *"},
-       { "mptcp", "session-create", 3, 3, "struct mppcb *", "mppsinfo_t *" },
-       { "mptcp", "session-create", 4, 4, "int", "int" },
+       { "mptcp", "session-create", 0, 0, "struct mppcb *", "mppsinfo_t *" },
        { "mptcp", "session-destroy", 0, 0, "struct mptses *", "mptsesinfo_t *" },
        { "mptcp", "session-destroy", 1, 1, "struct mptcb *", "mptsinfo_t *" },
        { "mptcp", "subflow-create", 0, 0, "struct mptses *", "mptsesinfo_t *"},
@@ -909,11 +905,6 @@ sdt_argdesc_t sdt_args[] = {
        { "mptcp", "subflow-receive", 0, 0, "struct socket *", "socketinfo_t *" },
        { "mptcp", "subflow-receive", 1, 1, "struct sockbuf *", "socketbuf_t *" },
        { "mptcp", "subflow-receive", 2, 2, "struct sockbuf *", "socketbuf_t *" },
-       { "mptcp", "subflow-peeloff", 0, 0, "struct mptses *", "mptsesinfo_t *",},
-       { "mptcp", "subflow-peeloff", 1, 1, "struct mptsub *", "mptsubinfo_t *",},
-       { "mptcp", "subflow-peeloff", 2, 2, "struct socket *", "socketinfo_t *",},
-       { "mptcp", "subflow-peeloff", 3, 3, "struct sockbuf *", "socketbuf_t *" },
-       { "mptcp", "subflow-peeloff", 4, 4, "struct sockbuf *", "socketbuf_t *" },
        { "mptcp", "subflow-input", 0, 0, "struct mptses *", "mptsesinfo_t *" },
        { "mptcp", "subflow-input", 1, 1, "struct mptsub *", "mptsubinfo_t *" },
        { "mptcp", "subflow-output", 0, 0, "struct mptses *", "mptsesinfo_t *"},
@@ -948,16 +939,13 @@ sdt_argdesc_t sdt_args[] = {
        { "mptcp", "timer", 1, 1, "struct mptcb *", "mptsinfo_t *" },
        { "mptcp", "error", 0, 0, "struct mptcb *", "mptsinfo_t *" },
        { "mptcp", "connectx", 0, 0, "struct mptses *", "mptsesinfo_t *" },
-       { "mptcp", "connectx", 1, 1, "associd_t", "associd_t" },
+       { "mptcp", "connectx", 1, 1, "sae_associd_t", "sae_associd_t" },
        { "mptcp", "connectx", 2, 2, "struct socket *", "socketinfo_t *" },
        { "mptcp", "disconnectx", 0, 0, "struct mptses *", "mptsesinfo_t *" },
-       { "mptcp", "disconnectx", 1, 1, "associd_t", "associd_t" },
-       { "mptcp", "disconnectx", 2, 2, "connid_t", "connid_t" },
+       { "mptcp", "disconnectx", 1, 1, "sae_associd_t", "sae_associd_t" },
+       { "mptcp", "disconnectx", 2, 2, "sae_connid_t", "sae_connid_t" },
        { "mptcp", "disconnectx", 3, 3, "struct socket *", "sockinfo_t *" },
        { "mptcp", "disconnectx", 4, 4, "struct mptcb *", "mptsinfo_t *" },
-       { "mptcp", "peeloff", 0, 0, "struct mptses *", "mptsesinfo_t *" },
-       { "mptcp", "peeloff", 1, 1, "associd_t", "associd_t" },
-       { "mptcp", "peeloff", 2, 2, "struct socket *", "sockinfo_t *" },
        { NULL, NULL, 0, 0, NULL, NULL }
 };