X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_event.h;h=21884665075d9ec019ccd39759b9782f150db5fb;hb=410bcca41c1a3e7c3d4b4c2940120f9b21732d49;hp=a2e247e8d7ccee8f4def3552aa569d0381f95423;hpb=7cf80e08b61c7c48ab834af23b3c7761634e63d2;p=vpp.git

diff --git a/src/vcl/vcl_event.h b/src/vcl/vcl_event.h
index a2e247e8d7c..21884665075 100644
--- a/src/vcl/vcl_event.h
+++ b/src/vcl/vcl_event.h
@@ -39,8 +39,8 @@ typedef union vce_event_key_
 typedef struct vce_event_
 {
   vce_event_key_t evk;
-  u32 refcnt;
-  void *data;
+  u32 recycle;
+  u64 data[2]; // Hard code size to avoid allocator thrashing.
 } vce_event_t;
 
 typedef void (*vce_event_callback_t) (void *reg /*vce_event_handler_reg_t* */);
@@ -53,6 +53,7 @@ typedef struct vce_event_handler_reg_
   u32 ev_idx;
   u64 evk; //Event key
   u32 replaced_handler_idx;
+  void *handler_fn_args;
 } vce_event_handler_reg_t;
 
 typedef struct vce_event_thread_
@@ -86,9 +87,9 @@ int vce_generate_event (vce_event_thread_t *evt, u32 ev_idx);
  * - removes event from event_pool
  *
  * @param evt - vce_event_thread_t - event system state
- * @param ev  - vce_event_t - event to remove
+ * @param ev_idx  - u32 - index of event to remove
  */
-void vce_clear_event (vce_event_thread_t *evt, vce_event_t *ev);
+void vce_clear_event (vce_event_thread_t *evt, u32 ev_idx);
 
 /**
  * @brief vce_get_event_from_index()
@@ -100,6 +101,20 @@ void vce_clear_event (vce_event_thread_t *evt, vce_event_t *ev);
  */
 vce_event_t * vce_get_event_from_index(vce_event_thread_t *evt, u32 ev_idx);
 
+/**
+ * @brief vce_get_event_data()
+ *
+ * @param ev - vce_event_t * - event
+ * @param data_size - u32 - required size of data
+ *
+ * @return vce_event_t *
+ */
+always_inline void * vce_get_event_data(vce_event_t *ev, u32 data_size)
+{
+	ASSERT(sizeof(ev->data) >= data_size);
+	return (&ev->data);
+}
+
 /**
  * @brief vce_get_event_handler()
  * - returns handler if exists or 0
@@ -121,12 +136,14 @@ vce_event_handler_reg_t * vce_get_event_handler (vce_event_thread_t *evt,
  * @param evk - vce_event_key_t current an eventID from enum in consumer and
  * 		sessionID
  * @param cb  - vce_event_callback_t function to handle event
+ * @param cb_args - args that the callback needs passed back to it.
  * @return vce_handler_reg_t - the function that needs event notification
  *   needs to block on a condvar mutex to reduce spin. That is in here.
  */
 vce_event_handler_reg_t * vce_register_handler (vce_event_thread_t *evt,
 						vce_event_key_t *evk,
-						vce_event_callback_t cb);
+						vce_event_callback_t cb,
+						void *cb_args);
 
 /**
  * @brief vce_unregister_handler