Revert "adding ref count for accumulate lock"

This reverts commit 174b53c.

Author: Mamzi Bayatpour [email protected] ()

ompi/mca/osc/ucx/osc_ucx.h

@@ -135,7 +135,6 @@ typedef struct ompi_osc_ucx_module {
     bool lock_all_is_nocheck;
     bool no_locks;
     bool acc_single_intrinsic;
-    uint64_t acc_lock_refcnt;
     opal_common_ucx_ctx_t *ctx;
     opal_common_ucx_wpmem_t *mem;
     opal_common_ucx_wpmem_t *state_mem;

ompi/mca/osc/ucx/osc_ucx_component.c

@@ -840,7 +840,6 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in
     OBJ_CONSTRUCT(&module->pending_posts, opal_list_t);
     module->start_grp_ranks = NULL;
     module->lock_all_is_nocheck = false;
-    module->acc_lock_refcnt = 0;
 
     if (!module->no_locks) {
         OBJ_CONSTRUCT(&module->outstanding_locks, opal_hash_table_t);
@@ -931,26 +930,23 @@ inline int ompi_osc_ucx_state_lock(
     int ret = OMPI_SUCCESS;
 
     if (force_lock || ompi_osc_need_acc_lock(module, target)) {
-        if (module->acc_lock_refcnt == 0) {
-            for (;;) {
-                ret = opal_common_ucx_wpmem_cmpswp(module->state_mem,
-                                                TARGET_LOCK_UNLOCKED, TARGET_LOCK_EXCLUSIVE,
-                                                target, &result_value, sizeof(result_value),
-                                                remote_addr, ep);
-                if (ret != OMPI_SUCCESS) {
-                    OSC_UCX_VERBOSE(1, "opal_common_ucx_mem_cmpswp failed: %d", ret);
-                    return OMPI_ERROR;
-                }
-                if (result_value == TARGET_LOCK_UNLOCKED) {
-                    break;
-                }
-
-                opal_common_ucx_wpool_progress(mca_osc_ucx_component.wpool);
+        for (;;) {
+            ret = opal_common_ucx_wpmem_cmpswp(module->state_mem,
+                                            TARGET_LOCK_UNLOCKED, TARGET_LOCK_EXCLUSIVE,
+                                            target, &result_value, sizeof(result_value),
+                                            remote_addr, ep);
+            if (ret != OMPI_SUCCESS) {
+                OSC_UCX_VERBOSE(1, "opal_common_ucx_mem_cmpswp failed: %d", ret);
+                return OMPI_ERROR;
             }
+            if (result_value == TARGET_LOCK_UNLOCKED) {
+                break;
+            }
+
+            opal_common_ucx_wpool_progress(mca_osc_ucx_component.wpool);
         }
 
         *lock_acquired = true;
-        module->acc_lock_refcnt++;
     } else {
         *lock_acquired = false;
     }
@@ -977,15 +973,11 @@ inline int ompi_osc_ucx_state_unlock(
             return OMPI_ERROR;
         }
 
-        if (module->acc_lock_refcnt == 1) {
-            ret = opal_common_ucx_wpmem_fetch(module->state_mem,
-                                            UCP_ATOMIC_FETCH_OP_SWAP, TARGET_LOCK_UNLOCKED,
-                                            target, &result_value, sizeof(result_value),
-                                            remote_addr, ep);
-            assert(result_value == TARGET_LOCK_EXCLUSIVE);
-        }
-        module->acc_lock_refcnt--;
-        assert(module->acc_lock_refcnt >= 0);
+        ret = opal_common_ucx_wpmem_fetch(module->state_mem,
+                                        UCP_ATOMIC_FETCH_OP_SWAP, TARGET_LOCK_UNLOCKED,
+                                        target, &result_value, sizeof(result_value),
+                                        remote_addr, ep);
+        assert(result_value == TARGET_LOCK_EXCLUSIVE);
     } else if (NULL != free_ptr){
         /* flush before freeing the buffer */
         ret = opal_common_ucx_ctx_flush(module->ctx, OPAL_COMMON_UCX_SCOPE_EP, target);