From 3111877ad9796f49fe54c1f5b0fe7220946f07b9 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Mon, 13 Jul 2020 08:18:48 +0200 Subject: [PATCH] oshmem/mca/sshmem: Fix build with `--enable-mem-debug` `--enable-mem-debug` `#define`s `realloc`/`free` as macros, though macros are also matched if they appear in references to members. Rename the members to avoid this matching. See #6995 Signed-off-by: Bert Wesarg --- oshmem/mca/memheap/base/memheap_base_alloc.c | 2 +- oshmem/mca/sshmem/sshmem_types.h | 4 ++-- oshmem/mca/sshmem/ucx/sshmem_ucx_module.c | 4 ++-- oshmem/shmem/c/shmem_free.c | 2 +- oshmem/shmem/c/shmem_realloc.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/oshmem/mca/memheap/base/memheap_base_alloc.c b/oshmem/mca/memheap/base/memheap_base_alloc.c index 6b0f9c6caa..3354a187de 100644 --- a/oshmem/mca/memheap/base/memheap_base_alloc.c +++ b/oshmem/mca/memheap/base/memheap_base_alloc.c @@ -84,7 +84,7 @@ int mca_memheap_alloc_with_hint(size_t size, long hint, void** ptr) /* Do not fall back to default allocator since it will break the * symmetry between PEs */ - return s->allocator->realloc(s, size, NULL, ptr); + return s->allocator->sa_realloc(s, size, NULL, ptr); } } diff --git a/oshmem/mca/sshmem/sshmem_types.h b/oshmem/mca/sshmem/sshmem_types.h index 4e1d937901..ac0c139c64 100644 --- a/oshmem/mca/sshmem/sshmem_types.h +++ b/oshmem/mca/sshmem/sshmem_types.h @@ -124,8 +124,8 @@ typedef struct map_segment { } map_segment_t; struct segment_allocator { - int (*realloc)(map_segment_t*, size_t newsize, void *, void **); - int (*free)(map_segment_t*, void*); + int (*sa_realloc)(map_segment_t*, size_t newsize, void *, void **); + int (*sa_free)(map_segment_t*, void*); }; END_C_DECLS diff --git a/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c b/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c index e108cd55ad..fa38d0693a 100644 --- a/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c +++ b/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c @@ -98,8 +98,8 @@ module_finalize(void) /* ////////////////////////////////////////////////////////////////////////// */ static segment_allocator_t sshmem_ucx_allocator = { - .realloc = sshmem_ucx_memheap_realloc, - .free = sshmem_ucx_memheap_free + .sa_realloc = sshmem_ucx_memheap_realloc, + .sa_free = sshmem_ucx_memheap_free }; static int diff --git a/oshmem/shmem/c/shmem_free.c b/oshmem/shmem/c/shmem_free.c index eebdd537ab..22da004589 100644 --- a/oshmem/shmem/c/shmem_free.c +++ b/oshmem/shmem/c/shmem_free.c @@ -62,7 +62,7 @@ static inline void _shfree(void* ptr) } if (s && s->allocator) { - rc = s->allocator->free(s, ptr); + rc = s->allocator->sa_free(s, ptr); } else { rc = MCA_MEMHEAP_CALL(free(ptr)); } diff --git a/oshmem/shmem/c/shmem_realloc.c b/oshmem/shmem/c/shmem_realloc.c index 7aab27735f..a37ae7e6c4 100644 --- a/oshmem/shmem/c/shmem_realloc.c +++ b/oshmem/shmem/c/shmem_realloc.c @@ -56,7 +56,7 @@ static inline void* _shrealloc(void *ptr, size_t size) } if (s && s->allocator) { - rc = s->allocator->realloc(s, size, ptr, &pBuff); + rc = s->allocator->sa_realloc(s, size, ptr, &pBuff); } else { rc = MCA_MEMHEAP_CALL(realloc(size, ptr, &pBuff)); }