diff options
| author |   Dave Barach <dave@barachs.net> | 2016-11-10 14:22:49 -0500 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-11-21 18:11:41 +0000 |
| commit | 557d128b68a1213e056f5eed9fe6f230ca3f3144 (patch) | |
| tree | 6b31ac462efacf3f6937788c9b7af1420497c9fc /vlib-api/vlibapi/api.h | |
| parent | fca670b0ec9f74aa977fe479a5517ad6367ee898 (diff) | |
Add client-side msg_name_and_crc -> msg_index table
vppapigen now generates per-message crcs. Verified that whitespace
and real changes in message A don't change the crc for message B, etc.
Fixed the sample and flowperpkt plugins to participate. Others need
the same treatment. They don't build due to python/java language binding
build issues.
To use the scheme:
Client connects as usual.
Then call: u32 vl_api_get_msg_index(char * name_and_crc)
name_and_crc is a string like: "flowperpkt_tx_interface_add_del_753301f3",
aka the message name with _%08x <expected crc> appended.
Try these vpp-api-test commands to play with it:
vat# dump_msg_api_table
<snip>
[366]: punt_reply_cca27fbe
[367]: ipsec_spd_dump_5e9ae88e
[368]: ipsec_spd_details_6f7821b0
[369]: sample_macswap_enable_disable_0f2813e2
[370]: sample_macswap_enable_disable_reply_476738e5
[371]: flowperpkt_tx_interface_add_del_753301f3
[372]: flowperpkt_tx_interface_add_del_reply_d47e6e0b
vat# get_msg_id sample_macswap_enable_disable_reply_476738e5
'sample_macswap_enable_disable_reply_476738e5' has message index 370
vat# get_msg_id sample_macswap_enable_disable_reply_476738e3
'sample_macswap_enable_disable_reply_476738e3' not found
CRCs may vary, etc.
vppapigen is used to build a set of JSON representations
of each API file from vpp-api/Makefile.am and that is in
turn used by each language binding (Java, Python, Lua).
Change-Id: I3d64582e779dac5f20cddec79c562c288d8fd9c6
Signed-off-by: Dave Barach <dave@barachs.net>
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'vlib-api/vlibapi/api.h')
| -rw-r--r-- | vlib-api/vlibapi/api.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/vlib-api/vlibapi/api.h b/vlib-api/vlibapi/api.h index a932bf42177..10ca443b434 100644 --- a/vlib-api/vlibapi/api.h +++ b/vlib-api/vlibapi/api.h @@ -87,11 +87,14 @@ typedef struct u8 **traces; } vl_api_trace_t; -typedef CLIB_PACKED (struct - { - u8 endian; u8 wrapped; - u32 nitems; - }) vl_api_trace_file_header_t; +/* *INDENT-OFF* */ +typedef CLIB_PACKED +(struct + { + u8 endian; u8 wrapped; + u32 nitems; +}) vl_api_trace_file_header_t; +/* *INDENT-ON* */ typedef enum { @@ -132,6 +135,8 @@ typedef struct struct vl_shmem_hdr_ *shmem_hdr; vl_api_registration_t **vl_clients; + u8 *serialized_message_table_in_shmem; + /* For plugin msg allocator */ u16 first_available_msg_id; @@ -178,6 +183,9 @@ typedef struct i32 vlib_signal; + /* client side message index hash table */ + uword *msg_index_by_name_and_crc; + char *region_name; char *root_path; } api_main_t; @@ -188,6 +196,7 @@ typedef struct { int id; char *name; + u32 crc; void *handler; void *cleanup; void *endian; @@ -242,6 +251,8 @@ int vl_msg_api_pd_handler (void *mp, int rv); void vl_msg_api_set_first_available_msg_id (u16 first_avail); u16 vl_msg_api_get_msg_ids (char *name, int n); +void vl_msg_api_add_msg_name_crc (api_main_t * am, char *string, u32 id); +u32 vl_api_get_msg_index (u8 * name_and_crc); /* node_serialize.c prototypes */ u8 *vlib_node_serialize (vlib_node_main_t * nm, u8 * vector, |