fixing the macros

Author: Mamzi Bayatpour [email protected] ()

ompi/mca/osc/ucx/osc_ucx.h

@@ -47,12 +47,12 @@ typedef struct ompi_osc_ucx_component {
 
 OMPI_DECLSPEC extern ompi_osc_ucx_component_t mca_osc_ucx_component;
 
-#define INCREMENT_OUTSTANDING_NB_OPS                                \
+#define OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS()                      \
     do {                                                            \
         mca_osc_ucx_component.num_incomplete_req_ops++;             \
     } while(0);
 
-#define DECREMENT_OUTSTANDING_NB_OPS                                \
+#define OSC_UCX_DECREMENT_OUTSTANDING_NB_OPS()                      \
     do {                                                            \
         mca_osc_ucx_component.num_incomplete_req_ops--;             \
     } while(0);

ompi/mca/osc/ucx/osc_ucx_comm.c

@@ -1135,7 +1135,7 @@ int ompi_osc_ucx_rput(const void *origin_addr, int origin_count,
 
     OMPI_OSC_UCX_REQUEST_ALLOC(win, ucx_req);
 
-    INCREMENT_OUTSTANDING_NB_OPS;
+    OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS();
     ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, req_completion, ucx_req, ep);
 
     if (ret != OMPI_SUCCESS) {
@@ -1190,7 +1190,7 @@ int ompi_osc_ucx_rget(void *origin_addr, int origin_count,
 
     OMPI_OSC_UCX_REQUEST_ALLOC(win, ucx_req);
 
-    INCREMENT_OUTSTANDING_NB_OPS;
+    OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS();
     ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, req_completion, ucx_req, ep);
 
     if (ret != OMPI_SUCCESS) {
@@ -1349,7 +1349,7 @@ static inline int ompi_osc_ucx_acc_rputget(void *stage_addr, int stage_count,
 
     module->skip_sync_check = sync_check;
     if (acc_type != NONE) {
-        INCREMENT_OUTSTANDING_NB_OPS;
+        OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS();
         ret = opal_common_ucx_wpmem_flush_ep_nb(mem, target, req_completion, ucx_req, ep);
 
         if (ret != OMPI_SUCCESS) {
@@ -1660,7 +1660,7 @@ void req_completion(void *request) {
         }
     }
 
-    DECREMENT_OUTSTANDING_NB_OPS;
+    OSC_UCX_DECREMENT_OUTSTANDING_NB_OPS();
     ompi_request_complete(&(req->super), true);
     assert(mca_osc_ucx_component.num_incomplete_req_ops >= 0);
 }

ompi/mca/osc/ucx/osc_ucx_component.c

@@ -995,7 +995,7 @@ inline int ompi_osc_ucx_nonblocking_ops_finalize(ompi_osc_ucx_module_t *module,
     }
 
     if (lock_acquired) {
-        INCREMENT_OUTSTANDING_NB_OPS;
+        OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS();
         ret = opal_common_ucx_wpmem_fetch_nb(module->state_mem,
                                         UCP_ATOMIC_FETCH_OP_SWAP, TARGET_LOCK_UNLOCKED,
                                         target, &(module->req_result), sizeof(module->req_result),
@@ -1008,7 +1008,7 @@ inline int ompi_osc_ucx_nonblocking_ops_finalize(ompi_osc_ucx_module_t *module,
     } else {
         /* Lock is not acquired, but still, we need to know when the 
          * acc is finalized so that we can free the temp buffers */
-        INCREMENT_OUTSTANDING_NB_OPS;
+        OSC_UCX_INCREMENT_OUTSTANDING_NB_OPS();
         ret = opal_common_ucx_wpmem_flush_ep_nb(module->mem, target, req_completion, ucx_req, ep);
 
         if (ret != OMPI_SUCCESS) {