independent threshold count

Author: phdinh94

net/mptcp/mptcp_ratio.c

@@ -607,10 +607,10 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 			}
 			if (inet_sk(meta_sk)->inet_daddr)
 				//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]);
-				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]);
+				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]);
 			else
 				//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]);
-				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]);
+				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]);
 
 			//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);
 			printk("rate_thresh_cnt: %d, buffer_thresh_cnt: %d\n", threshold_cnt, buffer_threshold_cnt);
@@ -680,10 +680,8 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 				buffer_diff = (int)buffer_total - (int)init_buffer_total;
 
 				if (abs(rate_diff) > trigger_threshold) {
-					buffer_threshold_cnt = 0;
 					threshold_cnt++;
 				} else if (buffer_diff < meta_tp->buffer_trigger_threshold) {
-					threshold_cnt = 0;
 					buffer_threshold_cnt++;
 				} else {
 					buffer_threshold_cnt = 0;
@@ -696,7 +694,7 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 					goto search_start;
 				}
 
-				if (buffer_threshold_cnt == 5 || threshold_cnt == 3) {
+				if (buffer_threshold_cnt == 5 || threshold_cnt == 5) {
 					mptcp_for_each_sub(mpcb, mptcp) {
 						struct sock *sk_it = mptcp_to_sock(mptcp);
 						if (tcp_in_slow_start(tcp_sk(sk_it))) {
@@ -716,7 +714,7 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 					{
 						printk("DECREASED SEND QUEUE\n");
 					}
-					else if(threshold_cnt==3)
+					else if(threshold_cnt==5)
 					{
 						printk("DECREASED THROUGHPUT\n");
 					}
@@ -730,8 +728,8 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 					threshold_cnt = 0;
 					buffer_threshold_cnt = 0;
 
-					/*Double sampling interval*/
-					meta_tp->ratio_rate_sample = meta_tp->ratio_rate_sample*2;
+					/*Multiply sampling interval*/
+					meta_tp->ratio_rate_sample = meta_tp->ratio_rate_sample*4;
 					last_trigger_tstamp = jiffies;
 
 					if (meta_tp->num_segments_flow_one < (100 - abs(meta_tp->ratio_search_step))) {