Merge pull request #12432 from hpcraink/master

bosilca · web-flow · commit 02bc0c5b1e3b · 2024-04-09T13:40:35.000-04:00
Get rid of local copy of ompi_mpi_thread_multiple.
diff --git a/ompi/mca/pml/base/pml_base_bsend.c b/ompi/mca/pml/base/pml_base_bsend.c
@@ -137,7 +137,6 @@ int mca_pml_base_bsend_attach(void* addr, int size)
 {
     int align;
 
-    bool thread_safe = ompi_mpi_thread_multiple;
     if(NULL == addr || size <= 0) {
         return OMPI_ERR_BUFFER;
     }
@@ -150,7 +149,7 @@ int mca_pml_base_bsend_attach(void* addr, int size)
     }
 
     /* try to create an instance of the allocator - to determine thread safety level */
-    mca_pml_bsend_allocator = mca_pml_bsend_allocator_component->allocator_init(thread_safe, mca_pml_bsend_alloc_segment, NULL, NULL);
+    mca_pml_bsend_allocator = mca_pml_bsend_allocator_component->allocator_init(ompi_mpi_thread_multiple, mca_pml_bsend_alloc_segment, NULL, NULL);
     if(NULL == mca_pml_bsend_allocator) {
         OPAL_THREAD_UNLOCK(&mca_pml_bsend_mutex);
         return OMPI_ERR_BUFFER;

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ int mca_pml_base_bsend_attach(void* addr, int size)`
`137`	`137`	`{`
`138`	`138`	`int align;`
`139`	`139`
`140`		`- bool thread_safe = ompi_mpi_thread_multiple;`
`141`	`140`	`if(NULL == addr \|\| size <= 0) {`
`142`	`141`	`return OMPI_ERR_BUFFER;`
`143`	`142`	`}`
`@@ -150,7 +149,7 @@ int mca_pml_base_bsend_attach(void* addr, int size)`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`/* try to create an instance of the allocator - to determine thread safety level */`
`153`		`- mca_pml_bsend_allocator = mca_pml_bsend_allocator_component->allocator_init(thread_safe, mca_pml_bsend_alloc_segment, NULL, NULL);`
	`152`	`+ mca_pml_bsend_allocator = mca_pml_bsend_allocator_component->allocator_init(ompi_mpi_thread_multiple, mca_pml_bsend_alloc_segment, NULL, NULL);`
`154`	`153`	`if(NULL == mca_pml_bsend_allocator) {`
`155`	`154`	`OPAL_THREAD_UNLOCK(&mca_pml_bsend_mutex);`
`156`	`155`	`return OMPI_ERR_BUFFER;`