diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-28 10:48:17 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-28 10:48:17 +0200 |
commit | 3c43c863f18f2f77120a0b27a8ef8beae63080e8 (patch) | |
tree | 2f532c009bb7db906e6f9ef497074fedbdb54225 | |
parent | dcd608b9c4f256c92db5ad7824462bbc78386125 (diff) |
use VESPA_HOME
-rwxr-xr-x | vespabase/src/start-cbinaries.sh | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh index 40e859f7b9e..341bce0e192 100755 --- a/vespabase/src/start-cbinaries.sh +++ b/vespabase/src/start-cbinaries.sh @@ -83,7 +83,7 @@ configure_valgrind () { if which valgrind >/dev/null; then if check_bname_in_value $VESPA_USE_VALGRIND; then no_valgrind=false - valgrind_log=/home/y/tmp/valgrind.$bname.log.$$ + valgrind_log=$VESPA_HOME/tmp/valgrind.$bname.log.$$ case $VESPA_VALGRIND_OPT in *callgrind*) use_callgrind=true;; esac @@ -99,22 +99,22 @@ configure_huge_pages () { } configure_use_madvise () { - for f in $VESPA_USE_MADVISE_LIST - do - # log_debug_message "Testing '$f'" - app=`echo $f | cut -d '=' -f1` - limit=`echo $f | cut -d '=' -f2` - if [ "$app" = "$bname" ]; then - log_debug_message "I ($bname) shall use madvise with limit $limit, as set in VESPA_USE_MADVISE_LIST" - export VESPA_MALLOC_MADVISE_LIMIT="$limit" - break - fi - - if [ "$app" = "all" ]; then - log_debug_message "I shall use madvise with limit $limit, as VESPA_USE_MADVISE_LIST is 'all'" - export VESPA_MALLOC_MADVISE_LIMIT="$limit" - fi - done + for f in $VESPA_USE_MADVISE_LIST + do + # log_debug_message "Testing '$f'" + app=`echo $f | cut -d '=' -f1` + limit=`echo $f | cut -d '=' -f2` + if [ "$app" = "$bname" ]; then + log_debug_message "I ($bname) shall use madvise with limit $limit, as set in VESPA_USE_MADVISE_LIST" + export VESPA_MALLOC_MADVISE_LIMIT="$limit" + break + fi + + if [ "$app" = "all" ]; then + log_debug_message "I shall use madvise with limit $limit, as VESPA_USE_MADVISE_LIST is 'all'" + export VESPA_MALLOC_MADVISE_LIMIT="$limit" + fi + done } configure_vespa_malloc () { @@ -136,10 +136,10 @@ configure_vespa_malloc () { tryfile="${VESPA_HOME}/${pre}/${suf}" if [ -f "$tryfile" ]; then LD_PRELOAD="$tryfile" - log_debug_message "Using LD_PRELOAD='$tryfile'" + log_debug_message "Using LD_PRELOAD='$tryfile'" if [ "$VESPA_USE_HUGEPAGES" ]; then export VESPA_MALLOC_HUGEPAGES="$VESPA_USE_HUGEPAGES" - log_debug_message "enabling hugepages for '$0-bin'." + log_debug_message "enabling hugepages for '$0-bin'." fi break fi |