X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication.h;h=f23737c8499706ed65ad72c96f3e9a2da970b21e;hb=6442401c2;hp=e33f2ff797e2b98d0f4e71f318c631e77a7bc669;hpb=fa76a76bf3388f09d55d0c83e7aea507c44f9619;p=vpp.git diff --git a/src/vnet/session/application.h b/src/vnet/session/application.h index e33f2ff797e..f23737c8499 100644 --- a/src/vnet/session/application.h +++ b/src/vnet/session/application.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -16,9 +16,10 @@ #ifndef SRC_VNET_SESSION_APPLICATION_H_ #define SRC_VNET_SESSION_APPLICATION_H_ -#include -#include +#include #include +#include +#include #define APP_DEBUG 0 @@ -28,35 +29,6 @@ #define APP_DBG(_fmt, _args...) #endif -typedef struct _stream_session_cb_vft -{ - /** Notify server of new segment */ - int (*add_segment_callback) (u32 api_client_index, u64 segment_handle); - - /** Notify server of new segment */ - int (*del_segment_callback) (u32 api_client_index, u64 segment_handle); - - /** Notify server of newly accepted session */ - int (*session_accept_callback) (stream_session_t * new_session); - - /** Connection request callback */ - int (*session_connected_callback) (u32 app_wrk_index, u32 opaque, - stream_session_t * s, u8 code); - - /** Notify app that session is closing */ - void (*session_disconnect_callback) (stream_session_t * s); - - /** Notify app that session was reset */ - void (*session_reset_callback) (stream_session_t * s); - - /** Direct RX callback for built-in application */ - int (*builtin_app_rx_callback) (stream_session_t * session); - - /** Direct TX callback for built-in application */ - int (*builtin_app_tx_callback) (stream_session_t * session); - -} session_cb_vft_t; - typedef struct app_worker_ { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); @@ -87,19 +59,6 @@ typedef struct app_worker_ u32 first_segment_manager; u8 first_segment_manager_in_use; - /* - * Local "cut through" connections specific - */ - - /** Segment manager used for incoming "cut through" connects */ - u32 local_segment_manager; - - /** Pool of local sessions the app owns (as a server) */ - local_session_t *local_sessions; - - /** Hash table of the app's local connects */ - uword *local_connects; - /** API index for the worker. Needed for multi-process apps */ u32 api_client_index; @@ -116,6 +75,9 @@ typedef struct app_listener_ clib_bitmap_t *workers; /**< workers accepting connections */ u32 accept_rotor; /**< last worker to accept a connection */ u32 al_index; + u32 app_index; + u32 local_index; + u32 session_index; } app_listener_t; typedef struct application_ @@ -146,12 +108,6 @@ typedef struct application_ /** Pool of listeners for the app */ app_listener_t *listeners; - /** Pool of local listeners for app */ - app_listener_t *local_listeners; - - /** Pool of local listen sessions */ - local_session_t *local_listen_sessions; - /* * TLS Specific */ @@ -174,11 +130,6 @@ typedef struct app_main_ */ application_t *app_pool; - /** - * Pool of workers associated to apps - */ - app_worker_t *workers; - /** * Hash table of apps by api client index */ @@ -190,14 +141,6 @@ typedef struct app_main_ uword *app_by_name; } app_main_t; -#define foreach_app_init_args \ - _(u32, api_client_index) \ - _(u8 *, name) \ - _(u64 *, options) \ - _(u8 *, namespace_id) \ - _(session_cb_vft_t *, session_cb_vft) \ - _(u32, app_index) \ - typedef struct app_init_args_ { #define _(_type, _name) _type _name; @@ -220,48 +163,28 @@ typedef struct _vnet_app_worker_add_del_args #define APP_NS_INVALID_INDEX ((u32)~0) #define APP_INVALID_SEGMENT_MANAGER_INDEX ((u32) ~0) -app_worker_t *app_worker_alloc (application_t * app); -int app_worker_alloc_and_init (application_t * app, app_worker_t ** wrk); -app_worker_t *app_worker_get (u32 wrk_index); -app_worker_t *app_worker_get_if_valid (u32 wrk_index); -application_t *app_worker_get_app (u32 wrk_index); -void app_worker_free (app_worker_t * app_wrk); -int app_worker_open_session (app_worker_t * app, session_endpoint_t * tep, - u32 api_context); -segment_manager_t *app_worker_get_listen_segment_manager (app_worker_t *, - stream_session_t *); -segment_manager_t *app_worker_get_connect_segment_manager (app_worker_t *); -int app_worker_alloc_connects_segment_manager (app_worker_t * app); -int app_worker_add_segment_notify (u32 app_or_wrk, u64 segment_handle); -u32 app_worker_n_listeners (app_worker_t * app); -stream_session_t *app_worker_first_listener (app_worker_t * app, - u8 fib_proto, - u8 transport_proto); -u8 app_worker_application_is_builtin (app_worker_t * app_wrk); -int app_worker_send_event (app_worker_t * app, stream_session_t * s, u8 evt); -int app_worker_lock_and_send_event (app_worker_t * app, stream_session_t * s, - u8 evt_type); -clib_error_t *vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a); - -int application_start_listen (application_t * app, - session_endpoint_cfg_t * tep, - session_handle_t * handle); -int application_stop_listen (u32 app_index, u32 app_or_wrk, - session_handle_t handle); - -application_t *application_alloc (void); -int application_alloc_and_init (app_init_args_t * args); -void application_free (application_t * app); -void application_detach_process (application_t * app, u32 api_client_index); +app_listener_t *app_listener_get (application_t * app, u32 al_index); +int app_listener_alloc_and_init (application_t * app, + session_endpoint_cfg_t * sep, + app_listener_t ** listener); +void app_listener_cleanup (app_listener_t * app_listener); +session_handle_t app_listener_handle (app_listener_t * app_listener); +app_listener_t *app_listener_lookup (application_t * app, + session_endpoint_cfg_t * sep); +app_listener_t *app_listener_get_w_handle (session_handle_t handle); +app_listener_t *app_listener_get_w_session (session_t * ls); +app_worker_t *app_listener_select_worker (app_listener_t * al); +session_t *app_listener_get_session (app_listener_t * al); +session_t *app_listener_get_local_session (app_listener_t * al); + application_t *application_get (u32 index); application_t *application_get_if_valid (u32 index); application_t *application_lookup (u32 api_client_index); application_t *application_lookup_name (const u8 * name); app_worker_t *application_get_worker (application_t * app, u32 wrk_index); app_worker_t *application_get_default_worker (application_t * app); -app_worker_t *application_listener_select_worker (stream_session_t * ls, - u8 is_local); - +app_worker_t *application_listener_select_worker (session_t * ls); +int application_change_listener_owner (session_t * s, app_worker_t * app_wrk); int application_is_proxy (application_t * app); int application_is_builtin (application_t * app); int application_is_builtin_proxy (application_t * app); @@ -270,7 +193,6 @@ u32 application_local_session_table (application_t * app); const u8 *application_name_from_index (u32 app_or_wrk); u8 application_has_local_scope (application_t * app); u8 application_has_global_scope (application_t * app); -u8 application_use_mq_for_ctrl (application_t * app); void application_setup_proxy (application_t * app); void application_remove_proxy (application_t * app); @@ -281,103 +203,48 @@ segment_manager_properties_t * application_segment_manager_properties (application_t * app); /* - * Local session + * App worker */ -local_session_t *application_local_session_alloc (app_worker_t * app); -void application_local_session_free (app_worker_t * app, - local_session_t * ls); -local_session_t *application_get_local_session (app_worker_t * app, - u32 session_index); -local_session_t *application_get_local_session_from_handle (session_handle_t - handle); -local_session_t - * application_get_local_listen_session_from_handle (session_handle_t lh); -int application_start_local_listen (application_t * server, - session_endpoint_cfg_t * sep, - session_handle_t * handle); -int application_stop_local_listen (u32 app_index, u32 app_or_wrk, - session_handle_t lh); -int application_local_session_connect (app_worker_t * client, - app_worker_t * server, - local_session_t * ls, u32 opaque); -int application_local_session_connect_notify (local_session_t * ls); -int application_local_session_disconnect (u32 app_or_wrk, - local_session_t * ls); -int application_local_session_disconnect_w_index (u32 app_or_wrk, - u32 ls_index); -void app_worker_local_sessions_free (app_worker_t * app); - -always_inline u32 -local_session_id (local_session_t * ls) -{ - ASSERT (ls->session_index < (2 << 16)); - u32 app_or_wrk_index; - - if (ls->session_state == SESSION_STATE_LISTENING) - { - ASSERT (ls->app_index < (2 << 16)); - app_or_wrk_index = ls->app_index; - } - else - { - ASSERT (ls->app_wrk_index < (2 << 16)); - app_or_wrk_index = ls->app_wrk_index; - } - - return ((u32) app_or_wrk_index << 16 | (u32) ls->session_index); -} - -always_inline void -local_session_parse_id (u32 ls_id, u32 * app_or_wrk, u32 * session_index) -{ - *app_or_wrk = ls_id >> 16; - *session_index = ls_id & 0xFF; -} - -always_inline void -local_session_parse_handle (session_handle_t handle, u32 * app_or_wrk_index, - u32 * session_index) -{ - u32 bottom; - ASSERT ((handle >> 32) == SESSION_LOCAL_HANDLE_PREFIX); - bottom = (handle & 0xFFFFFFFF); - local_session_parse_id (bottom, app_or_wrk_index, session_index); -} - -always_inline session_handle_t -application_local_session_handle (local_session_t * ls) -{ - return ((u64) SESSION_LOCAL_HANDLE_PREFIX << 32) - | (u64) local_session_id (ls); -} - -always_inline local_session_t * -application_get_local_listen_session (application_t * app, u32 session_index) -{ - return pool_elt_at_index (app->local_listen_sessions, session_index); -} - -always_inline local_session_t * -application_get_local_listener_w_handle (session_handle_t handle) -{ - u32 server_index, session_index; - application_t *app; - local_session_parse_handle (handle, &server_index, &session_index); - app = application_get (server_index); - return application_get_local_listen_session (app, session_index); -} - -always_inline u8 -application_local_session_listener_has_transport (local_session_t * ls) -{ - transport_proto_t tp; - tp = session_type_transport_proto (ls->listener_session_type); - return (tp != TRANSPORT_PROTO_NONE); -} - -void mq_send_local_session_disconnected_cb (u32 app_or_wrk, - local_session_t * ls); +app_worker_t *app_worker_alloc (application_t * app); +int application_alloc_worker_and_init (application_t * app, + app_worker_t ** wrk); +app_worker_t *app_worker_get (u32 wrk_index); +app_worker_t *app_worker_get_if_valid (u32 wrk_index); +application_t *app_worker_get_app (u32 wrk_index); +int app_worker_own_session (app_worker_t * app_wrk, session_t * s); +void app_worker_free (app_worker_t * app_wrk); +int app_worker_connect_session (app_worker_t * app, session_endpoint_t * tep, + u32 api_context); +int app_worker_start_listen (app_worker_t * app_wrk, app_listener_t * lstnr); +int app_worker_stop_listen (app_worker_t * app_wrk, app_listener_t * al); +int app_worker_init_accepted (session_t * s); +int app_worker_accept_notify (app_worker_t * app_wrk, session_t * s); +int app_worker_init_connected (app_worker_t * app_wrk, session_t * s); +int app_worker_connect_notify (app_worker_t * app_wrk, session_t * s, + u32 opaque); +segment_manager_t *app_worker_get_listen_segment_manager (app_worker_t *, + session_t *); +segment_manager_t *app_worker_get_connect_segment_manager (app_worker_t *); +segment_manager_t + * app_worker_get_or_alloc_connect_segment_manager (app_worker_t *); +int app_worker_alloc_connects_segment_manager (app_worker_t * app); +int app_worker_add_segment_notify (app_worker_t * app_wrk, + u64 segment_handle); +int app_worker_del_segment_notify (app_worker_t * app_wrk, + u64 segment_handle); +u32 app_worker_n_listeners (app_worker_t * app); +session_t *app_worker_first_listener (app_worker_t * app, + u8 fib_proto, u8 transport_proto); +int app_worker_send_event (app_worker_t * app, session_t * s, u8 evt); +int app_worker_lock_and_send_event (app_worker_t * app, session_t * s, + u8 evt_type); +session_t *app_worker_proxy_listener (app_worker_t * app, u8 fib_proto, + u8 transport_proto); +u8 *format_app_worker (u8 * s, va_list * args); +u8 *format_app_worker_listener (u8 * s, va_list * args); +void app_worker_format_connects (app_worker_t * app_wrk, int verbose); +int vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a); uword unformat_application_proto (unformat_input_t * input, va_list * args);