summaryrefslogtreecommitdiff
path: root/benchmarks/lmbench/patches
diff options
context:
space:
mode:
Diffstat (limited to 'benchmarks/lmbench/patches')
-rw-r--r--benchmarks/lmbench/patches/patch-aa21
-rw-r--r--benchmarks/lmbench/patches/patch-ab9
-rw-r--r--benchmarks/lmbench/patches/patch-ac10
-rw-r--r--benchmarks/lmbench/patches/patch-ad13
-rw-r--r--benchmarks/lmbench/patches/patch-ae13
-rw-r--r--benchmarks/lmbench/patches/patch-af117
-rw-r--r--benchmarks/lmbench/patches/patch-ag18
-rw-r--r--benchmarks/lmbench/patches/patch-ah71
-rw-r--r--benchmarks/lmbench/patches/patch-ai70
-rw-r--r--benchmarks/lmbench/patches/patch-aj12
10 files changed, 354 insertions, 0 deletions
diff --git a/benchmarks/lmbench/patches/patch-aa b/benchmarks/lmbench/patches/patch-aa
new file mode 100644
index 00000000000..1cd04e1bd81
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 1998/08/30 17:46:26 garbled Exp $
+--- src/Makefile.orig Fri Jul 31 12:55:18 1998
++++ src/Makefile Sun Aug 30 06:32:41 1998
+@@ -30,7 +30,7 @@
+ O= ../bin/unknown
+ D= ../doc
+ TRUE=/bin/true
+-OS=`../scripts/os`
++OS=`../scripts/os.orig`
+ TARGET=`../scripts/target`
+ BINDIR=../bin/$(OS)
+ CONFIG=../bin/$(OS)/`../scripts/config`
+@@ -130,7 +130,7 @@
+
+ bsd:
+ @if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
+- $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -Duint='unsigned int'" all
++ $(MAKE) CC="$(CC)" all
+
+ Wall:
+ @if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
diff --git a/benchmarks/lmbench/patches/patch-ab b/benchmarks/lmbench/patches/patch-ab
new file mode 100644
index 00000000000..94fab813c6e
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-ab
@@ -0,0 +1,9 @@
+$NetBSD: patch-ab,v 1.1 1998/08/30 17:46:26 garbled Exp $
+--- src/lib_tcp.h.orig Sat Aug 29 12:49:25 1998
++++ src/lib_tcp.h Sat Aug 29 12:49:49 1998
+@@ -11,5 +11,4 @@
+ void sock_optimize(int sock, int rdwr);
+ int sockport(int s);
+ u_short pmap_getport(struct sockaddr_in *addr, u_long prognum, u_long versnum, u_int protocol);
+-bool_t pmap_set(u_long prognum, u_long versnum, u_long protocol, u_short port);
+ bool_t pmap_unset(u_long prognum, u_long versnum);
diff --git a/benchmarks/lmbench/patches/patch-ac b/benchmarks/lmbench/patches/patch-ac
new file mode 100644
index 00000000000..ab37298d371
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 1998/08/30 17:46:26 garbled Exp $
+--- src/lib_udp.h.orig Sat Aug 29 12:50:41 1998
++++ src/lib_udp.h Sat Aug 29 12:50:53 1998
+@@ -9,6 +9,5 @@
+ int udp_connect(char *host, u_long prog, int rdwr);
+ void sock_optimize(int sock, int rdwr);
+ int sockport(int);
+-bool_t pmap_set(u_long prognum, u_long versnum, u_long protocol, u_short port);
+ bool_t pmap_unset(u_long prognum, u_long versnum);
+
diff --git a/benchmarks/lmbench/patches/patch-ad b/benchmarks/lmbench/patches/patch-ad
new file mode 100644
index 00000000000..6b61ab3cda6
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 1998/08/30 17:46:26 garbled Exp $
+--- src/lat_rpc.c.orig Sat Aug 29 12:59:45 1998
++++ src/lat_rpc.c Sat Aug 29 13:00:08 1998
+@@ -132,7 +132,9 @@
+ }
+
+ static void xact_prog_1();
++#ifndef __NetBSD__
+ bool_t pmap_set(u_long prognum, u_long versnum, u_long protocol, u_short port);
++#endif
+ bool_t pmap_unset(u_long prognum, u_long versnum);
+
+ void
diff --git a/benchmarks/lmbench/patches/patch-ae b/benchmarks/lmbench/patches/patch-ae
new file mode 100644
index 00000000000..b4f91ceb59e
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 1998/08/30 17:46:26 garbled Exp $
+--- src/lmdd.c.orig Sat Aug 29 13:06:05 1998
++++ src/lmdd.c Sat Aug 29 13:17:06 1998
+@@ -797,7 +797,9 @@
+ oflags |= (notrunc || append) ? 0 : O_TRUNC;
+ oflags |= nocreate ? 0 : O_CREAT;
+ oflags |= append ? O_APPEND : 0;
++#if NetBSD > 199712
+ oflags |= osync ? O_SYNC : 0;
++#endif
+ ret = open(&av[i][len], oflags,0644);
+ #ifdef O_DIRECT
+ if ((getarg("odirect=", ac, av) != -1) ||
diff --git a/benchmarks/lmbench/patches/patch-af b/benchmarks/lmbench/patches/patch-af
new file mode 100644
index 00000000000..b0c6f103201
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-af
@@ -0,0 +1,117 @@
+$NetBSD: patch-af,v 1.1 1998/08/30 17:46:26 garbled 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 @@
+ # Configure parameters for lmbench.
+ # 1.23 98/07/31 lm@lm.bitmover.com
+
+-OS=`../scripts/os`
++OS=`XXXPREFIXXXX/bin/lmbench/os`
+ L='====================================================================='
+ echo $L;
+ cat<<EOF;
+@@ -36,20 +36,20 @@
+ ############################################################################
+ echo $L; echo "";
+ echo "Hang on, we are calculating your timing granularity."
+-../bin/$OS/msleep 250
+-ENOUGH=`../bin/$OS/enough`
++XXXPREFIXXXX/bin/lmbench/msleep 250
++ENOUGH=`XXXPREFIXXXX/bin/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`
++XXXPREFIXXXX/bin/lmbench/msleep 250
++TIMING_O=`XXXPREFIXXXX/bin/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`
++XXXPREFIXXXX/bin/lmbench/msleep 250
++LOOP_O=`XXXPREFIXXXX/bin/lmbench/loop_o`
+ export LOOP_O
+ echo "OK, it looks like your benchmark loop costs $LOOP_O usecs."
+ echo ""
+@@ -89,9 +89,9 @@
+ # Certain machines tend to barf when you try and bcopy 8MB.
+ # Figure out how much we can use.
+ echo "Checking to see if you have $MB MB; please wait for a moment..."
+-AVAILMEM=`../bin/$OS/memsize $MB`
+-AVAILMEM=`../bin/$OS/memsize $MB`
+-AVAILMEM=`../bin/$OS/memsize $MB`
++AVAILMEM=`XXXPREFIXXXX/bin/lmbench/memsize $MB`
++AVAILMEM=`XXXPREFIXXXX/bin/lmbench/memsize $MB`
++AVAILMEM=`XXXPREFIXXXX/bin/lmbench/memsize $MB`
+ if [ $AVAILMEM -lt 8 ]
+ then echo $0 aborted: Not enough memory, only ${AVAILMEM}MB available.
+ exit 1
+@@ -185,7 +185,7 @@
+ then
+ for i in $disks
+ do if [ -r $i ]
+- then ../bin/$OS/flushdisk $i
++ then XXXPREFIXXXX/bin/lmbench/flushdisk $i
+ if [ $? -eq 1 ]
+ then echo "Must be root to run disk benchmarks."
+ echo "Root is needed to flush the buffer cache"
+@@ -206,7 +206,7 @@
+ echo $L
+ echo ""
+ echo "Calculating mhz, please wait for a moment..."
+-MHZ=`../bin/$OS/mhz`
++MHZ=`XXXPREFIXXXX/bin/lmbench/mhz`
+ cat > /dev/tty <<EOF
+ I think your CPU mhz is
+
+@@ -363,11 +363,11 @@
+ ;;
+ esac
+
+-INFO=`../scripts/info`
++INFO=`XXXPREFIXXXX/bin/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 XXXPREFIXXXX/bin/lmbench/info-template XXXPREFIXXXX/share/lmbench/$INFO
++ chmod +w XXXPREFIXXXX/share/lmbench/$INFO
+ REUSE=no
+ else
+ REUSE=view
+@@ -381,7 +381,7 @@
+ ;;
+ [Vv]*) REUSE=view
+ echo $L
+- more ../bin/$OS/$INFO
++ more XXXPREFIXXXX/share/lmbench/$INFO
+ echo $L
+ ;;
+ *) REUSE=yes
+@@ -409,7 +409,7 @@
+ then EDITOR=$TMP
+ fi
+ if [ X$EDITOR != "none" ]
+- then $EDITOR ../bin/$OS/`../scripts/info`
++ then $EDITOR XXXPREFIXXXX/share/lmbench/`XXXPREFIXXXX/share/lmbench/info`
+ fi
+ fi
+ fi
+@@ -424,9 +424,10 @@
+
+ EOF
+
+-VERSION=`../scripts/version`
++VERSION=`XXXPREFIXXXX/bin/lmbench/version`
++CONFIG=XXXPREFIXXXX/share/lmbench/`XXXPREFIXXXX/bin/lmbench/config`
+
+-cat<<EOF > ../bin/$OS/`../scripts/config`
++cat <<EOF >$CONFIG
+ DISKS="$DISKS"
+ DISK_DESC="$DISK_DESC"
+ ENOUGH=$ENOUGH
diff --git a/benchmarks/lmbench/patches/patch-ag b/benchmarks/lmbench/patches/patch-ag
new file mode 100644
index 00000000000..3bd09b7dac9
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.1 1998/08/30 17:46:26 garbled Exp $
+--- scripts/os.orig Sun Aug 30 05:38:55 1998
++++ scripts/os Sun Aug 30 05:40:06 1998
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+
+ OS=bloat-os
+-if [ -f ../scripts/gnu-os ]
+-then OS=`../scripts/gnu-os | sed s/unknown-//`
++if [ -f XXXPREFIXXXX/bin/lmbench/gnu-os ]
++then OS=`XXXPREFIXXXX/bin/lmbench/gnu-os | sed s/unknown-//`
+ fi
+-if [ -f ../../scripts/gnu-os ]
+-then OS=`../../scripts/gnu-os | sed s/unknown-//`
++if [ -f XXXPREFIXXXX/bin/lmbench/gnu-os ]
++then OS=`XXXPREFIXXXX/bin/lmbench/gnu-os | sed s/unknown-//`
+ fi
+ echo $OS
diff --git a/benchmarks/lmbench/patches/patch-ah b/benchmarks/lmbench/patches/patch-ah
new file mode 100644
index 00000000000..6f25535b281
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-ah
@@ -0,0 +1,71 @@
+$NetBSD: patch-ah,v 1.1 1998/08/30 17:46:27 garbled Exp $
+--- scripts/results.orig Fri Jul 31 12:55:19 1998
++++ scripts/results Sun Aug 30 08:42:03 1998
+@@ -2,20 +2,20 @@
+
+ # $Id: patch-ah,v 1.1 1998/08/30 17:46:27 garbled Exp $
+
+-OS=`../scripts/os`
+-CONFIG=`../scripts/config`
+-RESULTS=results/$OS
+-BASE=../$RESULTS/`uname -n`
++OS=`XXXPREFIXXXX/bin/lmbench/os`
++CONFIG=`XXXPREFIXXXX/bin/lmbench/config`
++RESULTS=XXXPREFIXXXX/share/lmbench/results/$OS
++BASE=$RESULTS/`uname -n`
+ EXT=0
+
+-if [ ! -f "../bin/$OS/$CONFIG" ]
++if [ ! -f "XXXPREFIXXXX/share/lmbench/$CONFIG" ]
+ then echo "No config file?"
+ exit 1
+ fi
+-. ../bin/$OS/$CONFIG
++. XXXPREFIXXXX/share/lmbench/$CONFIG
+
+-if [ ! -d ../$RESULTS ]
+-then mkdir -p ../$RESULTS
++if [ ! -d $RESULTS ]
++then mkdir -p $RESULTS
+ fi
+ RESULTS=$BASE
+ while [ -f $RESULTS ]
+@@ -23,33 +23,33 @@
+ RESULTS=$BASE.$EXT
+ done
+
+-cd ../bin/$OS
++cd XXXPREFIXXXX/share/lmbench/results/$OS
+ if [ "X$SYNC_MAX" = X ]; then echo "No SYNC_MAX variable."; exit 1; fi
+ if [ $SYNC_MAX -gt 1 ]
+ then SYNC_PID=1; export SYNC_PID
+ while [ $SYNC_PID -le $SYNC_MAX ]
+ do echo Results $SYNC_PID going to ${RESULTS}.$SYNC_PID
+- ../../scripts/lmbench $CONFIG 2>../${RESULTS}.$SYNC_PID &
++ XXXPREFIXXXX/bin/lmbench/lmbench XXXPREFIXXXX/share/lmbench/$CONFIG 2>${RESULTS}.$SYNC_PID &
+ SYNC_PID=`expr $SYNC_PID + 1`
+ done; wait
+ else echo Results going to ${RESULTS}
+ SYNC_PID=1
+ SYNC_MAX=1
+ export SYNC_PID SYNC_MAX
+- ../../scripts/lmbench $CONFIG 2>../${RESULTS}
++ XXXPREFIXXXX/bin/lmbench/lmbench XXXPREFIXXXX/share/lmbench/$CONFIG 2>${RESULTS}
+ fi
+
+ if [ X$MAIL = Xyes ]
+ then echo Mailing results
+ if [ $SYNC_MAX -gt 1 ]
+ then (echo ---- $INFO ---; cat $INFO;
+- for i in ../${RESULTS}.*
++ for i in ${RESULTS}.*
+ do echo ---- $i ----; cat $i
+ done) | mail lmbench2@bitmover.com
+ else (echo ---- $INFO ---
+ cat $INFO
+ echo ---- $RESULTS ---
+- cat ../$RESULTS) | mail lmbench2@bitmover.com
++ cat $RESULTS) | mail lmbench2@bitmover.com
+ fi
+ fi
+ exit 0
diff --git a/benchmarks/lmbench/patches/patch-ai b/benchmarks/lmbench/patches/patch-ai
new file mode 100644
index 00000000000..2d5d35a2d2b
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-ai
@@ -0,0 +1,70 @@
+$NetBSD: patch-ai,v 1.1 1998/08/30 17:46:27 garbled Exp $
+--- scripts/lmbench.orig Fri Jul 31 12:55:19 1998
++++ scripts/lmbench Sun Aug 30 09:05:29 1998
+@@ -7,7 +7,7 @@
+ # $Id: patch-ai,v 1.1 1998/08/30 17:46:27 garbled Exp $
+
+ # Make sure we can find: ./cmd, df, and netstat
+-PATH=.:../../scripts:$PATH:/etc:/usr/etc:/sbin:/usr/sbin
++PATH=.:XXXPREFIXXXX/bin/lmbench:$PATH:/etc:/usr/etc:/sbin:/usr/sbin
+ export PATH
+
+ if [ -f $1 ]
+@@ -179,9 +179,9 @@
+ if [ $MP = Y ]; then synchronize $SYNC/lat_unix; fi
+ 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 XXXPREFIXXXX/bin/lmbench/hello /tmp/hello; fi
+ synchronize $SYNC/lat_proc
+-else cp hello /tmp/hello
++else cp XXXPREFIXXXX/bin/lmbench/hello /tmp/hello
+ fi
+ lat_proc fork
+ lat_proc exec
+@@ -225,14 +225,14 @@
+ if [ $SYNC_PID = $SYNC_MAX ]
+ then date > /dev/tty
+ echo Local networking > /dev/tty
+- if [ ! -d ../../src/webpage-lm ]
++ if [ ! -d XXXPREFIXXXX/share/lmbench/webpage-lm ]
+ then (cd ../../src && tar xf webpage-lm.tar)
+ sync
+ sleep 1
+ fi
+ SERVERS="lat_udp lat_tcp lat_rpc lat_connect bw_tcp"
+ for server in $SERVERS; do $server -s; done
+- DOCROOT=../../src/webpage-lm lmhttp 8008 &
++ DOCROOT=XXXPREFIXXXX/share/lmbench/webpage-lm lmhttp 8008 &
+ sleep 2;
+ for i in localhost
+ do
+@@ -246,14 +246,14 @@
+ bw_tcp $i
+ bw_tcp -$i
+ # I want a hot cache number
+- lat_http $i 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1
+- lat_http $i 8008 < ../../src/webpage-lm/URLS
++ lat_http $i 8008 < XXXPREFIXXXX/share/lmbench/webpage-lm/URLS > /dev/null 2>&1
++ lat_http $i 8008 < XXXPREFIXXXX/share/lmbench/webpage-lm/URLS
+ lat_http -$i 8008
+ done
+
+ for remote in $REMOTE
+ do echo Networking to $remote > /dev/tty
+- rcp $SERVERS lmhttp ../../src/webpage-lm.tar ${remote}:/tmp
++ rcp $SERVERS lmhttp XXXPREFIXXXX/share/lmbench/webpage-lm.tar ${remote}:/tmp
+ for server in $SERVERS
+ do $RSH $remote -n /tmp/$server -s &
+ done
+@@ -266,8 +266,8 @@
+ lat_connect $remote; lat_connect -$remote;
+ bw_tcp $remote; bw_tcp -$remote
+ # I want a hot cache number
+- lat_http $remote 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1
+- lat_http $remote 8008 < ../../src/webpage-lm/URLS
++ lat_http $remote 8008 < XXXPREFIXXXX/share/lmbench/webpage-lm/URLS > /dev/null 2>&1
++ lat_http $remote 8008 < XXXPREFIXXXX/share/lmbench/webpage-lm/URLS
+ lat_http -$remote 8008
+ RM=
+ for server in $SERVERS
diff --git a/benchmarks/lmbench/patches/patch-aj b/benchmarks/lmbench/patches/patch-aj
new file mode 100644
index 00000000000..84a3518ba14
--- /dev/null
+++ b/benchmarks/lmbench/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 1998/08/30 17:46:27 garbled Exp $
+--- results/Makefile.orig Sun Aug 30 09:20:26 1998
++++ results/Makefile Sun Aug 30 09:23:43 1998
+@@ -49,7 +49,7 @@
+ # Grrrrr
+ SHELL=/bin/sh
+
+-SCRIPTS=../scripts/
++SCRIPTS=XXXPREFIXXXX/bin/lmbench/
+
+ MISC= tmp/misc_mhz.bg \
+ tmp/lat_ctx.bg \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 06:51:47 +0000