From 0d8424e0a67c23d0fbb42e9663b92f39c0195828 Mon Sep 17 00:00:00 2001 From: Mike Dubman Date: Fri, 17 Jan 2014 16:57:12 +0000 Subject: [PATCH] OSHMEM: Fixes issue with recent segfault in finalize related to mca_base_group_unselect. We need to explicitly call mca_base_group_unselect in finalize for each group that are not freed with oshmem_group_cache_list_free before we unloading scoll framework. Refs trac:3763 This commit was SVN r30311. The following Trac tickets were found above: Ticket 3763 --> https://svn.open-mpi.org/trac/ompi/ticket/3763 --- oshmem/runtime/oshmem_shmem_finalize.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/oshmem/runtime/oshmem_shmem_finalize.c b/oshmem/runtime/oshmem_shmem_finalize.c index 6595965105..d5428498a7 100644 --- a/oshmem/runtime/oshmem_shmem_finalize.c +++ b/oshmem/runtime/oshmem_shmem_finalize.c @@ -105,8 +105,10 @@ static int _shmem_finalize(void) if (OSHMEM_SUCCESS != (ret = oshmem_group_cache_list_free())) { return ret; } - /* this is a special group which is not cached. We can only release its collectives at this point */ + /* We need to call mca_scoll_base_group_unselect explicitly for each group + * that are not freed by oshmem_group_cache_list_free. We can only release its collectives at this point */ mca_scoll_base_group_unselect(oshmem_group_all); + mca_scoll_base_group_unselect(oshmem_group_self); /* Close down MCA modules */