Skip to content

Commit 7d1befb

Browse files
tkordenbrocktkordenbrock
committed
portals4: use PtlHandleIsEqual() to compare handles
The Portals4 standard requires the use of PtlHandleIsEqual() instead of the (in)equality operatror, because a handle may be a compound data type that cannot be directly compared. Signed-off-by: Todd Kordenbrock <[email protected]> (cherry picked from commit 1d891d3)
1 parent 6747089 commit 7d1befb

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎ompi/mca/mtl/portals4/mtl_portals4_cancel.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ompi_mtl_portals4_cancel(struct mca_mtl_base_module_t* mtl,
4545
receive completion event... */
4646
ompi_mtl_portals4_progress();
4747

48-
if (PTL_INVALID_HANDLE != recvreq->me_h) {
48+
if (!PtlHandleIsEqual(recvreq->me_h, PTL_INVALID_HANDLE)) {
4949
ret = PtlMEUnlink(recvreq->me_h);
5050
if (PTL_OK == ret) {
5151
recvreq->super.super.ompi_req->req_status._cancelled = true;

‎ompi/mca/mtl/portals4/mtl_portals4_recv_short.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ ompi_mtl_portals4_recv_short_block_alloc(bool release_on_free)
162162
static int
163163
ompi_mtl_portals4_recv_short_block_free(ompi_mtl_portals4_recv_short_block_t *block)
164164
{
165-
if (PTL_INVALID_HANDLE != block->me_h) {
165+
if (!PtlHandleIsEqual(block->me_h, PTL_INVALID_HANDLE)) {
166166
PtlMEUnlink(block->me_h);
167167
block->me_h = PTL_INVALID_HANDLE;
168168
}

‎ompi/mca/osc/portals4/osc_portals4_comm.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ get_to_iovec(ompi_osc_portals4_module_t *module,
496496
ptrdiff_t length, origin_lb, target_lb, extent;
497497
ptl_md_t md;
498498

499-
if (module->origin_iovec_md_h != PTL_INVALID_HANDLE) {
499+
if (!PtlHandleIsEqual(module->origin_iovec_md_h,PTL_INVALID_HANDLE)) {
500500
PtlMDRelease(module->origin_iovec_md_h);
501501
free(module->origin_iovec_list);
502502
module->origin_iovec_md_h = PTL_INVALID_HANDLE;
@@ -583,7 +583,7 @@ atomic_get_to_iovec(ompi_osc_portals4_module_t *module,
583583
ptrdiff_t length, origin_lb, target_lb, extent;
584584
ptl_md_t md;
585585

586-
if (module->origin_iovec_md_h != PTL_INVALID_HANDLE) {
586+
if (!PtlHandleIsEqual(module->origin_iovec_md_h,PTL_INVALID_HANDLE)) {
587587
PtlMDRelease(module->origin_iovec_md_h);
588588
free(module->origin_iovec_list);
589589
module->origin_iovec_md_h = PTL_INVALID_HANDLE;
@@ -665,7 +665,7 @@ put_from_iovec(ompi_osc_portals4_module_t *module,
665665
ptrdiff_t length, origin_lb, target_lb, extent;
666666
ptl_md_t md;
667667

668-
if (module->origin_iovec_md_h != PTL_INVALID_HANDLE) {
668+
if (!PtlHandleIsEqual(module->origin_iovec_md_h,PTL_INVALID_HANDLE)) {
669669
PtlMDRelease(module->origin_iovec_md_h);
670670
free(module->origin_iovec_list);
671671
module->origin_iovec_md_h = PTL_INVALID_HANDLE;
@@ -754,7 +754,7 @@ atomic_put_from_iovec(ompi_osc_portals4_module_t *module,
754754
ptrdiff_t length, origin_lb, target_lb, extent;
755755
ptl_md_t md;
756756

757-
if (module->origin_iovec_md_h != PTL_INVALID_HANDLE) {
757+
if (!PtlHandleIsEqual(module->origin_iovec_md_h,PTL_INVALID_HANDLE)) {
758758
PtlMDRelease(module->origin_iovec_md_h);
759759
free(module->origin_iovec_list);
760760
module->origin_iovec_md_h = PTL_INVALID_HANDLE;
@@ -841,7 +841,7 @@ atomic_from_iovec(ompi_osc_portals4_module_t *module,
841841
ptl_op_t ptl_op;
842842
ptl_datatype_t ptl_dt;
843843

844-
if (module->origin_iovec_md_h != PTL_INVALID_HANDLE) {
844+
if (!PtlHandleIsEqual(module->origin_iovec_md_h,PTL_INVALID_HANDLE)) {
845845
PtlMDRelease(module->origin_iovec_md_h);
846846
free(module->origin_iovec_list);
847847
module->origin_iovec_md_h = PTL_INVALID_HANDLE;
@@ -940,7 +940,7 @@ swap_to_iovec(ompi_osc_portals4_module_t *module,
940940
ptl_md_t md;
941941
ptl_datatype_t ptl_dt;
942942

943-
if (module->result_iovec_md_h != PTL_INVALID_HANDLE) {
943+
if (!PtlHandleIsEqual(module->result_iovec_md_h,PTL_INVALID_HANDLE)) {
944944
PtlMDRelease(module->result_iovec_md_h);
945945
free(module->result_iovec_list);
946946
module->result_iovec_md_h = PTL_INVALID_HANDLE;
@@ -971,7 +971,7 @@ swap_to_iovec(ompi_osc_portals4_module_t *module,
971971
return ret;
972972
}
973973

974-
if (module->origin_iovec_md_h != PTL_INVALID_HANDLE) {
974+
if (!PtlHandleIsEqual(module->origin_iovec_md_h,PTL_INVALID_HANDLE)) {
975975
PtlMDRelease(module->origin_iovec_md_h);
976976
free(module->origin_iovec_list);
977977
module->origin_iovec_md_h = PTL_INVALID_HANDLE;
@@ -1066,7 +1066,7 @@ fetch_atomic_to_iovec(ompi_osc_portals4_module_t *module,
10661066
ptl_op_t ptl_op;
10671067
ptl_datatype_t ptl_dt;
10681068

1069-
if (module->result_iovec_md_h != PTL_INVALID_HANDLE) {
1069+
if (!PtlHandleIsEqual(module->result_iovec_md_h,PTL_INVALID_HANDLE)) {
10701070
PtlMDRelease(module->result_iovec_md_h);
10711071
free(module->result_iovec_list);
10721072
module->result_iovec_md_h = PTL_INVALID_HANDLE;
@@ -1097,7 +1097,7 @@ fetch_atomic_to_iovec(ompi_osc_portals4_module_t *module,
10971097
return ret;
10981098
}
10991099

1100-
if (module->origin_iovec_md_h != PTL_INVALID_HANDLE) {
1100+
if (!PtlHandleIsEqual(module->origin_iovec_md_h,PTL_INVALID_HANDLE)) {
11011101
PtlMDRelease(module->origin_iovec_md_h);
11021102
free(module->origin_iovec_list);
11031103
module->origin_iovec_md_h = PTL_INVALID_HANDLE;

‎ompi/mca/osc/portals4/osc_portals4_component.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -615,10 +615,10 @@ component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit
615615

616616
error:
617617
/* BWB: FIX ME: This is all wrong... */
618-
if (0 != module->ct_h) PtlCTFree(module->ct_h);
619-
if (0 != module->data_me_h) PtlMEUnlink(module->data_me_h);
620-
if (0 != module->req_md_h) PtlMDRelease(module->req_md_h);
621-
if (0 != module->md_h) PtlMDRelease(module->md_h);
618+
if (!PtlHandleIsEqual(module->ct_h, PTL_INVALID_HANDLE)) PtlCTFree(module->ct_h);
619+
if (!PtlHandleIsEqual(module->data_me_h, PTL_INVALID_HANDLE)) PtlMEUnlink(module->data_me_h);
620+
if (!PtlHandleIsEqual(module->req_md_h, PTL_INVALID_HANDLE)) PtlMDRelease(module->req_md_h);
621+
if (!PtlHandleIsEqual(module->md_h, PTL_INVALID_HANDLE)) PtlMDRelease(module->md_h);
622622
if (NULL != module->comm) ompi_comm_free(&module->comm);
623623
if (NULL != module) free(module);
624624

@@ -655,11 +655,11 @@ ompi_osc_portals4_free(struct ompi_win_t *win)
655655
PtlMEUnlink(module->control_me_h);
656656
PtlMEUnlink(module->data_me_h);
657657
PtlMDRelease(module->md_h);
658-
if (module->origin_iovec_md_h != PTL_INVALID_HANDLE) {
658+
if (!PtlHandleIsEqual(module->origin_iovec_md_h,PTL_INVALID_HANDLE)) {
659659
PtlMDRelease(module->origin_iovec_md_h);
660660
free(module->origin_iovec_list);
661661
}
662-
if (module->result_iovec_md_h != PTL_INVALID_HANDLE) {
662+
if (!PtlHandleIsEqual(module->result_iovec_md_h,PTL_INVALID_HANDLE)) {
663663
PtlMDRelease(module->result_iovec_md_h);
664664
free(module->result_iovec_list);
665665
}

‎opal/mca/btl/portals4/btl_portals4.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,13 +487,13 @@ int mca_btl_portals4_free(struct mca_btl_base_module_t *btl_base, mca_btl_base_d
487487
OPAL_BTL_PORTALS4_FRAG_RETURN_EAGER(portals4_btl, frag);
488488

489489
} else if (BTL_PORTALS4_FRAG_TYPE_MAX == frag->type) {
490-
if (frag->me_h != PTL_INVALID_HANDLE) {
490+
if (!PtlHandleIsEqual(frag->me_h,PTL_INVALID_HANDLE)) {
491491
frag->me_h = PTL_INVALID_HANDLE;
492492
}
493493
OPAL_BTL_PORTALS4_FRAG_RETURN_MAX(portals4_btl, frag);
494494

495495
} else if (BTL_PORTALS4_FRAG_TYPE_USER == frag->type) {
496-
if (frag->me_h != PTL_INVALID_HANDLE) {
496+
if (!PtlHandleIsEqual(frag->me_h,PTL_INVALID_HANDLE)) {
497497
frag->me_h = PTL_INVALID_HANDLE;
498498
}
499499
OPAL_THREAD_ADD_FETCH32(&portals4_btl->portals_outstanding_ops, -1);

‎opal/mca/btl/portals4/btl_portals4_frag.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static void mca_btl_portals4_frag_eager_constructor(mca_btl_portals4_frag_t *fra
4545

4646
static void mca_btl_portals4_frag_eager_destructor(mca_btl_portals4_frag_t *frag)
4747
{
48-
if (PTL_INVALID_HANDLE != frag->me_h) {
48+
if (!PtlHandleIsEqual(frag->me_h, PTL_INVALID_HANDLE)) {
4949
PtlMEUnlink(frag->me_h);
5050
frag->me_h = PTL_INVALID_HANDLE;
5151
}

0 commit comments

Comments
 (0)