Merge pull request #11620 from roiedanino/bugfix/shmem-ucx-spml-missing-mca-deregister

yosefe · web-flow · commit 271cced0d159 · 2023-04-27T10:55:22.000+03:00
OSHMEM/MCA/SPML/UCX: bugfix #11604 - missing opal_common_ucx_mca_deregister
diff --git a/oshmem/mca/spml/ucx/spml_ucx_component.c b/oshmem/mca/spml/ucx/spml_ucx_component.c
@@ -244,11 +244,13 @@ void mca_spml_ucx_async_cb(int fd, short event, void *cbdata)
 
 static int mca_spml_ucx_component_open(void)
 {
+    opal_common_ucx_mca_register();
     return OSHMEM_SUCCESS;
 }
 
 static int mca_spml_ucx_component_close(void)
 {
+    opal_common_ucx_mca_deregister();
     return OSHMEM_SUCCESS;
 }
 
@@ -267,8 +269,6 @@ static int spml_ucx_init(void)
         return OSHMEM_ERROR;
     }
 
-    opal_common_ucx_mca_register();
-
     memset(&params, 0, sizeof(params));
     params.field_mask        = UCP_PARAM_FIELD_FEATURES          |
                                UCP_PARAM_FIELD_ESTIMATED_NUM_EPS |

Original file line number	Diff line number	Diff line change
`@@ -244,11 +244,13 @@ void mca_spml_ucx_async_cb(int fd, short event, void *cbdata)`
`244`	`244`
`245`	`245`	`static int mca_spml_ucx_component_open(void)`
`246`	`246`	`{`
	`247`	`+ opal_common_ucx_mca_register();`
`247`	`248`	`return OSHMEM_SUCCESS;`
`248`	`249`	`}`
`249`	`250`
`250`	`251`	`static int mca_spml_ucx_component_close(void)`
`251`	`252`	`{`
	`253`	`+ opal_common_ucx_mca_deregister();`
`252`	`254`	`return OSHMEM_SUCCESS;`
`253`	`255`	`}`
`254`	`256`
`@@ -267,8 +269,6 @@ static int spml_ucx_init(void)`
`267`	`269`	`return OSHMEM_ERROR;`
`268`	`270`	`}`
`269`	`271`
`270`		`- opal_common_ucx_mca_register();`
`271`		`-`
`272`	`272`	`memset(&params, 0, sizeof(params));`
`273`	`273`	`params.field_mask = UCP_PARAM_FIELD_FEATURES \|`
`274`	`274`	`UCP_PARAM_FIELD_ESTIMATED_NUM_EPS \|`