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>
This commit is contained in:
Damjan Marion
2016-02-06 19:16:21 +01:00
committed by Gerrit Code Review
parent d0386374d6
commit ce8debfe0f
3 changed files with 8 additions and 2 deletions

View File

@ -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)

View File

@ -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)
{

View File

@ -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)
{