Skip to content

Commit

Permalink
Addressed reviewer's comments
Browse files Browse the repository at this point in the history
Signed-off-by: John H. Hartman <jhh67@users.noreply.github.com>
  • Loading branch information
jhh67 committed Oct 9, 2024
1 parent 6ac9060 commit c210260
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 15 deletions.
12 changes: 4 additions & 8 deletions runtime/src/comm/ofi/comm-ofi.c
Original file line number Diff line number Diff line change
Expand Up @@ -5533,7 +5533,6 @@ static inline
chpl_bool put_prologue(void* addr, c_nodeid_t node, void* raddr, size_t size,
int32_t commID, int ln, int32_t fn) {

chpl_bool proceed = false;
retireDelayedAmDone(false /*taskIsEnding*/);

//
Expand All @@ -5543,12 +5542,12 @@ chpl_bool put_prologue(void* addr, c_nodeid_t node, void* raddr, size_t size,
CHK_TRUE(raddr != NULL);

if (size == 0) {
goto done;
return false;
}

if (node == chpl_nodeID) {
memmove(raddr, addr, size);
goto done;
return false;
}

// Communications callback support
Expand All @@ -5561,9 +5560,7 @@ chpl_bool put_prologue(void* addr, c_nodeid_t node, void* raddr, size_t size,

chpl_comm_diags_verbose_rdma("put", node, size, ln, fn, commID);
chpl_comm_diags_incr(put);
proceed = true;
done:
return proceed;
return true;
}

/*
Expand Down Expand Up @@ -5625,7 +5622,7 @@ chpl_bool check_complete(nb_handle_t *handles, size_t nhandles,
chpl_bool completed = false; // at least one new completion detected
chpl_bool pending = false; // there is an uncompleted handle
if ((handles == NULL) || (nhandles == 0)) {
goto done;
return false;
}
struct perTxCtxInfo_t* tcip = NULL;
while (true) {
Expand Down Expand Up @@ -5675,7 +5672,6 @@ chpl_bool check_complete(nb_handle_t *handles, size_t nhandles,
if (tcip) {
tciFree(tcip);
}
done:
return completed;
}

Expand Down
2 changes: 1 addition & 1 deletion test/runtime/configMatters/comm/large-rma/EXECENV
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CHPL_RT_COMM_OFI_MAX_MSG_SIZE=100
CHPL_RT_COMM_OFI_MAX_MSG_SIZE=100
6 changes: 3 additions & 3 deletions test/runtime/configMatters/comm/large-rma/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Test RMA operations that are larger than the maximum message size of the fabric
and therefore require multiple transfers. This is accomplished by setting
the CHPL_RT_COMM_OFI_MAX_MSG_SIZE to a small value.
Test RMA operations that are larger than the maximum message size of the
fabric and therefore require multiple transfers. This is accomplished by
setting the CHPL_RT_COMM_OFI_MAX_MSG_SIZE to a small value.
2 changes: 1 addition & 1 deletion test/runtime/configMatters/comm/unbound/EXECENV
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CHPL_RT_COMM_OFI_EP_CNT=10
CHPL_RT_COMM_OFI_EP_CNT=10
2 changes: 1 addition & 1 deletion test/runtime/configMatters/comm/unbound/README
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Tests for CHPL_COMM=ofi with unbound endpoints. This is accomplished by
setting CHPL_RT_COMM_OFI_EP_CNT to a small value.
setting CHPL_RT_COMM_OFI_EP_CNT to a small value.
2 changes: 1 addition & 1 deletion test/runtime/configMatters/comm/unbound/SKIPIF
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CHPL_COMM != ofi
CHPL_COMM != ofi

0 comments on commit c210260

Please sign in to comment.