@@ -606,14 +606,40 @@ 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]);
610- printk ("ratio: %d, rate_ad: %u, rate_ac: %u, srtt_ad: %u, srtt_ac: %u, num_acks_ad: %u, num_acks_ac: %u\n" , meta_tp -> num_segments_flow_one , tput [0 ], tput [1 ], srtt [0 ], srtt [1 ], num_acks [0 ], num_acks [1 ]);
609+ printk ("ratio: %d"
610+ ", rate_ad: %u"
611+ ", rate_ac: %u"
612+ ", srtt_ad: %u"
613+ ", srtt_ac: %u"
614+ ", num_acks_ad: %u"
615+ ", num_acks_ac: %u\n" ,
616+ meta_tp -> num_segments_flow_one ,
617+ tput [0 ],
618+ tput [1 ],
619+ srtt [0 ],
620+ srtt [1 ],
621+ num_acks [0 ],
622+ num_acks [1 ]);
611623 else
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\n" , meta_tp -> num_segments_flow_one , tput [0 ], tput [1 ], srtt [0 ], srtt [1 ], num_acks [0 ], num_acks [1 ]);
614-
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 );
624+ printk ("ratio: %d"
625+ ", rate_ad: %u"
626+ ", rate_ac: %u"
627+ ", srtt_ad: %u"
628+ ", srtt_ac: %u"
629+ ", num_acks_ad: %u"
630+ ", num_acks_ac: %u\n" ,
631+ meta_tp -> num_segments_flow_one ,
632+ tput [0 ],
633+ tput [1 ],
634+ srtt [0 ],
635+ srtt [1 ],
636+ num_acks [0 ],
637+ num_acks [1 ]);
638+
639+ printk ("rate_thresh_cnt: %d"
640+ ", buffer_thresh_cnt: %d\n" ,
641+ threshold_cnt ,
642+ buffer_threshold_cnt );
617643
618644 if (!in_search && !last_rate ) {
619645 count_set_init_rate ++ ;
0 commit comments