Merge pull request #1754 from hfstco/cubic-seed-bug

cubic seed bug
private-octopus · Sep 16, 2024 · 79f0aa3 · 79f0aa3
2 parents d66c78b + 6bc69ab
commit 79f0aa3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/PerfAndStressTest/PerfAndStressTest.cpp b/PerfAndStressTest/PerfAndStressTest.cpp
@@ -111,6 +111,13 @@ namespace PerfAndStressTest
             Assert::AreEqual(ret, 0);
         }
 
+	    TEST_METHOD(satellite_cubic_seed)
+        {
+            int ret = satellite_cubic_seeded_test();
+
+            Assert::AreEqual(ret, 0);
+        }
+
         TEST_METHOD(satellite_cubic_loss)
         {
             int ret = satellite_cubic_loss_test();

diff --git a/picoquic/cubic.c b/picoquic/cubic.c
@@ -309,6 +309,9 @@ static void picoquic_cubic_notify(
                         path_x->cwin = ack_state->nb_bytes_acknowledged;
                     }
                     cubic_state->ssthresh = ack_state->nb_bytes_acknowledged;
+                    cubic_state->W_max = (double)path_x->cwin / (double)path_x->send_mtu;
+                    cubic_state->W_last_max = cubic_state->W_max;
+                    cubic_state->W_reno = ((double)path_x->cwin);
                     path_x->is_ssthresh_initialized = 1;
                     picoquic_cubic_enter_avoidance(cubic_state, current_time);
                 }

diff --git a/picoquic_t/picoquic_t.c b/picoquic_t/picoquic_t.c
@@ -347,6 +347,7 @@ static const picoquic_test_def_t test_table[] = {
     { "satellite_small", satellite_small_test },
     { "satellite_small_up", satellite_small_up_test },
     { "satellite_cubic", satellite_cubic_test },
+    { "satellite_cubic_seeded", satellite_cubic_seeded_test },
     { "satellite_cubic_loss", satellite_cubic_loss_test },
     { "bdp_basic", bdp_basic_test },
     { "bdp_delay", bdp_delay_test },

diff --git a/picoquictest/picoquictest.h b/picoquictest/picoquictest.h
@@ -266,6 +266,7 @@ int satellite_preemptive_fc_test();
 int satellite_small_test();
 int satellite_small_up_test();
 int satellite_cubic_test();
+int satellite_cubic_seeded_test();
 int satellite_cubic_loss_test();
 int bdp_basic_test();
 int bdp_reno_test();

diff --git a/picoquictest/satellite_test.c b/picoquictest/satellite_test.c
@@ -266,6 +266,11 @@ int satellite_cubic_test()
     return satellite_test_one(picoquic_cubic_algorithm, 100000000, 11000000, 250, 3, 0, 0, 0, 0, 0, 0);
 }
 
+int satellite_cubic_seeded_test()
+{
+    return satellite_test_one(picoquic_cubic_algorithm, 100000000, 5000000, 250, 3, 0, 0, 0, 1, 0, 0);
+}
+
 int satellite_cubic_loss_test()
 {
     /* Should be less than 10 sec per draft etosat, but cubic is a bit slower */