Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oshmem/mca/memheap/base/memheap_base_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions oshmem/mca/sshmem/sshmem_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions oshmem/mca/sshmem/ucx/sshmem_ucx_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion oshmem/shmem/c/shmem_free.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion oshmem/shmem/c/shmem_realloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down