Skip to content

Commit 6e81b00

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]>
1 parent 1e06936 commit 6e81b00

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));
@@ -263,8 +263,8 @@ mca_part_persist_progress(void)
263263

264264
err = opal_datatype_type_size(&(req->req_datatype->super), &dt_size_);
265265
if(OMPI_SUCCESS != err) return OMPI_ERROR;
266-
dt_size = (dt_size_ > (size_t) INT_MAX) ? MPI_UNDEFINED : (int) dt_size_;
267-
int32_t bytes = req->real_count * dt_size;
266+
dt_size = (dt_size_ > (size_t) UINT_MAX) ? MPI_UNDEFINED : (uint32_t) dt_size_;
267+
uint32_t bytes = req->real_count * dt_size;
268268

269269

270270

@@ -350,7 +350,7 @@ mca_part_persist_precv_init(void *buf,
350350
{
351351
int err = OMPI_SUCCESS;
352352
size_t dt_size_;
353-
int dt_size;
353+
uint32_t dt_size;
354354
mca_part_persist_list_t* new_progress_elem = NULL;
355355

356356
mca_part_persist_precv_request_t *recvreq;
@@ -382,7 +382,7 @@ mca_part_persist_precv_init(void *buf,
382382
/* Compute total number of bytes */
383383
err = opal_datatype_type_size(&(req->req_datatype->super), &dt_size_);
384384
if(OMPI_SUCCESS != err) return OMPI_ERROR;
385-
dt_size = (dt_size_ > (size_t) INT_MAX) ? MPI_UNDEFINED : (int) dt_size_;
385+
dt_size = (dt_size_ > (size_t) UINT_MAX) ? MPI_UNDEFINED : (uint32_t) dt_size_;
386386
req->req_bytes = parts * count * dt_size;
387387

388388
/* Set ompi request initial values */
@@ -417,7 +417,7 @@ mca_part_persist_psend_init(const void* buf,
417417
{
418418
int err = OMPI_SUCCESS;
419419
size_t dt_size_;
420-
int dt_size;
420+
uint32_t dt_size;
421421
mca_part_persist_list_t* new_progress_elem = NULL;
422422
mca_part_persist_psend_request_t *sendreq;
423423

@@ -442,7 +442,7 @@ mca_part_persist_psend_init(const void* buf,
442442
/* Determine total bytes to send. */
443443
err = opal_datatype_type_size(&(req->req_datatype->super), &dt_size_);
444444
if(OMPI_SUCCESS != err) return OMPI_ERROR;
445-
dt_size = (dt_size_ > (size_t) INT_MAX) ? MPI_UNDEFINED : (int) dt_size_;
445+
dt_size = (dt_size_ > (size_t) UINT_MAX) ? MPI_UNDEFINED : (uint32_t) dt_size_;
446446
req->req_bytes = parts * count * dt_size;
447447

448448
/* non-blocking send set-up data */
@@ -504,11 +504,11 @@ mca_part_persist_start(size_t count, ompi_request_t** requests)
504504
{
505505
if(MCA_PART_PERSIST_REQUEST_PSEND == req->req_type) {
506506
req->done_count = 0;
507-
memset((void*)req->flags,0,sizeof(int32_t)*req->real_parts);
507+
memset((void*)req->flags,0,sizeof(uint32_t)*req->real_parts);
508508
} else {
509509
req->done_count = 0;
510510
err = req->persist_reqs[0]->req_start(req->real_parts, req->persist_reqs);
511-
memset((void*)req->flags,0,sizeof(int32_t)*req->real_parts);
511+
memset((void*)req->flags,0,sizeof(uint32_t)*req->real_parts);
512512
}
513513
} else {
514514
if(MCA_PART_PERSIST_REQUEST_PSEND == req->req_type) {

0 commit comments

Comments
 (0)