X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_helper_macros.h;h=8064d67a14ef07744373fb4ea0715222a5f755f7;hb=78f487e11;hp=8fc0bd54c76b1f64adfd9a4abc7995dca7a0f570;hpb=bad679291a9dbc4d9274b1697f7ff41283deabd7;p=vpp.git diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h index 8fc0bd54c76..8064d67a14e 100644 --- a/src/vlibapi/api_helper_macros.h +++ b/src/vlibapi/api_helper_macros.h @@ -229,6 +229,35 @@ do { \ })); \ } while(0); +#define REPLY_AND_DETAILS_VEC_MACRO(t, v, mp, rmp, rv, body) \ +do { \ + vl_api_registration_t *rp; \ + rp = vl_api_client_index_to_registration (mp->client_index); \ + if (rp == 0) \ + return; \ + u32 cursor = clib_net_to_host_u32 (mp->cursor); \ + vlib_main_t *vm = vlib_get_main (); \ + f64 start = vlib_time_now (vm); \ + if (!v || vec_len (v) == 0) { \ + cursor = ~0; \ + rv = VNET_API_ERROR_INVALID_VALUE; \ + } else if (cursor == ~0) \ + cursor = 0; \ + while (cursor != ~0 && cursor < vec_len (v)) { \ + do {body;} while (0); \ + ++cursor; \ + if (vl_api_process_may_suspend (vm, rp, start)) { \ + if (cursor < vec_len (v)) \ + rv = VNET_API_ERROR_EAGAIN; \ + break; \ + } \ + } \ + REPLY_MACRO2 (t, ({ \ + rmp->cursor = clib_host_to_net_u32 (cursor); \ + })); \ +} while(0); + + /* "trust, but verify" */ static inline uword @@ -361,7 +390,8 @@ _(bfd_events) \ _(l2_arp_term_events) \ _(ip6_ra_events) \ _(dhcp6_pd_reply_events) \ -_(dhcp6_reply_events) +_(dhcp6_reply_events) \ +_(vrrp_vr_events) typedef struct {