Page MenuHomeFreeBSD
Files F156856836

D55165.id.diff
No OneTemporary
Actions

D55165.id.diff
View Options

diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c
--- a/sys/netinet/sctp_cc_functions.c
+++ b/sys/netinet/sctp_cc_functions.c
@@ -51,12 +51,6 @@
#define SHIFT_MPTCP_MULTI_Z 16
#define SHIFT_MPTCP_MULTI 8
-#ifdef KDTRACE_HOOKS
-#define __dtrace
-#else
-#define __dtrace __unused
-#endif
-
static void
sctp_enforce_cwnd_limit(struct sctp_association *assoc, struct sctp_nets *net)
{
@@ -255,7 +249,7 @@
cc_bw_same(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw,
uint64_t rtt_offset, uint64_t vtag, uint8_t inst_ind)
{
- uint64_t oth __dtrace, probepoint __dtrace;
+ uint64_t oth __sdt_used, probepoint __sdt_used;
probepoint = (((uint64_t)net->cwnd) << 32);
if (net->rtt > net->cc_mod.rtcc.lbw_rtt + rtt_offset) {
@@ -390,7 +384,7 @@
cc_bw_decrease(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw, uint64_t rtt_offset,
uint64_t vtag, uint8_t inst_ind)
{
- uint64_t oth __dtrace, probepoint __dtrace;
+ uint64_t oth __sdt_used, probepoint __sdt_used;
/* Bandwidth decreased. */
probepoint = (((uint64_t)net->cwnd) << 32);
@@ -530,7 +524,7 @@
static int
cc_bw_increase(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw, uint64_t vtag)
{
- uint64_t oth __dtrace, probepoint __dtrace;
+ uint64_t oth __sdt_used, probepoint __sdt_used;
/*
* BW increased, so update and return 0, since all actions in our
@@ -574,7 +568,7 @@
cc_bw_limit(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw)
{
uint64_t bw_offset, rtt_offset;
- uint64_t probepoint __dtrace, rtt, vtag;
+ uint64_t probepoint __sdt_used, rtt, vtag;
uint64_t bytes_for_this_rtt, inst_bw;
uint64_t div, inst_off;
int bw_shift;
@@ -687,7 +681,7 @@
int accum_moved, int reneged_all SCTP_UNUSED, int will_exit, int use_rtcc)
{
struct sctp_nets *net;
- int old_cwnd __dtrace;
+ int old_cwnd __sdt_used;
uint32_t t_ssthresh, incr;
uint64_t t_ucwnd_sbw;
uint64_t t_path_mptcp;
@@ -800,7 +794,7 @@
continue;
}
} else {
- uint64_t vtag __dtrace, probepoint __dtrace;
+ uint64_t vtag __sdt_used, probepoint __sdt_used;
probepoint = (((uint64_t)net->cwnd) << 32);
probepoint |= ((0xa << 16) | 0);
@@ -998,7 +992,7 @@
static void
sctp_cwnd_update_exit_pf_common(struct sctp_tcb *stcb, struct sctp_nets *net)
{
- int old_cwnd __dtrace;
+ int old_cwnd __sdt_used;
old_cwnd = net->cwnd;
net->cwnd = net->mtu;
@@ -1339,7 +1333,7 @@
sctp_cwnd_new_rtcc_transmission_begins(struct sctp_tcb *stcb,
struct sctp_nets *net)
{
- uint64_t vtag __dtrace, probepoint __dtrace;
+ uint64_t vtag __sdt_used, probepoint __sdt_used;
if (net->cc_mod.rtcc.lbw) {
/* Clear the old bw.. we went to 0 in-flight */
@@ -1402,7 +1396,7 @@
sctp_set_rtcc_initial_cc_param(struct sctp_tcb *stcb,
struct sctp_nets *net)
{
- uint64_t vtag __dtrace, probepoint __dtrace;
+ uint64_t vtag __sdt_used, probepoint __sdt_used;
sctp_set_initial_cc_param(stcb, net);
stcb->asoc.use_precise_time = 1;

File Metadata

Mime Type
text/plain
Expires
Sun, May 17, 10:43 PM (2 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33214948
Default Alt Text
D55165.id.diff (2 KB)

Event Timeline