btl/usnic: move btl_usnic_lock initialization

Luke Robison · Luke Robison · commit efb53a48164c · 2024-02-24T05:11:26.000Z
Previously it was in component_init, but after open-mpi#12057 I noticed MPI finalize would find an uninitialized object and segfault. This change moves the initialization to component_open, so that component_close() can rely on the opal object initialization having been completed. Signed-off-by: Luke Robison <lrbison@amazon.com> (cherry picked from commit 5ff314c)
diff --git a/opal/mca/btl/usnic/btl_usnic_component.c b/opal/mca/btl/usnic/btl_usnic_component.c
@@ -160,6 +160,8 @@ static int usnic_component_open(void)
 
     /* initialize objects */
     OBJ_CONSTRUCT(&mca_btl_usnic_component.usnic_procs, opal_list_t);
+    OBJ_CONSTRUCT(&btl_usnic_lock, opal_recursive_mutex_t);
+
 
     /* Sanity check: if_include and if_exclude need to be mutually
        exclusive */
@@ -587,8 +589,6 @@ usnic_component_init(int *num_btl_modules, bool want_progress_threads, bool want
         }
     }
 
-    OBJ_CONSTRUCT(&btl_usnic_lock, opal_recursive_mutex_t);
-
     /* There are multiple dimensions to consider when requesting an
        API version number from libfabric:
 

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,8 @@ static int usnic_component_open(void)`
`160`	`160`
`161`	`161`	`/* initialize objects */`
`162`	`162`	`OBJ_CONSTRUCT(&mca_btl_usnic_component.usnic_procs, opal_list_t);`
	`163`	`+ OBJ_CONSTRUCT(&btl_usnic_lock, opal_recursive_mutex_t);`
	`164`	`+`
`163`	`165`
`164`	`166`	`/* Sanity check: if_include and if_exclude need to be mutually`
`165`	`167`	`exclusive */`
`@@ -587,8 +589,6 @@ usnic_component_init(int *num_btl_modules, bool want_progress_threads, bool want`
`587`	`589`	`}`
`588`	`590`	`}`
`589`	`591`
`590`		`- OBJ_CONSTRUCT(&btl_usnic_lock, opal_recursive_mutex_t);`
`591`		`-`
`592`	`592`	`/* There are multiple dimensions to consider when requesting an`
`593`	`593`	`API version number from libfabric:`
`594`	`594`