Merge pull request #11143 from bureddy/v4.1.x

jsquyres · web-flow · commit 5980bac63337 · 2022-12-05T16:29:17.000-05:00
common/ucx: call opal_progress when waiting for pmix_fence
diff --git a/opal/mca/common/ucx/common_ucx.c b/opal/mca/common/ucx/common_ucx.c
@@ -416,8 +416,10 @@ OPAL_DECLSPEC int opal_common_ucx_mca_pmix_fence(ucp_worker_h worker)
         return ret;
     }
 
-    while (!fenced) {
-        ucp_worker_progress(worker);
+    MCA_COMMON_UCX_PROGRESS_LOOP(worker) {
+        if(fenced) {
+            break;
+        }
     }
 
     return ret;

Original file line number	Diff line number	Diff line change
`@@ -416,8 +416,10 @@ OPAL_DECLSPEC int opal_common_ucx_mca_pmix_fence(ucp_worker_h worker)`
`416`	`416`	`return ret;`
`417`	`417`	`}`
`418`	`418`
`419`		`- while (!fenced) {`
`420`		`- ucp_worker_progress(worker);`
	`419`	`+ MCA_COMMON_UCX_PROGRESS_LOOP(worker) {`
	`420`	`+ if(fenced) {`
	`421`	`+ break;`
	`422`	`+ }`
`421`	`423`	`}`
`422`	`424`
`423`	`425`	`return ret;`