format_transport_proto (u8 * s, va_list * args)
{
u32 transport_proto = va_arg (*args, u32);
- switch (transport_proto)
- {
-#define _(sym, str, sstr) \
- case TRANSPORT_PROTO_ ## sym: \
- s = format (s, str); \
- break;
- foreach_transport_proto
-#undef _
- default:
- s = format (s, "UNKNOWN");
- break;
- }
+
+ if (tp_vfts[transport_proto].transport_options.name)
+ s = format (s, "%s", tp_vfts[transport_proto].transport_options.name);
+ else
+ s = format (s, "n/a");
+
return s;
}
format_transport_proto_short (u8 * s, va_list * args)
{
u32 transport_proto = va_arg (*args, u32);
- switch (transport_proto)
- {
-#define _(sym, str, sstr) \
- case TRANSPORT_PROTO_ ## sym: \
- s = format (s, sstr); \
- break;
- foreach_transport_proto
-#undef _
- default:
- s = format (s, "?");
- break;
- }
+ char *short_name;
+
+ short_name = tp_vfts[transport_proto].transport_options.short_name;
+ if (short_name)
+ s = format (s, "%s", short_name);
+ else
+ s = format (s, "NA");
+
return s;
}
indent = format_get_indent (s) + 1;
s = format (s, "%Upacer: %U\n", format_white_space, indent,
format_transport_pacer, &tc->pacer, tc->thread_index);
+ s = format (s, "%Utransport: flags 0x%x\n", format_white_space, indent,
+ tc->flags);
}
return s;
}
unformat_transport_proto (unformat_input_t * input, va_list * args)
{
u32 *proto = va_arg (*args, u32 *);
+ transport_proto_vft_t *tp_vft;
u8 longest_match = 0, match;
- char *str_match = 0;
-
-#define _(sym, str, sstr) \
- if (unformat_transport_str_match (input, str)) \
- { \
- match = strlen (str); \
- if (match > longest_match) \
- { \
- *proto = TRANSPORT_PROTO_ ## sym; \
- longest_match = match; \
- str_match = str; \
- } \
+ char *str, *str_match = 0;
+ transport_proto_t tp;
+
+ for (tp = 0; tp < vec_len (tp_vfts); tp++)
+ {
+ tp_vft = &tp_vfts[tp];
+ str = tp_vft->transport_options.name;
+ if (!str)
+ continue;
+ if (unformat_transport_str_match (input, str))
+ {
+ match = strlen (str);
+ if (match > longest_match)
+ {
+ *proto = tp;
+ longest_match = match;
+ str_match = str;
+ }
+ }
}
- foreach_transport_proto
-#undef _
- if (longest_match)
+ if (longest_match)
{
unformat (input, str_match);
return 1;
return 0;
}
+u8 *
+format_transport_protos (u8 * s, va_list * args)
+{
+ transport_proto_vft_t *tp_vft;
+
+ vec_foreach (tp_vft, tp_vfts)
+ s = format (s, "%s\n", tp_vft->transport_options.name);
+
+ return s;
+}
+
u32
transport_endpoint_lookup (transport_endpoint_table_t * ht, u8 proto,
ip46_address_t * ip, u16 port)
clib_bihash_add_del_24_8 (ht, &kv, 0);
}
-/**
- * Register transport virtual function table.
- *
- * @param transport_proto - transport protocol type (i.e., TCP, UDP ..)
- * @param vft - virtual function table for transport proto
- * @param fib_proto - network layer protocol
- * @param output_node - output node index that session layer will hand off
- * buffers to, for requested fib proto
- */
void
transport_register_protocol (transport_proto_t transport_proto,
const transport_proto_vft_t * vft,
session_register_transport (transport_proto, vft, is_ip4, output_node);
}
+transport_proto_t
+transport_register_new_protocol (const transport_proto_vft_t * vft,
+ fib_protocol_t fib_proto, u32 output_node)
+{
+ transport_proto_t transport_proto;
+ u8 is_ip4;
+
+ transport_proto = session_add_transport_proto ();
+ is_ip4 = fib_proto == FIB_PROTOCOL_IP4;
+
+ vec_validate (tp_vfts, transport_proto);
+ tp_vfts[transport_proto] = *vft;
+
+ session_register_transport (transport_proto, vft, is_ip4, output_node);
+
+ return transport_proto;
+}
+
/**
* Get transport virtual function table
*
now = transport_us_time_now (thread_index);
diff = now - pacer->last_update;
- s = format (s, "rate %lu bucket %lu t/p %.3f last_update %U",
+ s = format (s, "rate %lu bucket %lu t/p %.3f last_update %U idle %u",
pacer->bytes_per_sec, pacer->bucket, pacer->tokens_per_period,
- format_clib_us_time, diff);
+ format_clib_us_time, diff, pacer->idle_timeout_us);
return s;
}
u64 n_periods = (time_now - pacer->last_update);
u64 inc;
- if (PREDICT_FALSE (n_periods > 5e4))
+ if (PREDICT_FALSE (n_periods > pacer->idle_timeout_us))
{
pacer->last_update = time_now;
pacer->bucket = TRANSPORT_PACER_MIN_BURST;
return TRANSPORT_PACER_MIN_BURST;
}
- if (n_periods > 0
- && (inc = (f32) n_periods * pacer->tokens_per_period) > 10)
+ if ((inc = (f32) n_periods * pacer->tokens_per_period) > 10)
{
pacer->last_update = time_now;
pacer->bucket = clib_min (pacer->bucket + inc, pacer->bytes_per_sec);
}
static inline void
-spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec)
+spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec,
+ clib_us_time_t rtt)
{
ASSERT (rate_bytes_per_sec != 0);
pacer->bytes_per_sec = rate_bytes_per_sec;
pacer->tokens_per_period = rate_bytes_per_sec * CLIB_US_TIME_PERIOD;
+ pacer->idle_timeout_us = clib_max (rtt * TRANSPORT_PACER_IDLE_FACTOR,
+ TRANSPORT_PACER_MIN_IDLE);
}
static inline u64
void
transport_connection_tx_pacer_reset (transport_connection_t * tc,
- u64 rate_bytes_per_sec, u32 start_bucket)
+ u64 rate_bytes_per_sec, u32 start_bucket,
+ clib_us_time_t rtt)
{
- spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec);
+ spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec, rtt);
spacer_reset (&tc->pacer, transport_us_time_now (tc->thread_index),
start_bucket);
}
void
-transport_connection_tx_pacer_reset_bucket (transport_connection_t * tc)
+transport_connection_tx_pacer_reset_bucket (transport_connection_t * tc,
+ u32 bucket)
{
- spacer_reset (&tc->pacer, transport_us_time_now (tc->thread_index), 0);
+ spacer_reset (&tc->pacer, transport_us_time_now (tc->thread_index), bucket);
}
void
{
tc->flags |= TRANSPORT_CONNECTION_F_IS_TX_PACED;
transport_connection_tx_pacer_reset (tc, rate_bytes_per_sec,
- initial_bucket);
+ initial_bucket, 1e6);
}
void
transport_connection_tx_pacer_update (transport_connection_t * tc,
- u64 bytes_per_sec)
+ u64 bytes_per_sec, clib_us_time_t rtt)
{
- spacer_set_pace_rate (&tc->pacer, bytes_per_sec);
+ spacer_set_pace_rate (&tc->pacer, bytes_per_sec, rtt);
}
u32
transport_us_time_now (tc->thread_index));
}
-u32
-transport_connection_snd_space (transport_connection_t * tc, u16 mss)
-{
- u32 snd_space, max_paced_burst;
-
- snd_space = tp_vfts[tc->proto].send_space (tc);
- if (snd_space && transport_connection_is_tx_paced (tc))
- {
- clib_us_time_t now = transport_us_time_now (tc->thread_index);
- max_paced_burst = spacer_max_burst (&tc->pacer, now);
- max_paced_burst =
- (max_paced_burst < TRANSPORT_PACER_MIN_BURST) ? 0 : max_paced_burst;
- snd_space = clib_min (snd_space, max_paced_burst);
- return snd_space >= mss ? snd_space - snd_space % mss : snd_space;
- }
- return snd_space;
-}
-
u64
transport_connection_tx_pacer_rate (transport_connection_t * tc)
{
spacer_update_bucket (&tc->pacer, bytes);
}
+void
+transport_connection_reschedule (transport_connection_t * tc)
+{
+ tc->flags &= ~TRANSPORT_CONNECTION_F_DESCHED;
+ transport_connection_tx_pacer_reset_bucket (tc, TRANSPORT_PACER_MIN_BURST);
+ if (transport_max_tx_dequeue (tc))
+ sesssion_reschedule_tx (tc);
+ else
+ {
+ session_t *s = session_get (tc->s_index, tc->thread_index);
+ svm_fifo_unset_event (s->tx_fifo);
+ if (svm_fifo_max_dequeue_cons (s->tx_fifo))
+ if (svm_fifo_set_event (s->tx_fifo))
+ sesssion_reschedule_tx (tc);
+ }
+}
+
void
transport_update_time (clib_time_type_t time_now, u8 thread_index)
{
Code Review / vpp.git / blobdiff