This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, devel has been updated via d958da60b9a876980fbe08749e2d5e5dc2b2165d (commit) via ced15e8e65c560707eeda1f8dabac74d3c38cf0c (commit) via deefe4aac00a6abb3c239d0151137e842623f843 (commit) via eb986f66244a34d51b2c24667d48b25bfa999703 (commit) via 9749d589fcb109035716c3157fa26221f7380443 (commit) via 8afd9d72d5a2dde03c4a201a149fbd46db29decb (commit) via 5c0ec9219bb033a49e4e3c89f8b87017576076ab (commit) via 59fc6b6cdc8a2c8bb797cffa65bf0e1b29a405a3 (commit) via 4dce1b9c5575a2d4c05661379e262a305b0052ab (commit) via f5339d64787c1f5f901c8ecfee46d0bd6ecbe409 (commit) via 7f96c2c0754a38bde028d487403eb61a83c898fd (commit) via 07246c7e0ca5189e41198c7dadb5495848055506 (commit) via 370862b9bed8c0b5b679267355d44eec7eae5592 (commit) via 40c27e292ca099f33a2d774fac012f08ce7f2100 (commit) from b6d78e476b966980d6e4353292dc2b32ba205f67 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d958da60b9a876980fbe08749e2d5e5dc2b2165d Author: Dries Kimpe <[email protected]> Date: Fri Mar 29 11:31:31 2013 -0500 Update C-Utils submodule link commit ced15e8e65c560707eeda1f8dabac74d3c38cf0c Author: Dries Kimpe <[email protected]> Date: Fri Mar 29 09:37:03 2013 -0500 Correct comment commit deefe4aac00a6abb3c239d0151137e842623f843 Author: Dries Kimpe <[email protected]> Date: Fri Mar 29 09:31:48 2013 -0500 Remove support for embedded openpa commit eb986f66244a34d51b2c24667d48b25bfa999703 Author: Dries Kimpe <[email protected]> Date: Fri Mar 29 09:31:09 2013 -0500 Require finding ev.h/libev commit 9749d589fcb109035716c3157fa26221f7380443 Author: Dries Kimpe <[email protected]> Date: Thu Mar 28 10:20:35 2013 -0500 Update jenkins build script commit 8afd9d72d5a2dde03c4a201a149fbd46db29decb Author: Dries Kimpe <[email protected]> Date: Thu Mar 28 10:19:47 2013 -0500 Allow external C-Utils commit 5c0ec9219bb033a49e4e3c89f8b87017576076ab Author: Dries Kimpe <[email protected]> Date: Thu Mar 28 10:01:14 2013 -0500 C-Utils install script commit 59fc6b6cdc8a2c8bb797cffa65bf0e1b29a405a3 Author: Dries Kimpe <[email protected]> Date: Wed Mar 27 11:11:22 2013 -0500 Don't make paths relative in aecc commit 4dce1b9c5575a2d4c05661379e262a305b0052ab Author: Dries Kimpe <[email protected]> Date: Wed Mar 27 10:40:52 2013 -0500 Initial version of jenkins build script commit f5339d64787c1f5f901c8ecfee46d0bd6ecbe409 Author: Dries Kimpe <[email protected]> Date: Wed Mar 27 10:39:53 2013 -0500 improve cabal install script commit 7f96c2c0754a38bde028d487403eb61a83c898fd Author: Dries Kimpe <[email protected]> Date: Tue Mar 26 16:03:17 2013 -0500 Make prepare script check for c-utils submodule Give error message if we detect missing submodule in prepare commit 07246c7e0ca5189e41198c7dadb5495848055506 Author: Dries Kimpe <[email protected]> Date: Wed Mar 27 17:13:46 2013 -0500 Update for new c-utils in-tree build layout commit 370862b9bed8c0b5b679267355d44eec7eae5592 Author: Dries Kimpe <[email protected]> Date: Wed Mar 27 17:11:16 2013 -0500 Include c-utils headers as < > I don't understand why this is needed (and why " ") doesn't work; I suspect it has something to do with broken depency tracking (for example, maybe the .d files don't contain < > header includes) commit 40c27e292ca099f33a2d774fac012f08ce7f2100 Author: Dries Kimpe <[email protected]> Date: Wed Mar 27 16:43:33 2013 -0500 Update c-utils to latest version ----------------------------------------------------------------------- Summary of changes: Makefile.in | 8 ++- ae-ctl.h | 4 +- ae-types.h | 2 +- aesop.h | 8 ++-- bin/aecc.in | 6 ++- configure.ac | 102 +++++++++++++++++++++++------------- hints.h | 4 +- maint/hs/setup-cabal-local | 6 ++ maint/jenkins/build.sh | 82 +++++++++++++++++++++++++++++ maint/jenkins/install-c-utils.sh | 18 ++++++ maint/jenkins/install-openpa.sh | 20 +++++++ op.h | 2 +- parser/tests/blocking/btest-impl.c | 2 +- prepare | 6 ++ resource.c | 2 +- resource.h | 8 ++-- resources/sem/sem.hae | 2 +- resources/worker/worker.c | 4 +- src/aebdb/aebdb.ae | 2 +- src/c-utils | 2 +- src/socket/aesocket.ae | 2 +- src/timer/timer.ae | 2 +- 22 files changed, 232 insertions(+), 62 deletions(-) create mode 100755 maint/jenkins/build.sh create mode 100755 maint/jenkins/install-c-utils.sh create mode 100755 maint/jenkins/install-openpa.sh Diff of changes: diff --git a/Makefile.in b/Makefile.in index 8b7cdbf..1370c0b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,7 +78,7 @@ ifeq ($(BUILD_SSM),1) LIBS += -lssm_ref -lssmp_mpi endif -CFLAGS= -I$(srcdir)/src/c-utils -I$(srcdir)/include -I. -Iinclude -I src/c-utils \ +CFLAGS=-I$(builddir)/src/c-utils/include -I$(srcdir)/include -I. -Iinclude -I src/c-utils \ -I$(srcdir) \ @CFLAGS@ @DB_CFLAGS@ $(CPPFLAGS) @@ -114,7 +114,11 @@ CWARNS += -Wno-unused-label LDSHARED = $(TCC) -shared LIBCFLAGS=@LIBCFLAGS@ -LDFLAGS += @LDFLAGS@ -Lsrc/c-utils +LDFLAGS += @LDFLAGS@ -L$(builddir)/src/c-utils/lib + +# hack for now +LDFLAGS += @LDFLAGS@ -L$(builddir)/src/c-utils/lib/.libs + LIBS += @LIBS@ @DB_LIB@ -lc-utils -lm -lpthread DEPLIBS += @THREAD_LIB@ diff --git a/ae-ctl.h b/ae-ctl.h index abcc72e..00627cf 100644 --- a/ae-ctl.h +++ b/ae-ctl.h @@ -9,8 +9,8 @@ #include <stdlib.h> -#include <aesop/triton-thread.h> -#include <aesop/triton-list.h> +#include <triton-thread.h> +#include <triton-list.h> #include <aesop/ae-debug.h> #include <aesop/ae-types.h> #include <aesop/ae-error.h> diff --git a/ae-types.h b/ae-types.h index d0f2d1b..9fffba3 100644 --- a/ae-types.h +++ b/ae-types.h @@ -13,7 +13,7 @@ * want to use Triton. */ -#include <aesop/triton-uint128.h> +#include <triton-uint128.h> #define ae_op_id_t uint128_t #define ae_op_id_clear triton_uint128_setzero diff --git a/aesop.h b/aesop.h index bfff55b..3572ff6 100644 --- a/aesop.h +++ b/aesop.h @@ -7,11 +7,11 @@ #ifndef __AESOP_H__ #define __AESOP_H__ -#include <aesop/triton-base.h> +#include <triton-base.h> -#include <aesop/triton-list.h> -#include <aesop/triton-thread.h> -#include <aesop/triton-uint128.h> +#include <triton-list.h> +#include <triton-thread.h> +#include <triton-uint128.h> #include <aesop/ae-error.h> #include <aesop/ae-log.h> diff --git a/bin/aecc.in b/bin/aecc.in index e6a446f..6328d03 100644 --- a/bin/aecc.in +++ b/bin/aecc.in @@ -79,8 +79,12 @@ if test "${hasOpt_parse_hae}" = "yes"; then fi if test "${hasOpt_from_interm}" != "yes"; then + + # This makes assumptions about current PWD! + #buildifile=$(echo "${INPUTFILES}" | sed -e "s|^ *${SRCDIR}||" | sed -e "s|^/||") + + buildifile=$(echo "${INPUTFILES}" | sed -e "s|^ *${SRCDIR}||") - buildifile=$(echo "${INPUTFILES}" | sed -e "s|^ *${SRCDIR}||" | sed -e "s|^/||") cppout=${buildifile}.i addToClean ${cppout} diff --git a/configure.ac b/configure.ac index b03245e..6c16e2a 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,6 @@ AC_DEFINE_UNQUOTED(AESOP_VERSION_SUB, $AESOP_SUB, sub version number) AC_CONFIG_HEADER(aesop-config.h) AC_CONFIG_AUX_DIR(maint/config) -AC_CONFIG_SUBDIRS(src/c-utils) AC_PROG_INSTALL AC_PROG_CC @@ -74,6 +73,64 @@ AS_IF([test "x$enable_valgrind_clean" = "xyes"], [ ]) AC_SUBST(VALGRIND_CLEAN) +dnl ========================================================================= +dnl ==== Check for libev ==================================================== +dnl ========================================================================= + +AC_ARG_WITH([libev], + [AS_HELP_STRING([[--with-libev=[DIR]]], + [Use libev from specified directory])]) + +libev_prefix= +AC_SUBST([libev_prefix]) + +CPPFLAGS="$CPPFLAGS -I${with_libev}/include" +LDFLAGS="$LDFLAGS -L${with_libev}/lib" + +AC_CHECK_HEADER([ev.h],[], + [AC_MSG_ERROR([Could not find libev header in + ${with_libev}/include!])]) +AC_CHECK_LIB([ev],[ev_once],[], + [AC_MSG_ERROR([Could not find useable + libev library at prefix ${with_libev}/lib!])]) + + +dnl ========================================================================= +dnl ==== Check for C-Utils ================================================== +dnl ========================================================================= + + +AC_ARG_WITH([c-utils], + [AS_HELP_STRING([[--with-c-utils[=DIR]]], + ["embedded" or "path"])], + [], + [ with_c_utils="embedded"]) + +c_utils_prefix="" +c_utils_embedded= +AC_SUBST([c_utils_prefix]) +AC_SUBST([c_utils_embedded]) + +if test "X$with_c_utils" = "Xyes"; then + with_c_utils="/usr" +fi + +if test "X$with_c_utils" = "Xembedded" ; then + c_utils_embedded=1 + old_ac_configure_args="$ac_configure_args" + ac_configure_args="$ac_configure_arge --disable-shared" + AC_CONFIG_SUBDIRS([src/c-utils]) + ac_configure_args="$old_ac_configure_args" +else + CPPFLAGS="-I${with_c_utils}/include" + LDFLAGS="-L${with_c_utils}/lib" + AC_CHECK_HEADER([c-utils-common.h],[], + [AC_MSG_ERROR([Could not find c-utils at prefix + ${with_c_utils}!])]) + AC_CHECK_LIB([c-utils],[bj_hashlittle2],[], + [AC_MSG_ERROR([Could not find useable + C-Utils library at prefix ${with_c_utils}!])]) +fi dnl ========================================================================= dnl == OpenPA =============================================================== @@ -82,9 +139,7 @@ dnl ========================================================================= # OpenPA AC_ARG_WITH([openpa], [AS_HELP_STRING([[--with-openpa[=DIR]]], - [rather than the one included in src/openpa. Pass - "embedded" to force usage of the OpenPA source - distributed with triton.])], + [Use OpenPA installed in DIR])], [], [ OLDLIBS="$LIBS" @@ -97,7 +152,7 @@ OPA_store_int(&i,10); OPA_fetch_and_incr_int(&i); ])dnl ], - [with_openpa=system], + [with_openpa="/usr"], [with_openpa="/usr"]) LIBS="$OLDLIBS" ]) @@ -105,41 +160,16 @@ OPA_fetch_and_incr_int(&i); opadir="" AC_SUBST([opadir]) -if test "$with_openpa" = "embedded" ; then - AC_MSG_ERROR([Embedded mode disabled for OpenPA!]) - if test -e "${srcdir}/extern/openpa" ; then - opadir="openpa" - EXTERNAL_SRC_DIRS="$EXTERNAL_SRC_DIRS extern/openpa" - CPPFLAGS="-I${srcdir}/extern/openpa/src $CPPFLAGS" - AC_CONFIG_SUBDIRS([extern/openpa]) - LIBS="-lopa $LIBS" - else - AC_MSG_WARN([Attempted to use the embedded OpenPA source tree in dnl - "${srcdir}/extern/openpa", but it is missing. - Configuration or dnl - compilation may fail later.]) dnl - fi -elif test "$with_openpa" = "system" ; then - dummy="dummy"; - dnl LIBS="-lopa $LIBS" -elif test "$with_openpa" = "no" ; then - AC_MSG_ERROR([OpenPA is required!]) -else - # The user specified an already-installed OPA; just sanity check, don't - # subconfigure it - AS_IF([test -s "${with_openpa}/include/opa_primitives.h" -a -s "${with_openpa}/include/opa_config.h"], +AS_IF([test -s "${with_openpa}/include/opa_primitives.h" -a \ + -s "${with_openpa}/include/opa_config.h"], [:],[AC_MSG_ERROR([the OpenPA installation in "${with_openpa}" appears broken])]) - CPPFLAGS="-I${with_openpa}/include $CPPFLAGS" -dnl CPPFLAGS="-I${ac_top_build_prefix}/extern/openpa" -dnl LIBS="-lopa $LIBS" - LDFLAGS="-L${with_openpa}/lib $LDFLAGS" -fi +CPPFLAGS="-I${with_openpa}/include $CPPFLAGS" +LDFLAGS="-L${with_openpa}/lib $LDFLAGS" -AC_CHECK_LIB([opa],[OPA_Queue_init],[],[AC_MSG_ERROR([Could not find useable - OpenPA library!])]) -dnl AC_SUBST([subdirs]) +AC_CHECK_LIB([opa],[OPA_Queue_init],[], + [AC_MSG_ERROR([Could not find useable OpenPA library!])]) dnl ========================================================================= dnl == Google's PerfTools =================================================== diff --git a/hints.h b/hints.h index 704f42f..d026812 100644 --- a/hints.h +++ b/hints.h @@ -8,8 +8,8 @@ #define __AE_HINTS_H__ // #include <triton-base.h> -#include <aesop/triton-list.h> -#include <aesop/triton-thread.h> +#include <triton-list.h> +#include <triton-thread.h> struct ae_hints { diff --git a/maint/hs/setup-cabal-local b/maint/hs/setup-cabal-local index 62d98cf..107a19a 100755 --- a/maint/hs/setup-cabal-local +++ b/maint/hs/setup-cabal-local @@ -4,8 +4,14 @@ # Installs cabal locally # Use apt-get install cabal-install to install globally +# Note: some files are in $HOME/.cabal, some things are in $HOME/.ghc/ + +DIR=$(mktemp -d) +pushd $DIR wget -c http://www.haskell.org/cabal/release/cabal-install-0.14.0/cabal-install-0.14... tar xvfz cabal-install-0.14.0.tar.gz cd cabal-install-0.14.0 sh ./bootstrap.sh +popd + diff --git a/maint/jenkins/build.sh b/maint/jenkins/build.sh new file mode 100755 index 0000000..f909fc9 --- /dev/null +++ b/maint/jenkins/build.sh @@ -0,0 +1,82 @@ +#!/bin/sh + +# get root +SRC_ROOT=$PWD + +BUILD_ROOT=$PWD/build +INSTALL_ROOT=$PWD/install + +CONFIGURE_OPTS= + +#============================================================== + +if ! test -d ${BUILD_ROOT} ; then +mkdir $BUILD_ROOT || exit 2 +fi +if ! test -d ${INSTALL_ROOT} ; then +mkdir $INSTALL_ROOT || exit 2 +fi + +#============================================================== +#==== AESOP Dependencies ====================================== +#============================================================== + + +#------------------ +# Install OpenPA +#------------------ + +OPENPA=${BUILD_ROOT}/openpa +./maint/jenkins/install-openpa.sh $OPENPA || exit 6 +CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-openpa=${OPENPA}" + +#------------------ +# Install c-utils +#------------------ + +CUTILS=${BUILD_ROOT}/c-utils +./maint/jenkins/install-c-utils.sh $CUTILS || exit 7 +CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-c-utils=${CUTILS}" + + +#------------------------------------------------------------ +# check if we have cabal & Haskell Libs +#------------------------------------------------------------ + +CABAL=$(which cabal) +if test -z $CABAL; then + ./maint/hs/setup-cabal-local || exit 3 + export PATH=$PATH:$HOME/.cabal/bin + CABAL=$(which cabal) + if test -z $CABAL; then + echo "Error installing cabal!" > /dev/stderr + exit 3 + fi +fi + +# Get HS packages +./maint/hs/setup-hs-local || exit 4 + +# Get modified Language.C +./maint/hs/setup-aesop || exit 5 + +#=============================================================== +# Build AESOP +#=============================================================== + +# Configure Aesop +CONFIGURE_OPTS="${CONFIGURE_OPTS} --prefix=${INSTALL_ROOT}" + +# Generate build system files +./prepare || exit 2 +BUILD_DIR=${SRC_ROOT} # no-VPATH +BUILD_DIR=${BUILD_ROOT} # VPATH + +cd ${BUILD_ROOT} +${SRC_ROOT}/configure ${CONFIGURE_OPTS} + +# make +make + +# check +make check diff --git a/maint/jenkins/install-c-utils.sh b/maint/jenkins/install-c-utils.sh new file mode 100755 index 0000000..3ebf044 --- /dev/null +++ b/maint/jenkins/install-c-utils.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +REF=master + +PREFIX=$1 +if test -z $PREFIX; then + echo "Need destination prefix!" > /dev/stderr + exit 1 +fi + +TMPDIR=$(mktemp -d) +git clone -b ${REF} git://git.mcs.anl.gov/c-utils $TMPDIR +pushd $TMPDIR +./prepare +./configure --disable-shared --prefix=${PREFIX} && make && make install || exit 1 +popd + + diff --git a/maint/jenkins/install-openpa.sh b/maint/jenkins/install-openpa.sh new file mode 100755 index 0000000..dfe8daf --- /dev/null +++ b/maint/jenkins/install-openpa.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +VERSION=1.0.4 +FILE=openpa-${VERSION}.tar.gz + +PREFIX=$1 +if test -z $PREFIX; then + echo "Need destination prefix!" > /dev/stderr + exit 1 +fi + +TMPDIR=$(mktemp -d) +pushd $TMPDIR +wget -c http://trac.mcs.anl.gov/projects/openpa/raw-attachment/wiki/Downloads/${FILE} +tar -xvzf $FILE +cd openpa-${VERSION} +./configure --prefix=${PREFIX} && make && make install || exit 1 +popd + + diff --git a/op.h b/op.h index d0f65af..5f264e7 100644 --- a/op.h +++ b/op.h @@ -9,7 +9,7 @@ #define __OP_H__ #include "aesop.h" -#include <aesop/triton-list.h> +#include <triton-list.h> #include <stdint.h> diff --git a/parser/tests/blocking/btest-impl.c b/parser/tests/blocking/btest-impl.c index 78ede74..ae562ed 100644 --- a/parser/tests/blocking/btest-impl.c +++ b/parser/tests/blocking/btest-impl.c @@ -11,7 +11,7 @@ #include <assert.h> #include <pthread.h> #include "aesop.h" -#include "triton-list.h" +#include <triton-list.h> #include "parser/tests/blocking/btest.h" #include "resource.h" diff --git a/prepare b/prepare index 75f7fc2..9b83190 100755 --- a/prepare +++ b/prepare @@ -1,5 +1,11 @@ #!/bin/bash +if ! test -e src/c-utils/prepare ; then + echo "Can't find c-utils source. Did you remember to checkout the" + echo "submodule? (git submodule init && git submodule update)" + exit 2 +fi + echo "preparing src/c-utils:" cd src/c-utils ./prepare diff --git a/resource.c b/resource.c index 48e9687..46e2fb1 100644 --- a/resource.c +++ b/resource.c @@ -4,7 +4,7 @@ * See COPYRIGHT in top-level directory. */ -#include "libev/ev.h" +#include <ev.h> #include <stddef.h> #include <unistd.h> #include <fcntl.h> diff --git a/resource.h b/resource.h index 48f952d..e2c944b 100644 --- a/resource.h +++ b/resource.h @@ -11,10 +11,10 @@ #include "ae-error.h" #include "ae-ctl.h" #include "hints.h" -#include "triton-uint128.h" -#include "triton-thread.h" -#include "triton-list.h" -#include "triton-string.h" +#include <triton-uint128.h> +#include <triton-thread.h> +#include <triton-list.h> +#include <triton-string.h> #define AE_MAX_CONTEXTS 1024 diff --git a/resources/sem/sem.hae b/resources/sem/sem.hae index 46e5a60..22dbd2c 100644 --- a/resources/sem/sem.hae +++ b/resources/sem/sem.hae @@ -8,7 +8,7 @@ #define AESOP_SEM_SEM_HAE #include "aesop.h" -#include "triton-thread.h" +#include <triton-thread.h> #include "resource.h" #include "op.h" diff --git a/resources/worker/worker.c b/resources/worker/worker.c index d6f436f..0ec5de2 100644 --- a/resources/worker/worker.c +++ b/resources/worker/worker.c @@ -1,6 +1,6 @@ #include "worker.h" -#include "triton-list.h" -#include "triton-thread.h" +#include <triton-list.h> +#include <triton-thread.h> #include "resource.h" struct aesop_worker_t diff --git a/src/aebdb/aebdb.ae b/src/aebdb/aebdb.ae index 0c6a775..ca765cc 100644 --- a/src/aebdb/aebdb.ae +++ b/src/aebdb/aebdb.ae @@ -35,7 +35,7 @@ #include "src/aebdb/aebdb.hae" #include "resources/thread/aethread.hae" #include "resources/sem/sem.hae" -#include "src/c-utils/triton-hash.h" +#include <triton-hash.h> static struct aethread_group* general_thread_group = NULL; static triton_mutex_t module_lock = TRITON_MUTEX_INITIALIZER; diff --git a/src/c-utils b/src/c-utils index dd55918..1125ad8 160000 --- a/src/c-utils +++ b/src/c-utils @@ -1 +1 @@ -Subproject commit dd55918cf621cb0767dd2351830e150310a4d20e +Subproject commit 1125ad81fbf40f246f71d976d5904ce52c1eb762 diff --git a/src/socket/aesocket.ae b/src/socket/aesocket.ae index ef46ebd..8cfb5a0 100644 --- a/src/socket/aesocket.ae +++ b/src/socket/aesocket.ae @@ -12,7 +12,7 @@ #include <signal.h> #include <errno.h> -#include "libev/ev.h" +#include <ev.h> #include <aesop/resourcebuilder.hae> /** diff --git a/src/timer/timer.ae b/src/timer/timer.ae index 35f302c..332e2ea 100644 --- a/src/timer/timer.ae +++ b/src/timer/timer.ae @@ -7,7 +7,7 @@ #include <sys/time.h> #include <aesop/timer.hae> -#include <aesop/triton-list.h> +#include <triton-list.h> #include <aesop/sem.hae> #include <pthread.h> hooks/post-receive --