diff options
Diffstat (limited to 'benchmarks/lmbench/patches')
-rw-r--r-- | benchmarks/lmbench/patches/patch-af | 35 | ||||
-rw-r--r-- | benchmarks/lmbench/patches/patch-ag | 11 | ||||
-rw-r--r-- | benchmarks/lmbench/patches/patch-ah | 10 | ||||
-rw-r--r-- | benchmarks/lmbench/patches/patch-ai | 8 | ||||
-rw-r--r-- | benchmarks/lmbench/patches/patch-aj | 4 |
5 files changed, 35 insertions, 33 deletions
diff --git a/benchmarks/lmbench/patches/patch-af b/benchmarks/lmbench/patches/patch-af index ca7fffca509..a0a5b1fb33c 100644 --- a/benchmarks/lmbench/patches/patch-af +++ b/benchmarks/lmbench/patches/patch-af @@ -1,4 +1,5 @@ -$NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $ +$NetBSD: patch-af,v 1.3 2006/08/31 18:04:08 rillig Exp $ + --- scripts/config-run.orig Fri Jul 31 12:55:19 1998 +++ scripts/config-run Sun Aug 30 08:08:52 1998 @@ -3,7 +3,7 @@ @@ -6,7 +7,7 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $ # 1.23 98/07/31 lm@lm.bitmover.com -OS=`../scripts/os` -+OS=`@PREFIX@/bin/lmbench/os` ++OS=`@PREFIX@/libexec/lmbench/os` L='=====================================================================' echo $L; cat<<EOF; @@ -16,24 +17,24 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $ echo "Hang on, we are calculating your timing granularity." -../bin/$OS/msleep 250 -ENOUGH=`../bin/$OS/enough` -+@PREFIX@/bin/lmbench/msleep 250 -+ENOUGH=`@PREFIX@/bin/lmbench/enough` ++@PREFIX@/libexec/lmbench/msleep 250 ++ENOUGH=`@PREFIX@/libexec/lmbench/enough` export ENOUGH echo "OK, it looks like you can time stuff down to $ENOUGH usec resolution." echo "" echo "Hang on, we are calculating your timing overhead." -../bin/$OS/msleep 250 -TIMING_O=`../bin/$OS/timing_o` -+@PREFIX@/bin/lmbench/msleep 250 -+TIMING_O=`@PREFIX@/bin/lmbench/timing_o` ++@PREFIX@/libexec/lmbench/msleep 250 ++TIMING_O=`@PREFIX@/libexec/lmbench/timing_o` export TIMING_O echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs." echo "" echo "Hang on, we are calculating your loop overhead." -../bin/$OS/msleep 250 -LOOP_O=`../bin/$OS/loop_o` -+@PREFIX@/bin/lmbench/msleep 250 -+LOOP_O=`@PREFIX@/bin/lmbench/loop_o` ++@PREFIX@/libexec/lmbench/msleep 250 ++LOOP_O=`@PREFIX@/libexec/lmbench/loop_o` export LOOP_O echo "OK, it looks like your benchmark loop costs $LOOP_O usecs." echo "" @@ -44,9 +45,9 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $ -AVAILMEM=`../bin/$OS/memsize $MB` -AVAILMEM=`../bin/$OS/memsize $MB` -AVAILMEM=`../bin/$OS/memsize $MB` -+AVAILMEM=`@PREFIX@/bin/lmbench/memsize $MB` -+AVAILMEM=`@PREFIX@/bin/lmbench/memsize $MB` -+AVAILMEM=`@PREFIX@/bin/lmbench/memsize $MB` ++AVAILMEM=`@PREFIX@/libexec/lmbench/memsize $MB` ++AVAILMEM=`@PREFIX@/libexec/lmbench/memsize $MB` ++AVAILMEM=`@PREFIX@/libexec/lmbench/memsize $MB` if [ $AVAILMEM -lt 8 ] then echo $0 aborted: Not enough memory, only ${AVAILMEM}MB available. exit 1 @@ -55,7 +56,7 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $ for i in $disks do if [ -r $i ] - then ../bin/$OS/flushdisk $i -+ then @PREFIX@/bin/lmbench/flushdisk $i ++ then @PREFIX@/libexec/lmbench/flushdisk $i if [ $? -eq 1 ] then echo "Must be root to run disk benchmarks." echo "Root is needed to flush the buffer cache" @@ -64,7 +65,7 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $ echo "" echo "Calculating mhz, please wait for a moment..." -MHZ=`../bin/$OS/mhz` -+MHZ=`@PREFIX@/bin/lmbench/mhz` ++MHZ=`@PREFIX@/libexec/lmbench/mhz` cat > /dev/tty <<EOF I think your CPU mhz is @@ -73,13 +74,13 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $ esac -INFO=`../scripts/info` -+INFO=`@PREFIX@/bin/lmbench/info` ++INFO=`@PREFIX@/libexec/lmbench/info` if [ $MAIL = yes ] -then if [ ! -f ../bin/$OS/$INFO ] - then cp ../scripts/info-template ../bin/$OS/$INFO - chmod +w ../bin/$OS/$INFO +then if [ ! -f $INFO ] -+ then cp @PREFIX@/bin/lmbench/info-template @PREFIX@/share/lmbench/$INFO ++ then cp @PREFIX@/libexec/lmbench/info-template @PREFIX@/share/lmbench/$INFO + chmod +w @PREFIX@/share/lmbench/$INFO REUSE=no else @@ -107,8 +108,8 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $ EOF -VERSION=`../scripts/version` -+VERSION=`@PREFIX@/bin/lmbench/version` -+CONFIG=@PREFIX@/share/lmbench/`@PREFIX@/bin/lmbench/config` ++VERSION=`@PREFIX@/libexec/lmbench/version` ++CONFIG=@PREFIX@/share/lmbench/`@PREFIX@/libexec/lmbench/config` -cat<<EOF > ../bin/$OS/`../scripts/config` +cat <<EOF >$CONFIG diff --git a/benchmarks/lmbench/patches/patch-ag b/benchmarks/lmbench/patches/patch-ag index 08719e79172..60a0baf6653 100644 --- a/benchmarks/lmbench/patches/patch-ag +++ b/benchmarks/lmbench/patches/patch-ag @@ -1,4 +1,5 @@ -$NetBSD: patch-ag,v 1.2 1998/09/24 08:45:00 agc Exp $ +$NetBSD: patch-ag,v 1.3 2006/08/31 18:04:08 rillig Exp $ + --- scripts/os.orig Sun Aug 30 05:38:55 1998 +++ scripts/os Sun Aug 30 05:40:06 1998 @@ -1,10 +1,10 @@ @@ -7,12 +8,12 @@ $NetBSD: patch-ag,v 1.2 1998/09/24 08:45:00 agc Exp $ OS=bloat-os -if [ -f ../scripts/gnu-os ] -then OS=`../scripts/gnu-os | sed s/unknown-//` -+if [ -f @PREFIX@/bin/lmbench/gnu-os ] -+then OS=`@PREFIX@/bin/lmbench/gnu-os | sed s/unknown-//` ++if [ -f @PREFIX@/libexec/lmbench/gnu-os ] ++then OS=`@PREFIX@/libexec/lmbench/gnu-os | sed s/unknown-//` fi -if [ -f ../../scripts/gnu-os ] -then OS=`../../scripts/gnu-os | sed s/unknown-//` -+if [ -f @PREFIX@/bin/lmbench/gnu-os ] -+then OS=`@PREFIX@/bin/lmbench/gnu-os | sed s/unknown-//` ++if [ -f @PREFIX@/libexec/lmbench/gnu-os ] ++then OS=`@PREFIX@/libexec/lmbench/gnu-os | sed s/unknown-//` fi echo $OS diff --git a/benchmarks/lmbench/patches/patch-ah b/benchmarks/lmbench/patches/patch-ah index abbbbcf92d1..3eea1cb5fa0 100644 --- a/benchmarks/lmbench/patches/patch-ah +++ b/benchmarks/lmbench/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.4 2005/05/23 08:55:56 rillig Exp $ +$NetBSD: patch-ah,v 1.5 2006/08/31 18:04:08 rillig Exp $ --- scripts/results.orig Fri Jul 31 21:55:19 1998 +++ scripts/results Mon Nov 15 14:19:57 1999 @@ -7,8 +7,8 @@ $NetBSD: patch-ah,v 1.4 2005/05/23 08:55:56 rillig Exp $ -CONFIG=`../scripts/config` -RESULTS=results/$OS -BASE=../$RESULTS/`uname -n` -+OS=`@PREFIX@/bin/lmbench/os` -+CONFIG=`@PREFIX@/bin/lmbench/config` ++OS=`@PREFIX@/libexec/lmbench/os` ++CONFIG=`@PREFIX@/libexec/lmbench/config` +RESULTS=@PREFIX@/share/lmbench/results/$OS +BASE=$RESULTS/`uname -n` EXT=0 @@ -40,7 +40,7 @@ $NetBSD: patch-ah,v 1.4 2005/05/23 08:55:56 rillig Exp $ while [ $SYNC_PID -le $SYNC_MAX ] do echo Results $SYNC_PID going to ${RESULTS}.$SYNC_PID - ../../scripts/lmbench $CONFIG 2>../${RESULTS}.$SYNC_PID & -+ @PREFIX@/bin/lmbench/lmbench @PREFIX@/share/lmbench/$CONFIG 2>${RESULTS}.$SYNC_PID & ++ @PREFIX@/libexec/lmbench/lmbench @PREFIX@/share/lmbench/$CONFIG 2>${RESULTS}.$SYNC_PID & SYNC_PID=`expr $SYNC_PID + 1` done; wait else echo Results going to ${RESULTS} @@ -48,7 +48,7 @@ $NetBSD: patch-ah,v 1.4 2005/05/23 08:55:56 rillig Exp $ SYNC_MAX=1 export SYNC_PID SYNC_MAX - ../../scripts/lmbench $CONFIG 2>../${RESULTS} -+ @PREFIX@/bin/lmbench/lmbench @PREFIX@/share/lmbench/$CONFIG 2>${RESULTS} ++ @PREFIX@/libexec/lmbench/lmbench @PREFIX@/share/lmbench/$CONFIG 2>${RESULTS} fi if [ X$MAIL = Xyes ] diff --git a/benchmarks/lmbench/patches/patch-ai b/benchmarks/lmbench/patches/patch-ai index 7407a3fe0af..f669ddee0ae 100644 --- a/benchmarks/lmbench/patches/patch-ai +++ b/benchmarks/lmbench/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.4 2005/05/23 08:55:56 rillig Exp $ +$NetBSD: patch-ai,v 1.5 2006/08/31 18:04:08 rillig Exp $ --- scripts/lmbench.orig Fri Jul 31 21:55:19 1998 +++ scripts/lmbench Mon Nov 15 14:21:29 1999 @@ -6,7 +6,7 @@ $NetBSD: patch-ai,v 1.4 2005/05/23 08:55:56 rillig Exp $ # Make sure we can find: ./cmd, df, and netstat -PATH=.:../../scripts:$PATH:/etc:/usr/etc:/sbin:/usr/sbin -+PATH=.:@PREFIX@/bin/lmbench:$PATH:/etc:/usr/etc:/sbin:/usr/sbin ++PATH=.:@PREFIX@/libexec/lmbench:$PATH:/etc:/usr/etc:/sbin:/usr/sbin export PATH if [ -f $1 ] @@ -15,10 +15,10 @@ $NetBSD: patch-ai,v 1.4 2005/05/23 08:55:56 rillig Exp $ lat_unix if [ $MP = Y ] -then if [ $SYNC_MAX = $SYNC_PID ]; then cp hello /tmp/hello; fi -+then if [ $SYNC_MAX = $SYNC_PID ]; then cp @PREFIX@/bin/lmbench/hello /tmp/hello; fi ++then if [ $SYNC_MAX = $SYNC_PID ]; then cp @PREFIX@/libexec/lmbench/hello /tmp/hello; fi synchronize $SYNC/lat_proc -else cp hello /tmp/hello -+else cp @PREFIX@/bin/lmbench/hello /tmp/hello ++else cp @PREFIX@/libexec/lmbench/hello /tmp/hello fi lat_proc fork lat_proc exec diff --git a/benchmarks/lmbench/patches/patch-aj b/benchmarks/lmbench/patches/patch-aj index eb559ca64ee..c792b970669 100644 --- a/benchmarks/lmbench/patches/patch-aj +++ b/benchmarks/lmbench/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.2 1998/09/24 08:45:00 agc Exp $ +$NetBSD: patch-aj,v 1.3 2006/08/31 18:04:08 rillig Exp $ --- results/Makefile.orig Sun Aug 30 09:20:26 1998 +++ results/Makefile Sun Aug 30 09:23:43 1998 @@ -49,7 +49,7 @@ @@ -6,7 +6,7 @@ $NetBSD: patch-aj,v 1.2 1998/09/24 08:45:00 agc Exp $ SHELL=/bin/sh -SCRIPTS=../scripts/ -+SCRIPTS=@PREFIX@/bin/lmbench/ ++SCRIPTS=@PREFIX@/libexec/lmbench/ MISC= tmp/misc_mhz.bg \ tmp/lat_ctx.bg \ |