Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.

Commit 2f75473

Browse files
committed
Shorten printk and add per-socket buffer probe
1 parent 47a14ad commit 2f75473

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

net/mptcp/mptcp_ratio.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -606,11 +606,14 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
606606
meta_tp->last_rate_search_start[iter] = meta_tp->last_rate_search_start[iter+1];
607607
}
608608
if (inet_sk(meta_sk)->inet_daddr)
609-
printk("daddr: %pI4, num_samples: %u, ratio: %d, rate_ad: %u, rate_ac: %u, rate_total: %u, srtt_ad: %u, srtt_ac: %u, min_rtt_ad:%u, min_rtt_ac:%u, num_acks_ad: %u, num_acks_ac: %u, buffer_ad: %u, buffer_ac: %u\n", &inet_sk(meta_sk)->inet_daddr, meta_tp->delivered, meta_tp->num_segments_flow_one, tput[0], tput[1], meta_tp->rate_delivered, srtt[0], srtt[1], min_rtt[0], min_rtt[1], num_acks[0], num_acks[1],buffer_sub[0], buffer_sub[1]);
609+
//printk("daddr: %pI4, num_samples: %u, ratio: %d, rate_ad: %u, rate_ac: %u, rate_total: %u, srtt_ad: %u, srtt_ac: %u, min_rtt_ad:%u, min_rtt_ac:%u, num_acks_ad: %u, num_acks_ac: %u, buffer_ad: %u, buffer_ac: %u\n", &inet_sk(meta_sk)->inet_daddr, meta_tp->delivered, meta_tp->num_segments_flow_one, tput[0], tput[1], meta_tp->rate_delivered, srtt[0], srtt[1], min_rtt[0], min_rtt[1], num_acks[0], num_acks[1],buffer_sub[0], buffer_sub[1]);
610+
printk("ratio: %d, rate_ad: %u, rate_ac: %u, srtt_ad: %u, srtt_ac: %u, num_acks_ad: %u, num_acks_ac: %u, buffer_ad: %u, buffer_ac: %u\n", meta_tp->num_segments_flow_one, tput[0], tput[1], srtt[0], srtt[1], num_acks[0], num_acks[1], buffer_sub[0], buffer_sub[1]);
610611
else
611-
printk("daddr NULL, num_samples: %u, ratio: %d, rate_ad: %u, rate_ac: %u, rate_total: %u, srtt_ad: %u, srtt_ac: %u, min_rtt_ad:%u, min_rtt_ac:%u, num_acks_ad: %u, num_acks_ac: %u, buffer_ad: %u, buffer_ac: %u\n", meta_tp->delivered, meta_tp->num_segments_flow_one, tput[0], tput[1], meta_tp->rate_delivered, srtt[0], srtt[1], min_rtt[0], min_rtt[1], num_acks[0], num_acks[1], buffer_sub[0], buffer_sub[1]);
612+
//printk("daddr NULL, num_samples: %u, ratio: %d, rate_ad: %u, rate_ac: %u, rate_total: %u, srtt_ad: %u, srtt_ac: %u, min_rtt_ad:%u, min_rtt_ac:%u, num_acks_ad: %u, num_acks_ac: %u, buffer_ad: %u, buffer_ac: %u\n", meta_tp->delivered, meta_tp->num_segments_flow_one, tput[0], tput[1], meta_tp->rate_delivered, srtt[0], srtt[1], min_rtt[0], min_rtt[1], num_acks[0], num_acks[1], buffer_sub[0], buffer_sub[1]);
613+
printk("ratio: %d, rate_ad: %u, rate_ac: %u, srtt_ad: %u, srtt_ac: %u, num_acks_ad: %u, num_acks_ac: %u, buffer_ad: %u, buffer_ac: %u\n", meta_tp->num_segments_flow_one, tput[0], tput[1], srtt[0], srtt[1], num_acks[0], num_acks[1], buffer_sub[0], buffer_sub[1]);
612614

613-
printk("rate_thresh_cnt: %d, buffer_thresh_cnt: %d, count_init: %u, last_rate: %u, last_trigger_tstamp: %u\n", threshold_cnt, buffer_threshold_cnt, count_set_init_rate, last_rate, last_trigger_tstamp);
615+
//printk("rate_thresh_cnt: %d, buffer_thresh_cnt: %d, count_init: %u, last_rate: %u, last_trigger_tstamp: %u\n", threshold_cnt, buffer_threshold_cnt, count_set_init_rate, last_rate, last_trigger_tstamp);
616+
printk("rate_thresh_cnt: %d, buffer_thresh_cnt: %d\n", threshold_cnt, buffer_threshold_cnt);
614617

615618
if (!in_search && !last_rate) {
616619
count_set_init_rate++;

0 commit comments

Comments
 (0)