X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_common.h;h=2105f1bd430b475ff3fbcf0f7a4f005be45f33bd;hb=ffdc72da4f086e9a62b946970778495bba400e69;hp=94320826f3dcaf09f4a6220b37c1ac390ac6b585;hpb=c470e22f12a68f06990f57f12f551fee50b6bb0d;p=vpp.git diff --git a/src/vlibapi/api_common.h b/src/vlibapi/api_common.h index 94320826f3d..2105f1bd430 100644 --- a/src/vlibapi/api_common.h +++ b/src/vlibapi/api_common.h @@ -25,6 +25,8 @@ */ #include +#include +#include #include #include @@ -64,7 +66,7 @@ typedef struct vl_api_registration_ u32 clib_file_index; /**< Socket only: file index */ i8 *unprocessed_input; /**< Socket only: pending input */ u32 unprocessed_msg_length; /**< Socket only: unprocssed length */ - u8 *output_vector; /**< Socket only: output vecto */ + u8 *output_vector; /**< Socket only: output vector */ int *additional_fds_to_close; /* socket client only */ @@ -140,6 +142,26 @@ typedef struct msgbuf_ u8 data[0]; /**< actual message begins here */ } msgbuf_t; +CLIB_NOSANITIZE_ADDR static inline void +VL_MSG_API_UNPOISON (const void *a) +{ + const msgbuf_t *m = &((const msgbuf_t *) a)[-1]; + CLIB_MEM_UNPOISON (m, sizeof (*m) + ntohl (m->data_len)); +} + +CLIB_NOSANITIZE_ADDR static inline void +VL_MSG_API_SVM_QUEUE_UNPOISON (const svm_queue_t * q) +{ + CLIB_MEM_UNPOISON (q, sizeof (*q) + q->elsize * q->maxsize); +} + +static inline void +VL_MSG_API_POISON (const void *a) +{ + const msgbuf_t *m = &((const msgbuf_t *) a)[-1]; + CLIB_MEM_POISON (m, sizeof (*m) + ntohl (m->data_len)); +} + /* api_shared.c prototypes */ void vl_msg_api_handler (void *the_msg); void vl_msg_api_handler_no_free (void *the_msg); @@ -179,7 +201,9 @@ void vl_msg_api_set_first_available_msg_id (u16 first_avail); u16 vl_msg_api_get_msg_ids (const char *name, int n); u32 vl_msg_api_get_msg_index (u8 * name_and_crc); void *vl_msg_push_heap (void); +void *vl_msg_push_heap_w_region (svm_region_t * vlib_rp); void vl_msg_pop_heap (void *oldheap); +void vl_msg_pop_heap_w_region (svm_region_t * vlib_rp, void *oldheap); typedef clib_error_t *(vl_msg_api_init_function_t) (u32 client_index); @@ -338,9 +362,29 @@ typedef struct /** List of API client reaper functions */ _vl_msg_api_function_list_elt_t *reaper_function_registrations; + /** Bin API thread handle */ + pthread_t rx_thread_handle; + + /** event log */ + elog_main_t *elog_main; + int elog_trace_api_messages; + } api_main_t; -extern api_main_t api_main; +extern __thread api_main_t *my_api_main; +extern api_main_t api_global_main; + +always_inline api_main_t * +vlibapi_get_main (void) +{ + return my_api_main; +} + +always_inline void +vlibapi_set_main (api_main_t * am) +{ + my_api_main = am; +} #endif /* included_api_common_h */