X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication.h;h=e33f2ff797e2b98d0f4e71f318c631e77a7bc669;hp=9c68433d5e9c4620f63b0f5b19b81d36c523b280;hb=fa76a76;hpb=053a0e44edb21713e0825f9c09ba4af12e686b38

diff --git a/src/vnet/session/application.h b/src/vnet/session/application.h
index 9c68433d5e9..e33f2ff797e 100644
--- a/src/vnet/session/application.h
+++ b/src/vnet/session/application.h
@@ -31,11 +31,10 @@
 typedef struct _stream_session_cb_vft
 {
   /** Notify server of new segment */
-  int (*add_segment_callback) (u32 api_client_index,
-			       const ssvm_private_t * ssvm_seg);
+  int (*add_segment_callback) (u32 api_client_index, u64 segment_handle);
+
   /** Notify server of new segment */
-  int (*del_segment_callback) (u32 api_client_index,
-			       const ssvm_private_t * ssvm_seg);
+  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);
@@ -102,7 +101,7 @@ typedef struct app_worker_
   uword *local_connects;
 
   /** API index for the worker. Needed for multi-process apps */
-  u32 api_index;
+  u32 api_client_index;
 
   u8 app_is_builtin;
 } app_worker_t;
@@ -124,10 +123,6 @@ typedef struct application_
   /** App index in app pool */
   u32 app_index;
 
-  /** Binary API connection index of app process that created the app,
-   *  ~0 if internal */
-  u32 api_client_index;
-
   /** Flags */
   u32 flags;
 
@@ -213,9 +208,10 @@ typedef struct app_init_args_
 typedef struct _vnet_app_worker_add_del_args
 {
   u32 app_index;		/**< App for which a new worker is requested */
-  u32 wrk_index;		/**< Index to delete or return value if add */
-  u32 api_index;		/**< Binary API client index */
+  u32 wrk_map_index;		/**< Index to delete or return value if add */
+  u32 api_client_index;		/**< Binary API client index */
   ssvm_private_t *segment;	/**< First segment in segment manager */
+  u64 segment_handle;		/**< Handle for the segment */
   svm_msg_q_t *evt_q;		/**< Worker message queue */
   u8 is_add;			/**< Flag set if addition */
 } vnet_app_worker_add_del_args_t;
@@ -236,7 +232,7 @@ 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, ssvm_private_t * fs);
+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,
@@ -261,14 +257,11 @@ 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);
-u32 application_index (application_t * app);
 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);
 
-int application_api_queue_is_full (application_t * app);
-
 int application_is_proxy (application_t * app);
 int application_is_builtin (application_t * app);
 int application_is_builtin_proxy (application_t * app);