diff options
author | avg <avg@FreeBSD.org> | 2013-11-26 08:46:27 +0000 |
---|---|---|
committer | avg <avg@FreeBSD.org> | 2013-11-26 08:46:27 +0000 |
commit | 71889a5eff815ac21ca37c8402d0239ddc0239ec (patch) | |
tree | 71130e514f6da98b3b2d804eaad8f664edfb52a9 /sys/netinet | |
parent | f447b2ef4329bde3f84c0b8d1dd9d0ac291e4a9a (diff) | |
download | FreeBSD-src-71889a5eff815ac21ca37c8402d0239ddc0239ec.zip FreeBSD-src-71889a5eff815ac21ca37c8402d0239ddc0239ec.tar.gz |
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
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/in_kdtrace.c | 24 | ||||
-rw-r--r-- | sys/netinet/in_kdtrace.h | 12 | ||||
-rw-r--r-- | sys/netinet/sctp_dtrace_define.h | 24 | ||||
-rw-r--r-- | sys/netinet/tcp_input.c | 6 | ||||
-rw-r--r-- | sys/netinet/tcp_output.c | 4 | ||||
-rw-r--r-- | sys/netinet/tcp_subr.c | 4 |
6 files changed, 37 insertions, 37 deletions
diff --git a/sys/netinet/in_kdtrace.c b/sys/netinet/in_kdtrace.c index c17c9f3..d37e3c0 100644 --- a/sys/netinet/in_kdtrace.c +++ b/sys/netinet/in_kdtrace.c @@ -37,7 +37,7 @@ SDT_PROVIDER_DEFINE(ip); SDT_PROVIDER_DEFINE(tcp); SDT_PROVIDER_DEFINE(udp); -SDT_PROBE_DEFINE6_XLATE(ip, , , receive, receive, +SDT_PROBE_DEFINE6_XLATE(ip, , , receive, "void *", "pktinfo_t *", "void *", "csinfo_t *", "uint8_t *", "ipinfo_t *", @@ -45,7 +45,7 @@ SDT_PROBE_DEFINE6_XLATE(ip, , , receive, receive, "struct ip *", "ipv4info_t *", "struct ip6_hdr *", "ipv6info_t *"); -SDT_PROBE_DEFINE6_XLATE(ip, , , send, send, +SDT_PROBE_DEFINE6_XLATE(ip, , , send, "void *", "pktinfo_t *", "void *", "csinfo_t *", "uint8_t *", "ipinfo_t *", @@ -53,56 +53,56 @@ SDT_PROBE_DEFINE6_XLATE(ip, , , send, send, "struct ip *", "ipv4info_t *", "struct ip6_hdr *", "ipv6info_t *"); -SDT_PROBE_DEFINE5_XLATE(tcp, , , accept_established, accept-established, +SDT_PROBE_DEFINE5_XLATE(tcp, , , accept__established, "void *", "pktinfo_t *", "struct tcpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", "struct tcpcb *", "tcpsinfo_t *" , "struct tcphdr *", "tcpinfoh_t *"); -SDT_PROBE_DEFINE5_XLATE(tcp, , , accept_refused, accept-refused, +SDT_PROBE_DEFINE5_XLATE(tcp, , , accept__refused, "void *", "pktinfo_t *", "struct tcpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", "struct tcpcb *", "tcpsinfo_t *" , "struct tcphdr *", "tcpinfo_t *"); -SDT_PROBE_DEFINE5_XLATE(tcp, , , connect_established, connect-established, +SDT_PROBE_DEFINE5_XLATE(tcp, , , connect__established, "void *", "pktinfo_t *", "struct tcpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", "struct tcpcb *", "tcpsinfo_t *" , "struct tcphdr *", "tcpinfoh_t *"); -SDT_PROBE_DEFINE5_XLATE(tcp, , , connect_refused, connect-refused, +SDT_PROBE_DEFINE5_XLATE(tcp, , , connect__refused, "void *", "pktinfo_t *", "struct tcpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", "struct tcpcb *", "tcpsinfo_t *" , "struct tcphdr *", "tcpinfoh_t *"); -SDT_PROBE_DEFINE5_XLATE(tcp, , , connect_request, connect-request, +SDT_PROBE_DEFINE5_XLATE(tcp, , , connect__request, "void *", "pktinfo_t *", "struct tcpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", "struct tcpcb *", "tcpsinfo_t *" , "struct tcphdr *", "tcpinfo_t *"); -SDT_PROBE_DEFINE5_XLATE(tcp, , , receive, receive, +SDT_PROBE_DEFINE5_XLATE(tcp, , , receive, "void *", "pktinfo_t *", "struct tcpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", "struct tcpcb *", "tcpsinfo_t *" , "struct tcphdr *", "tcpinfoh_t *"); -SDT_PROBE_DEFINE5_XLATE(tcp, , , send, send, +SDT_PROBE_DEFINE5_XLATE(tcp, , , send, "void *", "pktinfo_t *", "struct tcpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", "struct tcpcb *", "tcpsinfo_t *" , "struct tcphdr *", "tcpinfo_t *"); -SDT_PROBE_DEFINE6_XLATE(tcp, , , state_change, state-change, +SDT_PROBE_DEFINE6_XLATE(tcp, , , state__change, "void *", "void *", "struct tcpcb *", "csinfo_t *", "void *", "void *", @@ -110,14 +110,14 @@ SDT_PROBE_DEFINE6_XLATE(tcp, , , state_change, state-change, "void *", "void *", "int", "tcplsinfo_t *"); -SDT_PROBE_DEFINE5_XLATE(udp, , , receive, receive, +SDT_PROBE_DEFINE5_XLATE(udp, , , receive, "void *", "pktinfo_t *", "struct inpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", "struct inpcb *", "udpsinfo_t *", "struct udphdr *", "udpinfo_t *"); -SDT_PROBE_DEFINE5_XLATE(udp, , , send, send, +SDT_PROBE_DEFINE5_XLATE(udp, , , send, "void *", "pktinfo_t *", "struct inpcb *", "csinfo_t *", "uint8_t *", "ipinfo_t *", diff --git a/sys/netinet/in_kdtrace.h b/sys/netinet/in_kdtrace.h index 1759fac..07b3e3a 100644 --- a/sys/netinet/in_kdtrace.h +++ b/sys/netinet/in_kdtrace.h @@ -44,14 +44,14 @@ SDT_PROVIDER_DECLARE(udp); SDT_PROBE_DECLARE(ip, , , receive); SDT_PROBE_DECLARE(ip, , , send); -SDT_PROBE_DECLARE(tcp, , , accept_established); -SDT_PROBE_DECLARE(tcp, , , accept_refused); -SDT_PROBE_DECLARE(tcp, , , connect_established); -SDT_PROBE_DECLARE(tcp, , , connect_refused); -SDT_PROBE_DECLARE(tcp, , , connect_request); +SDT_PROBE_DECLARE(tcp, , , accept__established); +SDT_PROBE_DECLARE(tcp, , , accept__refused); +SDT_PROBE_DECLARE(tcp, , , connect__established); +SDT_PROBE_DECLARE(tcp, , , connect__refused); +SDT_PROBE_DECLARE(tcp, , , connect__request); SDT_PROBE_DECLARE(tcp, , , receive); SDT_PROBE_DECLARE(tcp, , , send); -SDT_PROBE_DECLARE(tcp, , , state_change); +SDT_PROBE_DECLARE(tcp, , , state__change); SDT_PROBE_DECLARE(udp, , , receive); SDT_PROBE_DECLARE(udp, , , send); diff --git a/sys/netinet/sctp_dtrace_define.h b/sys/netinet/sctp_dtrace_define.h index f4f075e..f34effb 100644 --- a/sys/netinet/sctp_dtrace_define.h +++ b/sys/netinet/sctp_dtrace_define.h @@ -44,7 +44,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 @@ -55,7 +55,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, init, 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 @@ -66,14 +66,14 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, ack, 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 */ @@ -81,7 +81,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, rttstep, rttstep, "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 @@ -92,7 +92,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, fr, fr, "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 @@ -103,7 +103,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, to, to, "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 @@ -114,7 +114,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, bl, bl, "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 @@ -125,7 +125,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, ecn, 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 @@ -138,7 +138,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, pd, pd, /********************************************************/ /* 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 @@ -150,7 +150,7 @@ SDT_PROBE_DEFINE4(sctp, rwnd, assoc, val, 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 @@ -163,7 +163,7 @@ SDT_PROBE_DEFINE5(sctp, flightsize, net, val, val, /********************************************************/ /* 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 diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 30fbd86..53df1a7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1928,7 +1928,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, goto dropwithreset; } if ((thflags & (TH_ACK|TH_RST)) == (TH_ACK|TH_RST)) { - TCP_PROBE5(connect_refused, NULL, tp, + TCP_PROBE5(connect__refused, NULL, tp, mtod(m, const char *), tp, th); tp = tcp_drop(tp, ECONNREFUSED); } @@ -1981,7 +1981,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, thflags &= ~TH_SYN; } else { tcp_state_change(tp, TCPS_ESTABLISHED); - TCP_PROBE5(connect_established, NULL, tp, + TCP_PROBE5(connect__established, NULL, tp, mtod(m, const char *), tp, th); cc_conn_init(tp); tcp_timer_activate(tp, TT_KEEP, @@ -2387,7 +2387,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, tp->t_flags &= ~TF_NEEDFIN; } else { tcp_state_change(tp, TCPS_ESTABLISHED); - TCP_PROBE5(accept_established, NULL, tp, + TCP_PROBE5(accept__established, NULL, tp, mtod(m, const char *), tp, th); cc_conn_init(tp); tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp)); diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 2fc4e86..6c55f10 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1184,7 +1184,7 @@ send: ip6->ip6_plen = htons(m->m_pkthdr.len - sizeof(*ip6)); if (tp->t_state == TCPS_SYN_SENT) - TCP_PROBE5(connect_request, NULL, tp, ip6, tp, th); + TCP_PROBE5(connect__request, NULL, tp, ip6, tp, th); TCP_PROBE5(send, NULL, tp, ip6, tp, th); @@ -1223,7 +1223,7 @@ send: ip->ip_off |= htons(IP_DF); if (tp->t_state == TCPS_SYN_SENT) - TCP_PROBE5(connect_request, NULL, tp, ip, tp, th); + TCP_PROBE5(connect__request, NULL, tp, ip, tp, th); TCP_PROBE5(send, NULL, tp, ip, tp, th); diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 5dab41c..52e5a44 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -720,7 +720,7 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m, tcp_trace(TA_OUTPUT, 0, tp, mtod(m, void *), th, 0); #endif if (flags & TH_RST) - TCP_PROBE5(accept_refused, NULL, NULL, mtod(m, const char *), + TCP_PROBE5(accept__refused, NULL, NULL, mtod(m, const char *), tp, nth); TCP_PROBE5(send, NULL, tp, mtod(m, const char *), tp, nth); @@ -2412,5 +2412,5 @@ tcp_state_change(struct tcpcb *tp, int newstate) #endif tp->t_state = newstate; - TCP_PROBE6(state_change, NULL, tp, NULL, tp, NULL, pstate); + TCP_PROBE6(state__change, NULL, tp, NULL, tp, NULL, pstate); } |