Merge pull request #1685 from private-octopus/priority_bypass_cc

High priority bypass CC
private-octopus · May 3, 2024 · 01dd305 · 01dd305
2 parents a90123b + c1d1ba0
commit 01dd305
Show file tree

Hide file tree

Showing 24 changed files with 791 additions and 487 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ else()
 endif()
 
 project(picoquic
-        VERSION 1.1.19.12
+        VERSION 1.1.20.0
         DESCRIPTION "picoquic library"
         LANGUAGES C CXX)
 
@@ -84,6 +84,7 @@ set(PICOQUIC_LIBRARY_FILES
     picoquic/logwriter.c
     picoquic/loss_recovery.c
     picoquic/newreno.c
+    picoquic/pacing.c
     picoquic/packet.c
     picoquic/performance_log.c
     picoquic/picohash.c
@@ -157,6 +158,7 @@ set(PICOQUIC_TEST_LIBRARY_FILES
     picoquictest/multipath_test.c
     picoquictest/netperf_test.c
     picoquictest/openssl_test.c
+    picoquictest/pacing_test.c
     picoquictest/parseheadertest.c
     picoquictest/picoquic_lb_test.c
     picoquictest/pn2pn64test.c

diff --git a/UnitTest1/unittest1.cpp b/UnitTest1/unittest1.cpp
@@ -435,6 +435,13 @@ namespace UnitTest1
         {
             int ret = pacing_test();
 
+            Assert::AreEqual(ret, 0);
+        }
+
+        TEST_METHOD(pacing_repeat)
+        {
+            int ret = pacing_repeat_test();
+
             Assert::AreEqual(ret, 0);
         }
 

diff --git a/picoquic/bbr.c b/picoquic/bbr.c
@@ -1922,7 +1922,7 @@ void BBRCheckStartupLongRtt(picoquic_bbr_state_t* bbr_state, picoquic_path_t* pa
     }
 
     if (picoquic_hystart_test(&bbr_state->rtt_filter, rs->rtt_sample,
-        path_x->pacing_packet_time_microsec, current_time, 0)) {
+        path_x->pacing.packet_time_microsec, current_time, 0)) {
         BBRExitStartupLongRtt(bbr_state, path_x, current_time);
     }
     else if (rs->ecn_alpha > BBRExcessiveEcnCE) {

diff --git a/picoquic/bbr1.c b/picoquic/bbr1.c
@@ -1161,7 +1161,7 @@ static void picoquic_bbr1_notify(
 
             if (bbr1_state->state == picoquic_bbr1_alg_startup_long_rtt) {
                 if (picoquic_hystart_test(&bbr1_state->rtt_filter, (cnx->is_time_stamp_enabled) ? ack_state->one_way_delay : ack_state->rtt_measurement,
-                    cnx->path[0]->pacing_packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
+                    cnx->path[0]->pacing.packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
                     BBR1ExitStartupLongRtt(bbr1_state, path_x, current_time);
                 }
             }
@@ -1188,7 +1188,7 @@ static void picoquic_bbr1_notify(
                     path_x->cwin = min_win;
                 }
                 else if (path_x->smoothed_rtt > PICOQUIC_TARGET_RENO_RTT) {
-                    path_x->pacing_bandwidth_pause = 1;
+                    path_x->pacing.bandwidth_pause = 1;
                 }
 
                 picoquic_update_pacing_data(cnx, path_x, 1);

diff --git a/picoquic/cubic.c b/picoquic/cubic.c
@@ -266,7 +266,7 @@ static void picoquic_cubic_notify(
                 /* Using RTT increases as signal to get out of initial slow start */
                 if (cubic_state->ssthresh == UINT64_MAX &&
                     picoquic_hystart_test(&cubic_state->rtt_filter, (cnx->is_time_stamp_enabled) ? ack_state->one_way_delay : ack_state->rtt_measurement,
-                        cnx->path[0]->pacing_packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
+                        cnx->path[0]->pacing.packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
                     /* RTT increased too much, get out of slow start! */
                     if (cubic_state->rtt_filter.rtt_filtered_min > PICOQUIC_TARGET_RENO_RTT){
                         double correction;
@@ -518,7 +518,7 @@ static void picoquic_dcubic_notify(
                  * for getting out of slow start, but also for ending a cycle
                  * during congestion avoidance */
                 if (picoquic_hystart_test(&cubic_state->rtt_filter, (cnx->is_time_stamp_enabled) ? ack_state->one_way_delay : ack_state->rtt_measurement,
-                    cnx->path[0]->pacing_packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
+                    cnx->path[0]->pacing.packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
                     dcubic_exit_slow_start(cnx, path_x, notification, cubic_state, current_time);
                 }
                 break;
@@ -578,7 +578,7 @@ static void picoquic_dcubic_notify(
                 }
 
                 if (picoquic_hystart_test(&cubic_state->rtt_filter, (cnx->is_time_stamp_enabled) ? ack_state->one_way_delay : ack_state->rtt_measurement,
-                    cnx->path[0]->pacing_packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
+                    cnx->path[0]->pacing.packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
                     if (current_time - cubic_state->start_of_epoch > path_x->smoothed_rtt ||
                         cubic_state->recovery_sequence <= picoquic_cc_get_ack_number(cnx, path_x)) {
                         /* re-enter recovery if this is a new event */
@@ -643,7 +643,7 @@ static void picoquic_dcubic_notify(
                 break;
             case picoquic_congestion_notification_rtt_measurement:
                 if (picoquic_hystart_test(&cubic_state->rtt_filter, (cnx->is_time_stamp_enabled) ? ack_state->one_way_delay : ack_state->rtt_measurement,
-                    cnx->path[0]->pacing_packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
+                    cnx->path[0]->pacing.packet_time_microsec, current_time, cnx->is_time_stamp_enabled)) {
                     if (current_time - cubic_state->start_of_epoch > path_x->smoothed_rtt ||
                         cubic_state->recovery_sequence <= picoquic_cc_get_ack_number(cnx, path_x)) {
                         /* re-enter recovery */

diff --git a/picoquic/logwriter.c b/picoquic/logwriter.c
@@ -1176,7 +1176,7 @@ void binlog_cc_dump(picoquic_cnx_t* cnx, uint64_t current_time)
         bytewrite_vint(ps_msg, path->bandwidth_estimate);
         bytewrite_vint(ps_msg, path->receive_rate_estimate);
         bytewrite_vint(ps_msg, path->send_mtu);
-        bytewrite_vint(ps_msg, path->pacing_packet_time_microsec);
+        bytewrite_vint(ps_msg, path->pacing.packet_time_microsec);
         if (cnx->is_simple_multipath_enabled || cnx->is_multipath_enabled) {
             bytewrite_vint(ps_msg, path->nb_losses_found);
             bytewrite_vint(ps_msg, path->nb_spurious);

diff --git a/picoquic/newreno.c b/picoquic/newreno.c
@@ -268,7 +268,7 @@ static void picoquic_newreno_notify(
                 }
 
                 if (picoquic_hystart_test(&nr_state->rtt_filter, (cnx->is_time_stamp_enabled) ? ack_state->one_way_delay : ack_state->rtt_measurement,
-                    cnx->path[0]->pacing_packet_time_microsec, current_time,
+                    cnx->path[0]->pacing.packet_time_microsec, current_time,
                     cnx->is_time_stamp_enabled)) {
                     /* RTT increased too much, get out of slow start! */
                     nr_state->nrss.ssthresh = nr_state->nrss.cwin;