From 5c8edd4c1876f9ad3207cf53ca28ce980b980c4b Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 18 Oct 2005 16:12:39 +0000 Subject: [PATCH] b=8080 Landing LNET (b1_4_newconfig) --- build/Makefile.in.toplevel | 3 +- build/autoMakefile.am.toplevel | 7 +- build/autoconf/lustre-build-darwin.m4 | 2 + build/autoconf/lustre-build-linux.m4 | 9 +- build/autoconf/lustre-build.m4 | 164 ++++++++++++++++++++++++++-------- build/autogen.sh | 2 +- build/buildcvs | 29 ++++-- build/lustre.spec.in | 6 -- build/merge1.sh | 1 + lustrecvs | 4 - 10 files changed, 165 insertions(+), 62 deletions(-) diff --git a/build/Makefile.in.toplevel b/build/Makefile.in.toplevel index 7440384..c082b6f 100644 --- a/build/Makefile.in.toplevel +++ b/build/Makefile.in.toplevel @@ -1,4 +1,5 @@ -subdir-m += portals +subdir-m += lnet subdir-m += lustre +@BUILD_PORTALS_TRUE@subdir-m += portals @INCLUDE_RULES@ diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel index 72b41a2..096edf5 100644 --- a/build/autoMakefile.am.toplevel +++ b/build/autoMakefile.am.toplevel @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ portals lustre -DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio portals lustre +SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet @LUSTRE_PORTALS_SUBDIR@ lustre +DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet @LUSTRE_PORTALS_SUBDIR@ lustre EXTRA_DIST := config.h.in @@ -28,8 +28,9 @@ tags: if MODULES all-sources: - $(MAKE) sources -C portals + $(MAKE) sources -C lnet $(MAKE) sources -C lustre + if [ "x@LUSTRE_PORTALS_SUBDIR@" = "xportals" ] ; then $(MAKE) sources -C @LUSTRE_PORTALS_SUBDIR@ ; fi if LINUX all-am: modules diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4 index 8b96dfb..101e60c 100644 --- a/build/autoconf/lustre-build-darwin.m4 +++ b/build/autoconf/lustre-build-darwin.m4 @@ -93,6 +93,8 @@ AC_SUBST(kextdir) AC_SUBST(plistdir) AC_SUBST(macosdir) +LN_PROG_DARWIN + LP_PROG_DARWIN LC_PROG_DARWIN diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 03e5501..8c123dc 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -329,11 +329,16 @@ fi #LB_LINUX_CONFIG_BIG_STACK -# Portals tests -LP_PROG_LINUX +# LNet tests +LN_PROG_LINUX # Lustre tests LC_PROG_LINUX + +# Portals tests +if test "$PORTALS" ; then + LP_PROG_LINUX +fi ]) # diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4 index 94d0404..13cba8e 100644 --- a/build/autoconf/lustre-build.m4 +++ b/build/autoconf/lustre-build.m4 @@ -159,37 +159,109 @@ AC_CONFIG_SUBDIRS(libsysio) ]) # -# LB_PATH_CRAY_PORTALS +# LB_CONFIG_PORTALS +# +# configure support for Cray Portals +# +AC_DEFUN([LB_CONFIG_PORTALS], +[AC_MSG_CHECKING([for external Portals]) +AC_ARG_WITH([portals], + AC_HELP_STRING([--with-portals=path], + [set path to portals]), + [ + case $with_portals in + no) PORTALS="" + enable_portals=no + ;; + *) if test x$with_portals != x ; then + PORTALS="$with_portals" + enable_portals=yes + else + AC_MSG_ERROR([Path to portals must be specified]) + enable_portals=no + fi + ;; + esac + + ], [enable_portals=no]) +AC_MSG_CHECKING([location of portals]) +case x$enable_portals in + xyes) + AC_MSG_RESULT([$PORTALS]) + LB_CHECK_FILE([$PORTALS/include/portals/api.h],[], + AC_MSG_ERROR([Cannot find portals headers])) + ;; + *) + AC_MSG_RESULT([no external portals]) + ;; +esac + +AC_SUBST(PORTALS) +]) + # -# Support for external Cray portals +# LB_CONFIG_LUSTRE_PORTALS # -AC_DEFUN([LB_PATH_CRAY_PORTALS], -[LB_ARG_LIBS_INCLUDES([Cray Portals],[cray-portals]) +# configure support for Lustre Portals +# +AC_DEFUN([LB_CONFIG_LUSTRE_PORTALS], +[AC_MSG_CHECKING([for Lustre Portals]) +AC_ARG_WITH([lustre-portals], + AC_HELP_STRING([--with-lustre-portals=path], + [set path to Lustre portals]), + [ + case $with_lustre_portals in + yes) LUSTRE_PORTALS="$PWD/portals" + enable_lustre_portals=yes + ;; + no) LUSTRE_PORTALS="" + enable_lustre_portals=no + ;; + *) if test x$with_lustre_portals != x ; then + LUSTRE_PORTALS="$with_lustre_portals" + else + LUSTRE_PORTALS="$PWD/portals" + fi + enable_lustre_portals=yes + ;; + esac + + ], [enable_lustre_portals=no]) -if test x$cray_portals_includes != x ; then - if test ! -r $cray_portals_includes/portals/api.h ; then - AC_MSG_ERROR([Cray portals headers were not found in $cray_portals_includes. Please check the paths passed to --with-cray-portals or --with-cray-portals-includes.]) - fi -fi -if test x$cray_portals_libs != x ; then - if test ! -r $cray_portals_libs/libportals.a ; then - AC_MSG_ERROR([Cray portals libraries were not found in $cray_portals_libs. Please check the paths passed to --with-cray-portals or --with-cray-portals-libs.]) - fi -fi +AC_MSG_CHECKING([location of Lustre portals]) +case x$enable_lustre_portals in + xyes) + AC_MSG_RESULT([$LUSTRE_PORTALS]) + LB_CHECK_FILE([$LUSTRE_PORTALS/include/portals/api.h],[LUSTRE_PORTALS_SUBDIR="portals"], + AC_MSG_ERROR([Cannot find Lustre portals headers])) + ;; + *) + AC_MSG_RESULT([disable Lustre portals]) + ;; +esac -if test x$cray_portals_includes != x -a x$cray_portals_libs != x ; then - cray_portals=yes - AC_DEFINE(CRAY_PORTALS, 1, [Building with Cray Portals]) - CPPFLAGS="-I$cray_portals_includes $CPPFLAGS" - EXTRA_KCFLAGS="-I$cray_portals_includes $EXTRA_KCFLAGS" - # for liblustre + b_cray - CRAY_PORTALS_LIBS="$cray_portals_libs" - AC_SUBST(CRAY_PORTALS_LIBS) -else - cray_portals=no +AC_SUBST(LUSTRE_PORTALS_SUBDIR) +AC_SUBST(LUSTRE_PORTALS) +]) + +# +# LB_CONFIG_CRAY_XT3 +# +# Enable Cray XT3 features +# +AC_DEFUN([LB_CONFIG_CRAY_XT3], +[AC_MSG_CHECKING([whether to build Cray XT3 features]) +AC_ARG_ENABLE([cray_xt3], + AC_HELP_STRING([--enable-cray-xt3], + [enable building of Cray XT3 features]), + [enable_cray_xt3='yes'],[enable_cray_xt3='no']) +AC_MSG_RESULT([$enable_cray_xt3]) +if test x$enable_cray_xt3 != xno; then + AC_DEFINE(CRAY_XT3, 1, Enable Cray XT3 Features) fi ]) + # # LB_PATH_SNMP # @@ -265,11 +337,7 @@ AC_ARG_ENABLE([tests], [disable building of Lustre tests]), [], [ - if test x$cray_portals = xyes ; then - enable_tests='no' - else - enable_tests='yes' - fi + enable_tests='yes' ]) AC_MSG_RESULT([$enable_tests]) ]) @@ -356,8 +424,9 @@ AC_SUBST(sysconfdir) docdir='${datadir}/doc/$(PACKAGE)' AC_SUBST(docdir) -LP_PATH_DEFAULTS +LN_PATH_DEFAULTS LC_PATH_DEFAULTS + ]) # @@ -415,7 +484,7 @@ AC_TRY_COMPILE([],[],[ CC="$CC_save" ]) -CPPFLAGS="-I\$(top_builddir)/portals/include -I\$(top_srcdir)/portals/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS" +CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS" LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1" AC_SUBST(LLCPPFLAGS) @@ -423,8 +492,8 @@ AC_SUBST(LLCPPFLAGS) LLCFLAGS="-g -Wall -fPIC" AC_SUBST(LLCFLAGS) -# everyone builds against portals and lustre -EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/portals/include -I$PWD/lustre/include" +# everyone builds against lnet and lustre +EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/lnet/include -I$PWD/lustre/include" AC_SUBST(EXTRA_KCFLAGS) ]) @@ -438,8 +507,8 @@ AC_DEFUN([LB_CONDITIONALS], AM_CONDITIONAL(UTILS, test x$enable_utils = xyes) AM_CONDITIONAL(TESTS, test x$enable_tests = xyes) AM_CONDITIONAL(DOC, test x$ENABLE_DOC = x1) -AM_CONDITIONAL(CRAY_PORTALS, test x$cray_portals != xno) AM_CONDITIONAL(INIT_SCRIPTS, test x$ENABLE_INIT_SCRIPTS = "x1") +AM_CONDITIONAL(BUILD_PORTALS, test x$LUSTRE_PORTALS_SUBDIR = "xportals") AM_CONDITIONAL(LINUX, test x$lb_target_os = "xlinux") AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin") @@ -457,8 +526,11 @@ AC_SUBST(SYSIO) LB_LINUX_CONDITIONALS LB_DARWIN_CONDITIONALS -LP_CONDITIONALS +LN_CONDITIONALS LC_CONDITIONALS +#if test "$LUSTRE_PORTALS" ; then + LP_CONDITIONALS +#fi ]) # @@ -471,14 +543,23 @@ AC_DEFUN([LB_CONFIGURE], LB_INCLUDE_RULES +LB_CONFIG_PORTALS +if ! test "$PORTALS" ; then +# if portals is configured, Lustre portals will be ignored + LB_CONFIG_LUSTRE_PORTALS +fi +LB_CONFIG_CRAY_XT3 LB_PATH_DEFAULTS LB_PROG_CC LB_PATH_LIBSYSIO -LB_PATH_CRAY_PORTALS LB_PATH_SNMP +if test "$LUSTRE_PORTALS" ; then + LP_PROG_CC +fi + LB_CONFIG_DOCS LB_CONFIG_UTILS LB_CONFIG_TESTS @@ -491,8 +572,12 @@ LC_CONFIG_LIBLUSTRE # Commented out to avoid a configure error. -gord #LC#_CONFIG_QUOTA -LP_CONFIGURE +LN_CONFIGURE + LC_CONFIGURE +if test "$LUSTRE_PORTALS" ; then + LP_CONFIGURE +fi if test "$SNMP_DIST_SUBDIR" ; then LS_CONFIGURE fi @@ -509,8 +594,11 @@ build/Rules build/lustre.spec ]) -LP_CONFIG_FILES +LN_CONFIG_FILES LC_CONFIG_FILES +if test "$LUSTRE_PORTALS" ; then + LP_CONFIG_FILES +fi if test "$SNMP_DIST_SUBDIR" ; then LS_CONFIG_FILES fi diff --git a/build/autogen.sh b/build/autogen.sh index b27e0f9..ca6572d 100644 --- a/build/autogen.sh +++ b/build/autogen.sh @@ -79,7 +79,7 @@ check_version() { echo "Checking for a complete tree..." # required directories -for dir in build portals lustre ; do +for dir in build lnet portals lustre ; do if [ ! -d "$dir" ] ; then cat >&2 </dev/null 2>/dev/null ; then cat >> $f </dev/null 2>/dev/null ; then cat >> $f < /dev/null`" != "T$child" ]; the fi TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter? +[ $dir = "build" ] && TEST_FILE=lbuild check_tag() { [ -z "$1" ] && echo "check_tag() missing arg" && exit3 [ "$1" = "HEAD" ] && return diff --git a/lustrecvs b/lustrecvs index a89799f..d7fb3de 100755 --- a/lustrecvs +++ b/lustrecvs @@ -54,10 +54,6 @@ case "$lustretag" in exit 0 ;; - b1_4_newconfig*|b_newconfig_rdmarouting*|b1_4_mountconf*) - buildtag="b_lnet" - ;; - # These releases did not get build tagged for them because they # this build system didn't exist when they were tagged v1_2_8|v1_4_0) -- 1.8.3.1