Skip to content

Commit afc5fb8

Browse files
committed
Add missing dynamic_lock member in ompi_osc_ucx_state struct
Signed-off-by: Shumpei Shiina <[email protected]>
1 parent dbf2cef commit afc5fb8

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

ompi/mca/osc/ucx/osc_ucx.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ typedef struct ompi_osc_ucx_epoch_type {
8282
#define OSC_UCX_STATE_COMPLETE_COUNT_OFFSET (sizeof(uint64_t) * 3)
8383
#define OSC_UCX_STATE_POST_INDEX_OFFSET (sizeof(uint64_t) * 4)
8484
#define OSC_UCX_STATE_POST_STATE_OFFSET (sizeof(uint64_t) * 5)
85-
#define OSC_UCX_STATE_DYNAMIC_LOCK_OFFSET (sizeof(uint64_t) * 6)
85+
#define OSC_UCX_STATE_DYNAMIC_LOCK_OFFSET (sizeof(uint64_t) * (5 + OMPI_OSC_UCX_POST_PEER_MAX))
8686
#define OSC_UCX_STATE_DYNAMIC_WIN_CNT_OFFSET (sizeof(uint64_t) * (6 + OMPI_OSC_UCX_POST_PEER_MAX))
8787

8888
typedef struct ompi_osc_dynamic_win_info {
@@ -105,6 +105,7 @@ typedef struct ompi_osc_ucx_state {
105105
volatile uint64_t complete_count; /* # msgs received from complete processes */
106106
volatile uint64_t post_index;
107107
volatile uint64_t post_state[OMPI_OSC_UCX_POST_PEER_MAX];
108+
volatile uint64_t dynamic_lock;
108109
volatile uint64_t dynamic_win_count;
109110
volatile ompi_osc_dynamic_win_info_t dynamic_wins[OMPI_OSC_UCX_ATTACH_MAX];
110111
} ompi_osc_ucx_state_t;

ompi/mca/osc/ucx/osc_ucx_component.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,7 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in
838838
module->state.complete_count = 0;
839839
module->state.req_flag = 0;
840840
module->state.acc_lock = TARGET_LOCK_UNLOCKED;
841+
module->state.dynamic_lock = TARGET_LOCK_UNLOCKED;
841842
module->state.dynamic_win_count = 0;
842843
for (i = 0; i < OMPI_OSC_UCX_ATTACH_MAX; i++) {
843844
module->local_dynamic_win_info[i].refcnt = 0;

0 commit comments

Comments
 (0)