summaryrefslogtreecommitdiffstats
path: root/src/vppinfra/mem.h
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-05-10 21:06:28 +0200
committerDave Barach <openvpp@barachs.net>2017-05-10 22:01:15 +0000
commitf55f9b851f59264d737d92c6277a87588c565d24 (patch)
tree4e1c69bed3ff6b0968b9558a814a23edac4f9ae6 /src/vppinfra/mem.h
parente5f1d27695e2e6b9be17198e9b49e95639a15c58 (diff)
completelly deprecate os_get_cpu_number, replace new occurences
Change-Id: I82c663bc0866c6c68ba354104b0bb059387f4b9d Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vppinfra/mem.h')
-rw-r--r--src/vppinfra/mem.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vppinfra/mem.h b/src/vppinfra/mem.h
index 1260eab28c0..63c5ac16a02 100644
--- a/src/vppinfra/mem.h
+++ b/src/vppinfra/mem.h
@@ -54,14 +54,14 @@ extern void *clib_per_cpu_mheaps[CLIB_MAX_MHEAPS];
always_inline void *
clib_mem_get_per_cpu_heap (void)
{
- int cpu = os_get_cpu_number ();
+ int cpu = os_get_thread_index ();
return clib_per_cpu_mheaps[cpu];
}
always_inline void *
clib_mem_set_per_cpu_heap (u8 * new_heap)
{
- int cpu = os_get_cpu_number ();
+ int cpu = os_get_thread_index ();
void *old = clib_per_cpu_mheaps[cpu];
clib_per_cpu_mheaps[cpu] = new_heap;
return old;
@@ -83,7 +83,7 @@ clib_mem_alloc_aligned_at_offset (uword size, uword align, uword align_offset,
align_offset = align;
}
- cpu = os_get_cpu_number ();
+ cpu = os_get_thread_index ();
heap = clib_per_cpu_mheaps[cpu];
heap = mheap_get_aligned (heap, size, align, align_offset, &offset);
clib_per_cpu_mheaps[cpu] = heap;