Fix up some long-latency bugs in the MCA even framework configury that
only became evident when there was more than one event component. The libevent2013 component is still ompi_ignore'd for most developers. This commit was SVN r25198.
Этот коммит содержится в:
Jeff Squyres
родитель
211b5c7824
Коммит
3d61d0f357
@ -15,11 +15,18 @@ dnl
|
||||
# name (relative to opal/mca/event) that will be included in
|
||||
# opal/mca/event/event.h.
|
||||
|
||||
# Optionally, components may also set the shell variable
|
||||
# $opal_event_<component>_include_cppflags if additional CPPFLAGS must
|
||||
# be used with this header file. The event framework will add the
|
||||
# winning component's $opal_event_<component>_include_cppflags to the
|
||||
# global $CPPFLAGS.
|
||||
# Optionally, components may also set the following shell variables:
|
||||
#
|
||||
# opal_event_<component>_ADD_CPPFLAGS
|
||||
# opal_event_<component>_ADD_LDFLAGS
|
||||
# opal_event_<component>_ADD_LIBS
|
||||
# opal_event_<component>_ADD_WRAPPER_EXTRA_CPPFLAGS
|
||||
# opal_event_<component>_ADD_WRAPPER_EXTRA_LDFLAGS
|
||||
# opal_event_<component>_ADD_WRAPPER_EXTRA_LIBS
|
||||
#
|
||||
# The first 3 will be added to the over all CPPFLAGS/LDFLAGS/LIBS if
|
||||
# that component is chosen as the winning component. Similarly, the
|
||||
# latter 3 will be added to WRAPPER_EXTRA_* if that component wins.
|
||||
|
||||
dnl We only want one winning component.
|
||||
m4_define(MCA_opal_event_CONFIGURE_MODE, STOP_AT_FIRST_PRIORITY)
|
||||
@ -76,10 +83,24 @@ AC_DEFUN([MCA_opal_event_CONFIG],[
|
||||
AC_DEFINE_UNQUOTED([MCA_event_IMPLEMENTATION_HEADER],
|
||||
["opal/mca/event/$opal_event_base_include"],
|
||||
[Header to include for event implementation])
|
||||
AC_MSG_CHECKING([for winning component additional CPPFLAGS])
|
||||
eval "opal_event_base_include_cppflags=\`echo \$opal_event_${opal_event_winner}_include_cppflags\`"
|
||||
AS_IF([test "$opal_event_base_include_cppflags" != ""],
|
||||
[AC_MSG_RESULT([$opal_event_base_include_cppflags])
|
||||
CPPFLAGS="$CPPFLAGS $opal_event_base_include_cppflags"],
|
||||
[AC_MSG_RESULT([none])])
|
||||
|
||||
# See if they set any flags for us
|
||||
_MCA_opal_event_base_flags([CPPFLAGS], [CPPFLAGS])
|
||||
_MCA_opal_event_base_flags([LDFLAGS], [LDFLAGS])
|
||||
_MCA_opal_event_base_flags([LIBS], [LIBS])
|
||||
_MCA_opal_event_base_flags([wrapper CPPFLAGS], [WRAPPER_EXTRA_CPPFLAGS])
|
||||
_MCA_opal_event_base_flags([wrapper LDFLAGS], [WRAPPER_EXTRA_LDFLAGS])
|
||||
_MCA_opal_event_base_flags([wrapper LIBS], [WRAPPER_EXTRA_LIBS])
|
||||
])
|
||||
|
||||
dnl Helper function
|
||||
dnl $1 = message to display
|
||||
dnl $2 = output variable to set / input variable suffix
|
||||
AC_DEFUN([_MCA_opal_event_base_flags],[
|
||||
AC_MSG_CHECKING([for winning event component additional $1])
|
||||
eval "opal_event_base_tmp=\`echo \$opal_event_${opal_event_winner}_ADD_$2\`"
|
||||
AS_IF([test "$opal_event_base_tmp" != ""],
|
||||
[AC_MSG_RESULT([$opal_event_base_tmp])
|
||||
$2="[$]$2 $opal_event_base_tmp"],
|
||||
[AC_MSG_RESULT([none])])
|
||||
])dnl
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
jsquyres
|
||||
rhc
|
||||
hjelmn
|
||||
rhc
|
||||
|
||||
@ -171,16 +171,16 @@ EOF
|
||||
# what file to include in opal/mca/event/event.h
|
||||
opal_event_libevent2013_include="libevent2013/libevent2013.h"
|
||||
|
||||
# We also set _cppflags so that when including
|
||||
# libevent2013.h, it can find all the actual libevent files.
|
||||
# Be a little friendly and only include the -I for the
|
||||
# builddir if it's different than the srcdir.
|
||||
# Also pass some *_ADD_* flags upwards to the framework m4
|
||||
# for various compile/link flags that are needed a) to
|
||||
# build the rest of the source tree, and b) for the wrapper
|
||||
# compilers (in the --with-devel-headers case).
|
||||
file=$basedir/libevent
|
||||
opal_event_libevent2013_include_cppflags="-I$OMPI_TOP_SRCDIR/$file -I$OMPI_TOP_SRCDIR/$file/include"
|
||||
opal_event_libevent2013_ADD_CPPFLAGS="-I$OMPI_TOP_SRCDIR/$file -I$OMPI_TOP_SRCDIR/$file/include"
|
||||
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
||||
[opal_event_libevent2013_include_cppflags="$opal_event_libevent2013_include_cppflags -I$OMPI_TOP_BUILDDIR/$file/include"])
|
||||
[opal_event_libevent2013_ADD_CPPFLAGS="$opal_event_libevent2013_ADD_CPPFLAGS -I$OMPI_TOP_BUILDDIR/$file/include"])
|
||||
if test "$with_devel_headers" = "yes" ; then
|
||||
WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS "'-I${includedir}/openmpi/opal/mca/event/libevent2013/libevent -I${includedir}/openmpi/opal/mca/event/libevent2013/libevent/include'
|
||||
opal_event_libevent2013_ADD_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/opal/mca/event/libevent2013/libevent -I${includedir}/openmpi/opal/mca/event/libevent2013/libevent/include'
|
||||
fi
|
||||
$1],
|
||||
[$2
|
||||
|
||||
@ -171,16 +171,16 @@ EOF
|
||||
# what file to include in opal/mca/event/event.h
|
||||
opal_event_libevent207_include="libevent207/libevent207.h"
|
||||
|
||||
# We also set _cppflags so that when including
|
||||
# libevent207.h, it can find all the actual libevent files.
|
||||
# Be a little friendly and only include the -I for the
|
||||
# builddir if it's different than the srcdir.
|
||||
# Also pass some *_ADD_* flags upwards to the framework m4
|
||||
# for various compile/link flags that are needed a) to
|
||||
# build the rest of the source tree, and b) for the wrapper
|
||||
# compilers (in the --with-devel-headers case).
|
||||
file=$basedir/libevent
|
||||
opal_event_libevent207_include_cppflags="-I$OMPI_TOP_SRCDIR/$file -I$OMPI_TOP_SRCDIR/$file/include"
|
||||
opal_event_libevent207_ADD_CPPFLAGS="-I$OMPI_TOP_SRCDIR/$file -I$OMPI_TOP_SRCDIR/$file/include"
|
||||
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
||||
[opal_event_libevent207_include_cppflags="$opal_event_libevent207_include_cppflags -I$OMPI_TOP_BUILDDIR/$file/include"])
|
||||
[opal_event_libevent207_ADD_CPPAFLAGS="$opal_event_libevent207_ADD_CPPFLAGS -I$OMPI_TOP_BUILDDIR/$file/include"])
|
||||
if test "$with_devel_headers" = "yes" ; then
|
||||
WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS "'-I${includedir}/openmpi/opal/mca/event/libevent207/libevent -I${includedir}/openmpi/opal/mca/event/libevent207/libevent/include'
|
||||
opal_event_libevent207_ADD_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/opal/mca/event/libevent207/libevent -I${includedir}/openmpi/opal/mca/event/libevent207/libevent/include'
|
||||
fi
|
||||
$1],
|
||||
[$2
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user