Merge pull request #11144 from bureddy/master

janjust · web-flow · commit 15ba702fe20f · 2022-12-05T13:32:07.000-06: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
@@ -396,8 +396,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
`@@ -396,8 +396,10 @@ OPAL_DECLSPEC int opal_common_ucx_mca_pmix_fence(ucp_worker_h worker)`
`396`	`396`	`return ret;`
`397`	`397`	`}`
`398`	`398`
`399`		`- while (!fenced) {`
`400`		`- ucp_worker_progress(worker);`
	`399`	`+ MCA_COMMON_UCX_PROGRESS_LOOP(worker) {`
	`400`	`+ if(fenced) {`
	`401`	`+ break;`
	`402`	`+ }`
`401`	`403`	`}`
`402`	`404`
`403`	`405`	`return ret;`