#include <vppinfra/clib.h> /* uword, etc */
#include <vppinfra/clib_error.h>
-#if USE_DLMALLOC == 0
-#include <vppinfra/mheap_bootstrap.h>
-#else
#include <vppinfra/dlmalloc.h>
-#endif
#include <vppinfra/os.h>
#include <vppinfra/string.h> /* memcpy, clib_memset */
always_inline void *
clib_mem_get_per_numa_heap (u32 numa_id)
{
- ASSERT (numa_id >= 0 && numa_id < ARRAY_LEN (clib_per_numa_mheaps));
+ ASSERT (numa_id < ARRAY_LEN (clib_per_numa_mheaps));
return clib_per_numa_mheaps[numa_id];
}
always_inline uword
clib_mem_size_nocheck (void *p)
{
-#if USE_DLMALLOC == 0
- mheap_elt_t *e = mheap_user_pointer_to_elt (p);
- return mheap_elt_data_bytes (e);
-#else
return mspace_usable_size_with_delta (p);
-#endif
}
/* Memory allocator which may call os_out_of_memory() if it fails */
cpu = os_get_thread_index ();
heap = clib_per_cpu_mheaps[cpu];
-#if USE_DLMALLOC == 0
- uword offset;
- heap = mheap_get_aligned (heap, size, align, align_offset, &offset);
- clib_per_cpu_mheaps[cpu] = heap;
- if (PREDICT_TRUE (offset != ~0))
- p = heap + offset;
-#else
p = mspace_get_aligned (heap, size, align, align_offset);
-#endif /* USE_DLMALLOC */
if (PREDICT_FALSE (0 == p))
{
always_inline uword
clib_mem_is_heap_object (void *p)
{
-#if USE_DLMALLOC == 0
- void *heap = clib_mem_get_per_cpu_heap ();
- uword offset = (uword) p - (uword) heap;
- mheap_elt_t *e, *n;
-
- if (offset >= vec_len (heap))
- return 0;
-
- e = mheap_elt_at_uoffset (heap, offset);
- n = mheap_next_elt (e);
-
- /* Check that heap forward and reverse pointers agree. */
- return e->n_user_data == n->prev_n_user_data;
-#else
void *heap = clib_mem_get_per_cpu_heap ();
return mspace_is_heap_object (heap, p);
-#endif /* USE_DLMALLOC */
}
always_inline void
CLIB_MEM_POISON (p, clib_mem_size_nocheck (p));
-#if USE_DLMALLOC == 0
- mheap_put (heap, (u8 *) p - heap);
-#else
mspace_put (heap, p);
-#endif
}
always_inline void *
int fd; /**< File descriptor to be mapped */
uword requested_va; /**< Request fixed position mapping */
void *addr; /**< Pointer to mapped memory, if successful */
+ u8 numa_node;
} clib_mem_vm_map_t;
clib_error_t *clib_mem_vm_ext_map (clib_mem_vm_map_t * a);