1
1

opal: fix opal_class_finalize() usage

the class system can be initialized/finalized as many times as we like,
so there is no more need to have opal_class_finalize() invoked in a destructor

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Этот коммит содержится в:
Gilles Gouaillardet 2016-10-13 17:01:28 +09:00
родитель 31799ece6f
Коммит 8cc3f288c9
4 изменённых файлов: 5 добавлений и 40 удалений

Просмотреть файл

@ -823,20 +823,6 @@ AC_TRY_LINK([void finalize (void) {}], [], [AC_MSG_RESULT([yes])
LDFLAGS=$LDFLAGS_save LDFLAGS=$LDFLAGS_save
OPAL_VAR_SCOPE_POP OPAL_VAR_SCOPE_POP
opal_destructor_use_fini=0
opal_no_destructor=0
if test x$opal_cv___attribute__destructor = x0 ; then
if test x$opal_ld_have_fini = x1 ; then
opal_destructor_use_fini=1
else
opal_no_destructor=1;
fi
fi
AC_DEFINE_UNQUOTED(OPAL_NO_LIB_DESTRUCTOR, [$opal_no_destructor],
[Whether libraries can be configured with destructor functions])
AM_CONDITIONAL(OPAL_DESTRUCTOR_USE_FINI, [test x$opal_destructor_use_fini = x1])
################################## ##################################
# Libraries # Libraries
################################## ##################################

Просмотреть файл

@ -11,6 +11,8 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2015-2016 Intel, Inc. All rights reserved. # Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -56,12 +58,6 @@ lib@OPAL_LIB_PREFIX@open_pal_la_LIBADD = \
lib@OPAL_LIB_PREFIX@open_pal_la_DEPENDENCIES = $(lib@OPAL_LIB_PREFIX@open_pal_la_LIBADD) lib@OPAL_LIB_PREFIX@open_pal_la_DEPENDENCIES = $(lib@OPAL_LIB_PREFIX@open_pal_la_LIBADD)
lib@OPAL_LIB_PREFIX@open_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version) lib@OPAL_LIB_PREFIX@open_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version)
if OPAL_DESTRUCTOR_USE_FINI
lib@OPAL_LIB_PREFIX@open_pal_la_LDFLAGS += -Wl,-fini -Wl,opal_cleanup
endif
# included subdirectory Makefile.am's and appended-to variables # included subdirectory Makefile.am's and appended-to variables
headers = headers =
noinst_LTLIBRARIES = noinst_LTLIBRARIES =

Просмотреть файл

@ -60,12 +60,6 @@ extern int opal_initialized;
extern int opal_util_initialized; extern int opal_util_initialized;
extern bool opal_init_called; extern bool opal_init_called;
static void __opal_attribute_destructor__ opal_cleanup (void)
{
/* finalize the class/object system */
opal_class_finalize();
}
int int
opal_finalize_util(void) opal_finalize_util(void)
{ {
@ -109,9 +103,8 @@ opal_finalize_util(void)
opal_datatype_finalize(); opal_datatype_finalize();
#if OPAL_NO_LIB_DESTRUCTOR /* finalize the class/object system */
opal_cleanup (); opal_class_finalize();
#endif
free (opal_process_info.nodename); free (opal_process_info.nodename);
opal_process_info.nodename = NULL; opal_process_info.nodename = NULL;

Просмотреть файл

@ -16,7 +16,7 @@
* Copyright (c) 2010-2015 Los Alamos National Security, LLC. * Copyright (c) 2010-2015 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -343,16 +343,6 @@ opal_init_util(int* pargc, char*** pargv)
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }
#if OPAL_NO_LIB_DESTRUCTOR
if (opal_init_called) {
/* can't use show_help here */
fprintf (stderr, "opal_init_util: attempted to initialize after finalize without compiler "
"support for either __attribute__(destructor) or linker support for -fini -- process "
"will likely abort\n");
return OPAL_ERR_NOT_SUPPORTED;
}
#endif
opal_init_called = true; opal_init_called = true;
/* set the nodename right away so anyone who needs it has it. Note /* set the nodename right away so anyone who needs it has it. Note