X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.h;h=e3c73000edfb18675c3ce4b8cdb3ac897aeb57dc;hb=5a2ec8fc41d14ffc5275ab88761c1fb7e0420a33;hp=ea21464ee5487c780591bdede12ae0e678b4712b;hpb=178cf493d009995b28fdf220f04c98860ff79a9b;p=vpp.git diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h index ea21464ee54..e3c73000edf 100644 --- a/src/vnet/session/session.h +++ b/src/vnet/session/session.h @@ -36,6 +36,7 @@ typedef enum SESSION_IO_EVT_CT_RX, FIFO_EVENT_APP_TX, SESSION_IO_EVT_CT_TX, + SESSION_IO_EVT_TX_FLUSH, FIFO_EVENT_DISCONNECT, FIFO_EVENT_BUILTIN_RX, FIFO_EVENT_BUILTIN_TX, @@ -441,6 +442,14 @@ session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4) return (proto << 1 | is_ip4); } +always_inline u64 +session_segment_handle (stream_session_t * s) +{ + svm_fifo_t *f = s->server_rx_fifo; + return segment_manager_make_segment_handle (f->segment_manager, + f->segment_index); +} + always_inline u8 session_has_transport (stream_session_t * s) { @@ -510,6 +519,13 @@ transport_max_rx_enqueue (transport_connection_t * tc) return svm_fifo_max_enqueue (s->server_rx_fifo); } +always_inline u32 +transport_max_tx_dequeue (transport_connection_t * tc) +{ + stream_session_t *s = session_get (tc->s_index, tc->thread_index); + return svm_fifo_max_dequeue (s->server_tx_fifo); +} + always_inline u32 transport_rx_fifo_size (transport_connection_t * tc) { @@ -594,18 +610,19 @@ int session_dequeue_notify (stream_session_t * s); void stream_session_init_fifos_pointers (transport_connection_t * tc, u32 rx_pointer, u32 tx_pointer); -void stream_session_accept_notify (transport_connection_t * tc); -void stream_session_disconnect_notify (transport_connection_t * tc); -void stream_session_delete_notify (transport_connection_t * tc); -void stream_session_reset_notify (transport_connection_t * tc); +int stream_session_accept_notify (transport_connection_t * tc); +void session_transport_closing_notify (transport_connection_t * tc); +void session_transport_delete_notify (transport_connection_t * tc); +void session_transport_closed_notify (transport_connection_t * tc); +void session_transport_reset_notify (transport_connection_t * tc); int stream_session_accept (transport_connection_t * tc, u32 listener_index, u8 notify); int session_open (u32 app_index, session_endpoint_t * tep, u32 opaque); int session_listen (stream_session_t * s, session_endpoint_cfg_t * sep); int session_stop_listen (stream_session_t * s); -void stream_session_disconnect (stream_session_t * s); -void stream_session_disconnect_transport (stream_session_t * s); -void stream_session_cleanup (stream_session_t * s); +void session_close (stream_session_t * s); +void session_transport_close (stream_session_t * s); +void session_transport_cleanup (stream_session_t * s); int session_send_io_evt_to_thread (svm_fifo_t * f, session_evt_type_t evt_type); int session_send_io_evt_to_thread_custom (void *data, u32 thread_index,