diff options
| author |   Dave Barach <dbarach@cisco.com> | 2018-05-03 08:26:39 -0400 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-05-18 12:14:55 +0000 |
| commit | 01b2c23faecee4a60cccf8219bf37fa588009b8d (patch) | |
| tree | f247c2ae2beec0a9770337511c8d187b64a5aac0 /src/vppinfra/pool.h | |
| parent | 6a4b97a6162994a5759ab1014fa2005439bb3ee3 (diff) | |
Harmonize vec/pool_get_aligned object sizes and alignment requests
Object sizes must evenly divide alignment requests, or vice
versa. Otherwise, only the first object will be aligned as
requested.
Three choices: add CLIB_CACHE_LINE_ALIGN_MARK(align_me) at
the end of structures, manually pad to an even divisor or multiple of
the alignment request, or use plain vectors/pools.
static assert for enforcement.
Change-Id: I41aa6ff1a58267301d32aaf4b9cd24678ac1c147
Signed-off-by: Dave Barach <dbarach@cisco.com>
Diffstat (limited to 'src/vppinfra/pool.h')
| -rw-r--r-- | src/vppinfra/pool.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h index 14c6a75c13b..8b39a914eb5 100644 --- a/src/vppinfra/pool.h +++ b/src/vppinfra/pool.h @@ -190,6 +190,8 @@ do { \ pool_header_t * _pool_var (p) = pool_header (P); \ uword _pool_var (l); \ \ + STATIC_ASSERT(A==0 || ((A % sizeof(P[0]))==0) || ((sizeof(P[0]) % A) == 0), \ + "Pool aligned alloc of incorrectly sized object"); \ _pool_var (l) = 0; \ if (P) \ _pool_var (l) = vec_len (_pool_var (p)->free_indices); \ |