diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-02-06 19:16:21 +0100 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-02-16 17:50:48 +0000 |
| commit | ce8debfe0faaea959aed846f83a0e1ade5f5acd2 (patch) | |
| tree | cda052cd0757e402e2c9f12930b2149848aa869e | |
| parent | d0386374d6759a3f056a604060140acd7c66926f (diff) | |
Increase number of per-cpu mheaps to 256
It also includes check to ensure that number of
per-cpu mheaps is not lower than number of cpus.
Change-Id: Ibc68b34dda130f922243f9ea15b03e44bbcac269
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | vlib/vlib/threads.h | 4 | ||||
| -rw-r--r-- | vppinfra/vppinfra/mem.h | 4 | ||||
| -rw-r--r-- | vppinfra/vppinfra/mem_mheap.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/vlib/vlib/threads.h b/vlib/vlib/threads.h index 98f19c442e3..6c16878a5b5 100644 --- a/vlib/vlib/threads.h +++ b/vlib/vlib/threads.h @@ -50,6 +50,10 @@ typedef struct vlib_thread_registration_ { #define VLIB_MAX_CPUS 256 +#if VLIB_MAX_CPUS > CLIB_MAX_MHEAPS +#error Please increase number of per-cpu mheaps +#endif + #define VLIB_CPU_MASK (VLIB_MAX_CPUS - 1) /* 0x3f, max */ #define VLIB_OFFSET_MASK (~VLIB_CPU_MASK) diff --git a/vppinfra/vppinfra/mem.h b/vppinfra/vppinfra/mem.h index 938f2d23502..301bcdd0d32 100644 --- a/vppinfra/vppinfra/mem.h +++ b/vppinfra/vppinfra/mem.h @@ -46,8 +46,10 @@ #include <vppinfra/string.h> /* memcpy, memset */ #include <vppinfra/valgrind.h> +#define CLIB_MAX_MHEAPS 256 + /* Per CPU heaps. */ -extern void * clib_per_cpu_mheaps[32]; +extern void * clib_per_cpu_mheaps[CLIB_MAX_MHEAPS]; always_inline void * clib_mem_get_per_cpu_heap (void) { diff --git a/vppinfra/vppinfra/mem_mheap.c b/vppinfra/vppinfra/mem_mheap.c index e25ae35b77a..5718c8ce618 100644 --- a/vppinfra/vppinfra/mem_mheap.c +++ b/vppinfra/vppinfra/mem_mheap.c @@ -50,7 +50,7 @@ clib_smp_main_t clib_smp_main = { .n_tls_4k_pages = 1, }; -void * clib_per_cpu_mheaps[32]; +void * clib_per_cpu_mheaps[CLIB_MAX_MHEAPS]; void clib_mem_exit (void) { |