Skip to content

Commit 3d9b62e

Browse files
mdosanjhjsquyres
authored andcommitted
part_persist: fix sign comparison
Without this fix, gcc 14's static analyzer complains about the signedness of some comparisons. Signed-off-by: Matthew G. F. Dosanjh <[email protected]> Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit 6e81b00)
1 parent 3e2da6e commit 3d9b62e

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

ompi/mca/part/persist/part_persist.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,16 @@ mca_part_persist_progress(void)
234234

235235
if(done) {
236236
size_t dt_size_;
237-
int32_t dt_size;
237+
uint32_t dt_size;
238238

239239
if(MCA_PART_PERSIST_REQUEST_PSEND == req->req_type) {
240240
/* parse message */
241241
req->world_peer = req->setup_info[1].world_rank;
242242

243243
err = opal_datatype_type_size(&(req->req_datatype->super), &dt_size_);
244244
if(OMPI_SUCCESS != err) return OMPI_ERROR;
245-
dt_size = (dt_size_ > (size_t) INT_MAX) ? MPI_UNDEFINED : (int) dt_size_;
246-
int32_t bytes = req->real_count * dt_size;
245+
dt_size = (dt_size_ > (size_t) UINT_MAX) ? MPI_UNDEFINED : (uint32_t) dt_size_;
246+
uint32_t bytes = req->real_count * dt_size;
247247

248248
/* Set up persistent sends */
249249
req->persist_reqs = (ompi_request_t**) malloc(sizeof(ompi_request_t*)*(req->real_parts));
@@ -261,8 +261,8 @@ mca_part_persist_progress(void)
261261

262262
err = opal_datatype_type_size(&(req->req_datatype->super), &dt_size_);
263263
if(OMPI_SUCCESS != err) return OMPI_ERROR;
264-
dt_size = (dt_size_ > (size_t) INT_MAX) ? MPI_UNDEFINED : (int) dt_size_;
265-
int32_t bytes = req->real_count * dt_size;
264+
dt_size = (dt_size_ > (size_t) UINT_MAX) ? MPI_UNDEFINED : (uint32_t) dt_size_;
265+
uint32_t bytes = req->real_count * dt_size;
266266

267267
/* Set up persistent sends */
268268
req->persist_reqs = (ompi_request_t**) malloc(sizeof(ompi_request_t*)*(req->real_parts));
@@ -337,7 +337,7 @@ mca_part_persist_precv_init(void *buf,
337337
{
338338
int err = OMPI_SUCCESS;
339339
size_t dt_size_;
340-
int dt_size;
340+
uint32_t dt_size;
341341
mca_part_persist_list_t* new_progress_elem = NULL;
342342

343343
mca_part_persist_precv_request_t *recvreq;
@@ -369,7 +369,7 @@ mca_part_persist_precv_init(void *buf,
369369
/* Compute total number of bytes */
370370
err = opal_datatype_type_size(&(req->req_datatype->super), &dt_size_);
371371
if(OMPI_SUCCESS != err) return OMPI_ERROR;
372-
dt_size = (dt_size_ > (size_t) INT_MAX) ? MPI_UNDEFINED : (int) dt_size_;
372+
dt_size = (dt_size_ > (size_t) UINT_MAX) ? MPI_UNDEFINED : (uint32_t) dt_size_;
373373
req->req_bytes = parts * count * dt_size;
374374

375375

@@ -405,7 +405,7 @@ mca_part_persist_psend_init(const void* buf,
405405
{
406406
int err = OMPI_SUCCESS;
407407
size_t dt_size_;
408-
int dt_size;
408+
uint32_t dt_size;
409409
mca_part_persist_list_t* new_progress_elem = NULL;
410410
mca_part_persist_psend_request_t *sendreq;
411411

@@ -430,7 +430,7 @@ mca_part_persist_psend_init(const void* buf,
430430
/* Determine total bytes to send. */
431431
err = opal_datatype_type_size(&(req->req_datatype->super), &dt_size_);
432432
if(OMPI_SUCCESS != err) return OMPI_ERROR;
433-
dt_size = (dt_size_ > (size_t) INT_MAX) ? MPI_UNDEFINED : (int) dt_size_;
433+
dt_size = (dt_size_ > (size_t) UINT_MAX) ? MPI_UNDEFINED : (uint32_t) dt_size_;
434434
req->req_bytes = parts * count * dt_size;
435435

436436

@@ -494,11 +494,11 @@ mca_part_persist_start(size_t count, ompi_request_t** requests)
494494
{
495495
if(MCA_PART_PERSIST_REQUEST_PSEND == req->req_type) {
496496
req->done_count = 0;
497-
memset((void*)req->flags,0,sizeof(int32_t)*req->real_parts);
497+
memset((void*)req->flags,0,sizeof(uint32_t)*req->real_parts);
498498
} else {
499499
req->done_count = 0;
500500
err = req->persist_reqs[0]->req_start(req->real_parts, req->persist_reqs);
501-
memset((void*)req->flags,0,sizeof(int32_t)*req->real_parts);
501+
memset((void*)req->flags,0,sizeof(uint32_t)*req->real_parts);
502502
}
503503
} else {
504504
if(MCA_PART_PERSIST_REQUEST_PSEND == req->req_type) {

0 commit comments

Comments
 (0)