cut 200ms

Author: phdinh94

net/mptcp/mptcp_ratio.c

@@ -516,8 +516,6 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 			mptcp_sched_probe_init(&sprobe);
 			iter++;
 
-			/*These two are read for every function call, e.g, every segment
-			 * we log every 100ms or longer*/
 			subflow_rate = READ_ONCE(tp_it->rate_delivered);
 			subflow_intv = READ_ONCE(tp_it->rate_interval_us);
 			if (subflow_rate && subflow_intv) {
@@ -555,6 +553,7 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 		meta_tp->rate_delivered += total_rate;//no use
 		meta_tp->delivered++;
 
+		
 		iter = 0;
 		mptcp_for_each_sub(mpcb, mptcp) {
 			struct sock *sk_it = mptcp_to_sock(mptcp);
@@ -565,8 +564,21 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 			rsp_temp->delivered++;
 			iter++;
 		}
+		
 
 		time_diff = jiffies_to_msecs(jiffies - meta_tp->rate_interval_us);    
+		/*Cut the first 200ms when we are searching*/
+		if(time_diff >= 200){
+			/*Calculate # of ACKs for each interface*/
+			mptcp_for_each_sub(mpcb, mptcp) {
+				struct sock *sk_it = mptcp_to_sock(mptcp);
+				struct tcp_sock *tp_it_temp = tcp_sk(sk_it);
+				if(in_search)
+				num_acks[iter] = tp_it_temp->delivered - tp_it_temp->prev_tx_bytes;//number of ACKs came back
+				iter++;
+			}/*Calculate # of ACKs for each interface*/
+
+		}
 		/*start dynamic ratio search*/
 		if (time_diff >= meta_tp->ratio_rate_sample) {
 			/*Load parameter from previous probe interval*/
@@ -585,7 +597,7 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 			iter = 0;
 			meta_tp->rate_delivered = 0; //reset this container so that we can use it to calculate rate
 
-			/*Value estimation per sampling interval*/
+			/*Value estimation for each interface*/
 			mptcp_for_each_sub(mpcb, mptcp) {
 				struct sock *sk_it = mptcp_to_sock(mptcp);
 				struct tcp_sock *tp_it_temp = tcp_sk(sk_it);
@@ -595,12 +607,15 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 				do_div(rsp_temp->buffer_size, meta_tp->delivered);
 				do_div(buffer_sub[iter], 1000);//KB
 				curr_tstamp = jiffies;
-				subflow_rate = tp_it_temp->delivered - tp_it_temp->prev_tx_bytes;//number of ACKs came back
+				subflow_rate = tp_it_temp->delivered - tp_it_temp->prev_tx_bytes-num_acks[iter];//number of ACKs came back
 				num_acks[iter] = subflow_rate;
 				tp_it_temp->prev_tx_bytes = tp_it_temp->delivered;
 				subflow_intv = jiffies_to_msecs(curr_tstamp - tp_it_temp->prev_tstamp);
 				tp_it_temp->prev_tstamp = curr_tstamp;
 				subflow_rate64 = (u64)subflow_rate * tp_it_temp->mss_cache * 8 * MSEC_PER_SEC;
+				if(in_search==1)
+					//We cut the first 200 ms
+					subflow_intv -= 200;
 				do_div(subflow_rate64, subflow_intv);
 				do_div(subflow_rate64, 1000000);//subflow_intv is in us
 				srtt[iter] = tp_it_temp->srtt_us>>3;
@@ -609,7 +624,7 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 				meta_tp->rate_delivered += tput[iter];//cummulate rate on both interface
 				rsp_temp->snd_una_saved = tp_it_temp->snd_una;
 				iter++;
-			}
+			}/*Value estimation for each interface*/
 
 			for (iter = 0; iter < 5; iter++) {
 				if (iter == 4)
@@ -917,7 +932,7 @@ static struct sk_buff *mptcp_ratio_next_segment(struct sock *meta_sk,
 			}
 			meta_tp->rate_interval_us = jiffies;
 
-		}/*end dynamic ratio_search*/
+		}/*end dynamic ratio search*/
 		// AUTO-RATE search 
 
 		mptcp_for_each_sub(mpcb, mptcp) {