Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Integrate first QUIC protocol implementation
[vpp.git]
/
src
/
vnet
/
session
/
transport.c
diff --git
a/src/vnet/session/transport.c
b/src/vnet/session/transport.c
index
3f8a4c3
..
abab086
100644
(file)
--- a/
src/vnet/session/transport.c
+++ b/
src/vnet/session/transport.c
@@
-49,6
+49,7
@@
static double transport_pacer_period;
#define TRANSPORT_PACER_MIN_MSS 1460
#define TRANSPORT_PACER_MIN_BURST TRANSPORT_PACER_MIN_MSS
#define TRANSPORT_PACER_MIN_MSS 1460
#define TRANSPORT_PACER_MIN_BURST TRANSPORT_PACER_MIN_MSS
+#define TRANSPORT_PACER_MAX_BURST (48 * TRANSPORT_PACER_MIN_MSS)
u8 *
format_transport_proto (u8 * s, va_list * args)
u8 *
format_transport_proto (u8 * s, va_list * args)
@@
-68,6
+69,9
@@
format_transport_proto (u8 * s, va_list * args)
case TRANSPORT_PROTO_UDPC:
s = format (s, "UDPC");
break;
case TRANSPORT_PROTO_UDPC:
s = format (s, "UDPC");
break;
+ case TRANSPORT_PROTO_QUIC:
+ s = format (s, "QUIC");
+ break;
}
return s;
}
}
return s;
}
@@
-90,6
+94,9
@@
format_transport_proto_short (u8 * s, va_list * args)
case TRANSPORT_PROTO_UDPC:
s = format (s, "U");
break;
case TRANSPORT_PROTO_UDPC:
s = format (s, "U");
break;
+ case TRANSPORT_PROTO_QUIC:
+ s = format (s, "Q");
+ break;
}
return s;
}
}
return s;
}
@@
-174,6
+181,10
@@
unformat_transport_proto (unformat_input_t * input, va_list * args)
*proto = TRANSPORT_PROTO_TLS;
else if (unformat (input, "TLS"))
*proto = TRANSPORT_PROTO_TLS;
*proto = TRANSPORT_PROTO_TLS;
else if (unformat (input, "TLS"))
*proto = TRANSPORT_PROTO_TLS;
+ else if (unformat (input, "quic"))
+ *proto = TRANSPORT_PROTO_QUIC;
+ else if (unformat (input, "QUIC"))
+ *proto = TRANSPORT_PROTO_QUIC;
else
return 0;
return 1;
else
return 0;
return 1;
@@
-540,7
+551,7
@@
spacer_max_burst (spacer_t * pacer, u64 norm_time_now)
pacer->bucket += inc;
}
pacer->bucket += inc;
}
- return clib_min (pacer->bucket,
pacer->max_burst_size
);
+ return clib_min (pacer->bucket,
TRANSPORT_PACER_MAX_BURST
);
}
static inline void
}
static inline void
@@
-550,13
+561,6
@@
spacer_update_bucket (spacer_t * pacer, u32 bytes)
pacer->bucket -= bytes;
}
pacer->bucket -= bytes;
}
-static inline void
-spacer_update_max_burst_size (spacer_t * pacer, u32 max_burst_bytes)
-{
- pacer->max_burst_size = clib_max (max_burst_bytes,
- TRANSPORT_PACER_MIN_BURST);
-}
-
static inline void
spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec)
{
static inline void
spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec)
{
@@
-570,12
+574,6
@@
transport_connection_tx_pacer_reset (transport_connection_t * tc,
u32 start_bucket, u64 time_now)
{
spacer_t *pacer = &tc->pacer;
u32 start_bucket, u64 time_now)
{
spacer_t *pacer = &tc->pacer;
- f64 dispatch_period;
- u32 burst_size;
-
- dispatch_period = transport_dispatch_period (tc->thread_index);
- burst_size = rate_bytes_per_sec * dispatch_period;
- spacer_update_max_burst_size (&tc->pacer, burst_size);
spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec);
pacer->last_update = time_now >> SPACER_CPU_TICKS_PER_PERIOD_SHIFT;
pacer->bucket = start_bucket;
spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec);
pacer->last_update = time_now >> SPACER_CPU_TICKS_PER_PERIOD_SHIFT;
pacer->bucket = start_bucket;
@@
-597,10
+595,7
@@
void
transport_connection_tx_pacer_update (transport_connection_t * tc,
u64 bytes_per_sec)
{
transport_connection_tx_pacer_update (transport_connection_t * tc,
u64 bytes_per_sec)
{
- f64 dispatch_period = transport_dispatch_period (tc->thread_index);
- u32 burst_size = 1.1 * bytes_per_sec * dispatch_period;
spacer_set_pace_rate (&tc->pacer, bytes_per_sec);
spacer_set_pace_rate (&tc->pacer, bytes_per_sec);
- spacer_update_max_burst_size (&tc->pacer, burst_size);
}
u32
}
u32