Skip to content

Commit 18ff47b

Browse files
author
Mamzi Bayatpour [email protected] ()
committed
fix the naming of req comp
1 parent 63e6893 commit 18ff47b

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎ompi/mca/osc/ucx/osc_ucx_comm.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ static int do_atomic_op_intrinsic(
457457
uint64_t value = 0;
458458
if ((count - 1) == i && NULL != ucx_req) {
459459
// the last item is used to feed the request, if needed
460-
user_req_cb = &req_completion;
460+
user_req_cb = &ompi_osc_ucx_req_completion;
461461
user_req_ptr = ucx_req;
462462
// issue a fence if this is the last but not the only element
463463
if (0 < i) {
@@ -1130,7 +1130,7 @@ int ompi_osc_ucx_rput(const void *origin_addr, int origin_count,
11301130
ucx_req->super.module = module;
11311131

11321132
OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS(module);
1133-
ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, req_completion, ucx_req, ep);
1133+
ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, ompi_osc_ucx_req_completion, ucx_req, ep);
11341134

11351135
if (ret != OMPI_SUCCESS) {
11361136
/* fallback to using an atomic op to acquire a request handle */
@@ -1144,7 +1144,7 @@ int ompi_osc_ucx_rput(const void *origin_addr, int origin_count,
11441144
ret = opal_common_ucx_wpmem_fetch_nb(mem, UCP_ATOMIC_FETCH_OP_FADD,
11451145
0, target, &(module->req_result),
11461146
sizeof(uint64_t), remote_addr & (~0x7),
1147-
req_completion, ucx_req, ep);
1147+
ompi_osc_ucx_req_completion, ucx_req, ep);
11481148
if (ret != OMPI_SUCCESS) {
11491149
OMPI_OSC_UCX_REQUEST_RETURN(ucx_req);
11501150
return ret;
@@ -1186,7 +1186,7 @@ int ompi_osc_ucx_rget(void *origin_addr, int origin_count,
11861186
ucx_req->super.module = module;
11871187

11881188
OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS(module);
1189-
ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, req_completion, ucx_req, ep);
1189+
ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, ompi_osc_ucx_req_completion, ucx_req, ep);
11901190

11911191
if (ret != OMPI_SUCCESS) {
11921192
/* fallback to using an atomic op to acquire a request handle */
@@ -1200,7 +1200,7 @@ int ompi_osc_ucx_rget(void *origin_addr, int origin_count,
12001200
ret = opal_common_ucx_wpmem_fetch_nb(mem, UCP_ATOMIC_FETCH_OP_FADD,
12011201
0, target, &(module->req_result),
12021202
sizeof(uint64_t), remote_addr & (~0x7),
1203-
req_completion, ucx_req, ep);
1203+
ompi_osc_ucx_req_completion, ucx_req, ep);
12041204
if (ret != OMPI_SUCCESS) {
12051205
OMPI_OSC_UCX_REQUEST_RETURN(ucx_req);
12061206
return ret;
@@ -1347,7 +1347,7 @@ static inline int ompi_osc_ucx_acc_rputget(void *stage_addr, int stage_count,
13471347
module->skip_sync_check = sync_check;
13481348
if (acc_type != NONE) {
13491349
OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS(module);
1350-
ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, req_completion, ucx_req, ep);
1350+
ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, ompi_osc_ucx_req_completion, ucx_req, ep);
13511351

13521352
if (ret != OMPI_SUCCESS) {
13531353
/* fallback to using an atomic op to acquire a request handle */
@@ -1360,7 +1360,7 @@ static inline int ompi_osc_ucx_acc_rputget(void *stage_addr, int stage_count,
13601360
ret = opal_common_ucx_wpmem_fetch_nb(mem, UCP_ATOMIC_FETCH_OP_FADD,
13611361
0, target, &(module->req_result),
13621362
sizeof(uint64_t), remote_addr & (~0x7),
1363-
req_completion, ucx_req, ep);
1363+
ompi_osc_ucx_req_completion, ucx_req, ep);
13641364
if (ret != OMPI_SUCCESS) {
13651365
OMPI_OSC_UCX_REQUEST_RETURN(ucx_req);
13661366
return ret;
@@ -1477,7 +1477,7 @@ static int ompi_osc_ucx_get_accumulate_nonblocking(const void *origin_addr, int
14771477
return ret;
14781478
}
14791479

1480-
void req_completion(void *request) {
1480+
void ompi_osc_ucx_req_completion(void *request) {
14811481
ompi_osc_ucx_generic_request_t *ucx_req = (ompi_osc_ucx_generic_request_t *)request;
14821482
int ret = OMPI_SUCCESS;
14831483
ompi_osc_ucx_module_t *module = ucx_req->super.module;

‎ompi/mca/osc/ucx/osc_ucx_component.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ inline int ompi_osc_ucx_nonblocking_ops_finalize(ompi_osc_ucx_module_t *module,
10201020
ret = opal_common_ucx_wpmem_fetch_nb(module->state_mem,
10211021
UCP_ATOMIC_FETCH_OP_SWAP, TARGET_LOCK_UNLOCKED,
10221022
target, &(module->req_result), sizeof(module->req_result),
1023-
remote_addr, req_completion, ucx_req, ep);
1023+
remote_addr, ompi_osc_ucx_req_completion, ucx_req, ep);
10241024
if (ret != OMPI_SUCCESS) {
10251025
OSC_UCX_VERBOSE(1, "opal_common_ucx_wpmem_fetch_nb failed: %d", ret);
10261026
OMPI_OSC_UCX_REQUEST_RETURN(ucx_req);
@@ -1030,14 +1030,14 @@ inline int ompi_osc_ucx_nonblocking_ops_finalize(ompi_osc_ucx_module_t *module,
10301030
/* Lock is not acquired, but still, we need to know when the
10311031
* acc is finalized so that we can free the temp buffers */
10321032
OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS(module);
1033-
ret = opal_common_ucx_wpmem_flush_ep_nb(module->mem, target, req_completion, ucx_req, ep);
1033+
ret = opal_common_ucx_wpmem_flush_ep_nb(module->mem, target, ompi_osc_ucx_req_completion, ucx_req, ep);
10341034

10351035
if (ret != OMPI_SUCCESS) {
10361036
/* fallback to using an atomic op to acquire a request handle */
10371037
ret = opal_common_ucx_wpmem_fetch_nb(module->mem, UCP_ATOMIC_FETCH_OP_FADD,
10381038
0, target, &(module->req_result),
10391039
sizeof(uint64_t), remote_addr & (~0x7),
1040-
req_completion, ucx_req, ep);
1040+
ompi_osc_ucx_req_completion, ucx_req, ep);
10411041
if (ret != OMPI_SUCCESS) {
10421042
OMPI_OSC_UCX_REQUEST_RETURN(ucx_req);
10431043
return ret;

‎ompi/mca/osc/ucx/osc_ucx_request.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,6 @@ OBJ_CLASS_DECLARATION(ompi_osc_ucx_accumulate_request_t);
142142
} \
143143
} while (0)
144144

145-
void req_completion(void *request);
145+
void ompi_osc_ucx_req_completion(void *request);
146146

147147
#endif /* OMPI_OSC_UCX_REQUEST_H */

0 commit comments

Comments
 (0)