diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-11-01 15:16:30 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-11-01 16:19:13 +0000 |
| commit | 3b906b0d9b93a892831ce4d54d1d7ec3956ce2b4 (patch) | |
| tree | f1314662dced3e94524e3d5aa203fe8b02cbe84a /vnet | |
| parent | a0bc391daf1ded0c0d512cade822675d2bd32a36 (diff) | |
vppinfra: add STATIC_ASSERT macro
Change-Id: Icc4e74ae1627c5b97746ed64955a3dc089e3998f
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet')
| -rw-r--r-- | vnet/vnet/devices/dpdk/init.c | 13 | ||||
| -rw-r--r-- | vnet/vnet/ip/lookup.c | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index c57fcde3543..01bd27db35d 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -1707,10 +1707,15 @@ dpdk_init (vlib_main_t * vm) vlib_thread_main_t *tm = vlib_get_thread_main (); /* verify that structs are cacheline aligned */ - ASSERT (offsetof (dpdk_device_t, cacheline0) == 0); - ASSERT (offsetof (dpdk_device_t, cacheline1) == CLIB_CACHE_LINE_BYTES); - ASSERT (offsetof (dpdk_worker_t, cacheline0) == 0); - ASSERT (offsetof (frame_queue_trace_t, cacheline0) == 0); + STATIC_ASSERT (offsetof (dpdk_device_t, cacheline0) == 0, + "Cache line marker must be 1st element in dpdk_device_t"); + STATIC_ASSERT (offsetof (dpdk_device_t, cacheline1) == + CLIB_CACHE_LINE_BYTES, + "Data in cache line 0 is bigger than cache line size"); + STATIC_ASSERT (offsetof (dpdk_worker_t, cacheline0) == 0, + "Cache line marker must be 1st element in dpdk_worker_t"); + STATIC_ASSERT (offsetof (frame_queue_trace_t, cacheline0) == 0, + "Cache line marker must be 1st element in frame_queue_trace_t"); dm->vlib_main = vm; dm->vnet_main = vnet_get_main (); diff --git a/vnet/vnet/ip/lookup.c b/vnet/vnet/ip/lookup.c index 4ddbb54279e..511a5cc83ec 100644 --- a/vnet/vnet/ip/lookup.c +++ b/vnet/vnet/ip/lookup.c @@ -165,8 +165,10 @@ ip_interface_address_add_del (ip_lookup_main_t * lm, void ip_lookup_init (ip_lookup_main_t * lm, u32 is_ip6) { /* ensure that adjacency is cacheline aligned and sized */ - ASSERT(STRUCT_OFFSET_OF(ip_adjacency_t, cacheline0) == 0); - ASSERT(STRUCT_OFFSET_OF(ip_adjacency_t, cacheline1) == CLIB_CACHE_LINE_BYTES); + STATIC_ASSERT(STRUCT_OFFSET_OF(ip_adjacency_t, cacheline0) == 0, + "Cache line marker must be 1st element in struct"); + STATIC_ASSERT(STRUCT_OFFSET_OF(ip_adjacency_t, cacheline1) == CLIB_CACHE_LINE_BYTES, + "Data in cache line 0 is bigger than cache line size"); /* Preallocate three "special" adjacencies */ lm->adjacency_heap = adj_pool; |