Merge Amber Cronin's changes into Project-Faster (viasat)

include/quicly/cc.h

@@ -40,8 +40,8 @@ extern "C" {
 #define QUICLY_MIN_CWND 2
 #define QUICLY_RENO_BETA 0.7
 
-#define QUICLY_SEARCH_DELV_BIN_COUNT 10                 // number of search delivered bytes bins
-#define QUICLY_SEARCH_TOTAL_BIN_COUNT (25)               // number of search sent bytes bins
+#define QUICLY_SEARCH_DELV_BIN_COUNT (10)               // number of search delivered bytes bins
+#define QUICLY_SEARCH_TOTAL_BIN_COUNT (25)              // number of search sent bytes bins
 #define QUICLY_SEARCH_WINDOW_MULTIPLIER (3.5)           // search multiplier for window calculation
 #define QUICLY_SEARCH_THRESH (0.35)                     // search threshold to exit slow start phase
 

include/quicly/ss.h

@@ -33,9 +33,6 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 
-#define MIN(x,y) ((x > y) ? (y) : (x))
-#define MAX(x,y) ((x < y) ? (y) : (x))
-
 /**
  * Holds pointers to concrete congestion control implementation functions.
  */

lib/ss-search.c

@@ -32,9 +32,13 @@
  * Linux TCP (as a kernel module). 
  *
  * References: 
- *  [1]  Maryam Ataei Kachooei, Jae Chung, Feng Li, Benjamin Peters, Josh Chung, and
+ *  [1] Amber Cronin, Maryam Ataei Kachooei, Jae Chung, Feng Li, Benjamin Peters, and Mark Claypool.
+ *      Improving QUIC Slow Start Behavior in Wireless Networks with SEARCH, In Proceedings of the IEEE
+ *      Local and Metropolitan Area Conference (LANMAN), Boston, MA, USA, July 2024.
+ *
+ *  [2]  Maryam Ataei Kachooei, Jae Chung, Feng Li, Benjamin Peters, Josh Chung, and
  *       Mark Claypool. Improving TCP Slow Start Performance in Wireless Networks with
- *       SEARCH, In Proceedings of the World of Wireless, Mobile and Multimedia Networks 
+ *       SEARCH, In Proceedings of the World of Wireless, Mobile and Multimedia Networks
  *       (WoWMoM), Perth, Australia June 2024.
  *
 */
@@ -50,7 +54,8 @@ void ss_search_reset(quicly_cc_t *cc, const quicly_loss_t *loss, uint32_t bytes,
 	uint32_t* bin_rounds = &cc->ss_state.search.bin_rounds;
 
 	// bin time is the size of each of the sent/delv bins
-	*bin_time = MAX((loss->rtt.latest * QUICLY_SEARCH_WINDOW_MULTIPLIER) / (QUICLY_SEARCH_DELV_BIN_COUNT), 1);
+  uint32_t tmp_bin_time = (loss->rtt.latest * QUICLY_SEARCH_WINDOW_MULTIPLIER) / (QUICLY_SEARCH_DELV_BIN_COUNT);
+  *bin_time = tmp_bin_time < 1 ? tmp_bin_time : 1;
 	*bin_end = now + *bin_time;
 	delv[0] = 0;
 	*bin_rounds = 0;