Skip to content

Commit f4a212f

Browse files
authored
Merge pull request #11525 from rzambre/hotfix/shmem_init_segfault
oshmem: Use the right datatype for PMIX_DATA_BUFFER_UNLOAD
2 parents 241181b + 974f0c3 commit f4a212f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

oshmem/mca/memheap/base/memheap_base_mkey.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,14 +445,14 @@ void memheap_oob_destruct(void)
445445
static int send_buffer(int pe, pmix_data_buffer_t *msg)
446446
{
447447
void *buffer;
448-
int32_t size;
448+
size_t size;
449449
int rc;
450450

451451
PMIX_DATA_BUFFER_UNLOAD(msg, buffer, size);
452452
rc = PMPI_Send(buffer, size, MPI_BYTE, pe, 0, oshmem_comm_world);
453453
free(buffer);
454454

455-
MEMHEAP_VERBOSE(5, "message sent: dst=%d, rc=%d, %d bytes!", pe, rc, size);
455+
MEMHEAP_VERBOSE(5, "message sent: dst=%d, rc=%d, %" PRIsize_t " bytes!", pe, rc, size);
456456
return rc;
457457
}
458458

@@ -523,7 +523,7 @@ void mca_memheap_modex_recv_all(void)
523523
pmix_data_buffer_t *msg = NULL;
524524
void *send_buffer = NULL;
525525
char *rcv_buffer = NULL;
526-
int size;
526+
size_t size;
527527
int *rcv_size = NULL;
528528
int *rcv_n_transports = NULL;
529529
int *rcv_offsets = NULL;
@@ -584,7 +584,7 @@ void mca_memheap_modex_recv_all(void)
584584

585585
/* Do allgather */
586586
PMIX_DATA_BUFFER_UNLOAD(msg, send_buffer, size);
587-
MEMHEAP_VERBOSE(1, "local keys packed into %d bytes, %d segments", size, memheap_map->n_segments);
587+
MEMHEAP_VERBOSE(1, "local keys packed into %d bytes, %" PRIsize_t " segments", size, memheap_map->n_segments);
588588

589589
OPAL_TIMING_ENV_NEXT(recv_all, "serialize data");
590590

0 commit comments

Comments
 (0)