From a88a6758cebe21db39b2019836ac2346c5ff190e Mon Sep 17 00:00:00 2001 From: Lisa Hsu Date: Thu, 17 Aug 2006 00:00:27 -0400 Subject: [PATCH] make tree rcS files reflect what we've been actually using in /dist. also, update all the rcS files so that they are in sync with the new linux-dist build system. configs/boot/devtime.rcS: configs/boot/iscsi-client.rcS: configs/boot/iscsi-server.rcS: configs/boot/micro_memlat.rcS: configs/boot/micro_stream.rcS: configs/boot/micro_tlblat.rcS: configs/boot/nat-netperf-maerts-client.rcS: configs/boot/nat-netperf-server.rcS: configs/boot/nat-netperf-stream-client.rcS: configs/boot/nat-spec-surge-client.rcS: configs/boot/nat-spec-surge-server.rcS: configs/boot/natbox-netperf.rcS: configs/boot/natbox-spec-surge.rcS: configs/boot/netperf-rr.rcS: configs/boot/netperf-server.rcS: configs/boot/netperf-stream-client.rcS: configs/boot/netperf-stream-nt-client.rcS: configs/boot/nfs-client-nhfsstone.rcS: configs/boot/nfs-client-tcp-smallb.rcS: configs/boot/nfs-client-tcp.rcS: configs/boot/nfs-client.rcS: configs/boot/nfs-server-nhfsstone.rcS: configs/boot/nfs-server.rcS: configs/boot/ping-client.rcS: configs/boot/ping-server.rcS: configs/boot/spec-surge-client.rcS: configs/boot/spec-surge-server.rcS: configs/boot/surge-client.rcS: configs/boot/surge-server.rcS: make tree rcS files reflect what we've been actually using in /dist. --HG-- extra : convert_revision : 48fe4fe71938ef9d029e428028a271242c8d2faa --- configs/boot/devtime.rcS | 3 +++ configs/boot/iscsi-client.rcS | 8 +++--- configs/boot/iscsi-server.rcS | 4 ++- configs/boot/micro_memlat.rcS | 3 ++- configs/boot/micro_stream.rcS | 2 +- configs/boot/micro_tlblat.rcS | 2 +- configs/boot/nat-netperf-maerts-client.rcS | 4 +-- configs/boot/nat-netperf-server.rcS | 4 +-- configs/boot/nat-netperf-stream-client.rcS | 4 +-- configs/boot/nat-spec-surge-client.rcS | 2 +- configs/boot/nat-spec-surge-server.rcS | 2 +- configs/boot/natbox-netperf.rcS | 4 +-- configs/boot/natbox-spec-surge.rcS | 4 +-- configs/boot/netperf-rr.rcS | 4 +-- configs/boot/netperf-server.rcS | 4 +-- configs/boot/netperf-stream-client.rcS | 4 +-- configs/boot/netperf-stream-nt-client.rcS | 31 +++++++--------------- configs/boot/nfs-client-nhfsstone.rcS | 4 +-- configs/boot/nfs-client-tcp-smallb.rcS | 4 +-- configs/boot/nfs-client-tcp.rcS | 4 +-- configs/boot/nfs-client.rcS | 4 +-- configs/boot/nfs-server-nhfsstone.rcS | 2 +- configs/boot/nfs-server.rcS | 15 ++++++++--- configs/boot/ping-client.rcS | 2 +- configs/boot/ping-server.rcS | 2 +- configs/boot/spec-surge-client.rcS | 4 +-- configs/boot/spec-surge-server.rcS | 6 ++--- configs/boot/surge-client.rcS | 4 +-- configs/boot/surge-server.rcS | 6 ++--- 29 files changed, 75 insertions(+), 71 deletions(-) diff --git a/configs/boot/devtime.rcS b/configs/boot/devtime.rcS index 91fddc20d..22a5469b8 100644 --- a/configs/boot/devtime.rcS +++ b/configs/boot/devtime.rcS @@ -1,3 +1,6 @@ +echo "switching cpus" +m5 switchcpu +echo "done" insmod /modules/devtime.ko dataAddr=0x9000004 count=100 rmmod devtime insmod /modules/devtime.ko dataAddr=0x1a0000300 count=100 diff --git a/configs/boot/iscsi-client.rcS b/configs/boot/iscsi-client.rcS index 51ed5a284..cfa87652e 100644 --- a/configs/boot/iscsi-client.rcS +++ b/configs/boot/iscsi-client.rcS @@ -59,7 +59,7 @@ node.cnx[0].iscsi.MaxRecvDataSegmentLength = 65536 #discovery.sendtargets.auth.password = aloha EOF -mount -t sysfs none /sys +#mount -t sysfs none /sys echo "" > /var/log/iscsi.log chmod 0600 /var/log/iscsi.log @@ -74,8 +74,10 @@ echo "/sbin/hotplug" > /proc/sys/kernel/hotplug echo "Starting iscsid..." /iscsi/iscsid -f & +sleep 1 + echo "Waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo "Attaching target..." /iscsi/iscsiadm -m discovery -t st -p 192.168.0.1 @@ -92,7 +94,7 @@ sleep 5 #PARAMS="-n 16 -s 32 -r 1 -c 50" # stable ~1.5 Gbps #PARAMS="-n 50 -s 32 -r 1 -c 50" # stable ~1.5 Gbps PARAMS="-n 50 -s 8 -r .666 -c 50" -COMMAND="/benchmarks/aio_bench/aio-bench $PARAMS -i 1000000 -C 50000 /dev/sda" +COMMAND="/benchmarks/aio-bench $PARAMS -i 1000000 -C 50000 /dev/sda" echo "Starting aio benchmark..." echo $COMMAND diff --git a/configs/boot/iscsi-server.rcS b/configs/boot/iscsi-server.rcS index 904368a4b..210f4eaef 100644 --- a/configs/boot/iscsi-server.rcS +++ b/configs/boot/iscsi-server.rcS @@ -49,8 +49,10 @@ echo -n "start enterprise target..." /iscsi/ietd -f & echo "done." +sleep 3 + echo "notifying client..." -echo "server ready" | /usr/bin/netcat -c 192.168.0.10 8000 +echo "server ready" | netcat -c 192.168.0.10 8000 echo "done" echo "starting bash shell..." diff --git a/configs/boot/micro_memlat.rcS b/configs/boot/micro_memlat.rcS index 50ee8efb3..3bf6b6b2b 100644 --- a/configs/boot/micro_memlat.rcS +++ b/configs/boot/micro_memlat.rcS @@ -1,3 +1,4 @@ -/benchmarks/micros/lmbench/bin/alphaev6-linux-gnu/lat_mem_rd 512 64 +m5 checkpoint 1 999999999 +/benchmarks/micros/lmbench/bin/alphaev6-linux-gnu/lat_mem_rd 64 m5 exit diff --git a/configs/boot/micro_stream.rcS b/configs/boot/micro_stream.rcS index 7b4c445c6..1cf3a7dc3 100644 --- a/configs/boot/micro_stream.rcS +++ b/configs/boot/micro_stream.rcS @@ -1,3 +1,3 @@ -/benchmarks/micros/stream +/benchmarks/micros/simstream m5 exit diff --git a/configs/boot/micro_tlblat.rcS b/configs/boot/micro_tlblat.rcS index ab05fd9ff..fd5fd53c1 100644 --- a/configs/boot/micro_tlblat.rcS +++ b/configs/boot/micro_tlblat.rcS @@ -1,3 +1,3 @@ -/benchmarks/micros/lmbench/bin/alphaev6-linux-gnu/lat_mem_rd_2MB 2 8192 +/benchmarks/micros/lmbench/bin/alphaev6-linux-gnu/lat_mem_rd_2MB 20 8192 m5 exit diff --git a/configs/boot/nat-netperf-maerts-client.rcS b/configs/boot/nat-netperf-maerts-client.rcS index ab66b7d4a..863766a6b 100644 --- a/configs/boot/nat-netperf-maerts-client.rcS +++ b/configs/boot/nat-netperf-maerts-client.rcS @@ -23,9 +23,9 @@ echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog echo -n "waiting for natbox..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 -BINARY=/benchmarks/netperf/netperf +BINARY=/benchmarks/netperf-bin/netperf TEST="TCP_MAERTS" SHORT_ARGS="-l -100k" LONG_ARGS="-k16384,0 -K16384,0 -- -m 65536 -M 65536 -s 262144 -S 262144" diff --git a/configs/boot/nat-netperf-server.rcS b/configs/boot/nat-netperf-server.rcS index 61b4bea7a..23b99a13a 100644 --- a/configs/boot/nat-netperf-server.rcS +++ b/configs/boot/nat-netperf-server.rcS @@ -21,11 +21,11 @@ echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog echo "running netserver..." -/benchmarks/netperf/netserver +/benchmarks/netperf-bin/netserver echo -n "signal natbox to begin..." sleep 5 -echo "server ready" | /usr/bin/netcat -c $NATBOX 8000 +echo "server ready" | netcat -c $NATBOX 8000 echo "done." echo "starting bash..." diff --git a/configs/boot/nat-netperf-stream-client.rcS b/configs/boot/nat-netperf-stream-client.rcS index e37b8e565..f20e92c5c 100644 --- a/configs/boot/nat-netperf-stream-client.rcS +++ b/configs/boot/nat-netperf-stream-client.rcS @@ -24,9 +24,9 @@ echo "modifying route table" route add default gw 10.0.0.1 echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 -BINARY=/benchmarks/netperf/netperf +BINARY=/benchmarks/netperf-bin/netperf TEST="TCP_STREAM" SHORT_ARGS="-l -100k" LONG_ARGS="-k16384,0 -K16384,0 -- -m 65536 -M 65536 -s 262144 -S 262144" diff --git a/configs/boot/nat-spec-surge-client.rcS b/configs/boot/nat-spec-surge-client.rcS index 67c831eb0..d26e38378 100644 --- a/configs/boot/nat-spec-surge-client.rcS +++ b/configs/boot/nat-spec-surge-client.rcS @@ -38,7 +38,7 @@ echo "changing route table..." route add default gw 10.0.0.1 echo "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo -n "running surge client..." /bin/bash -c "cd /benchmarks/surge && ./spec-m5 1 20 1 $SERVER 5 40000 1000000000 1000" diff --git a/configs/boot/nat-spec-surge-server.rcS b/configs/boot/nat-spec-surge-server.rcS index 279cd5652..0f462568c 100755 --- a/configs/boot/nat-spec-surge-server.rcS +++ b/configs/boot/nat-spec-surge-server.rcS @@ -49,7 +49,7 @@ echo "done." echo "notifying natbox..." sleep 5 -echo "server ready" | /usr/bin/netcat -c $NATBOX 8000 +echo "server ready" | netcat -c $NATBOX 8000 echo "done" echo -n "starting bash shell..." diff --git a/configs/boot/natbox-netperf.rcS b/configs/boot/natbox-netperf.rcS index 32a7371a0..e6384757e 100644 --- a/configs/boot/natbox-netperf.rcS +++ b/configs/boot/natbox-netperf.rcS @@ -24,7 +24,7 @@ echo "100000" > /proc/sys/net/core/netdev_max_backlog echo "1" > /proc/sys/net/ipv4/ip_forward echo "waiting for netserver..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo "setting up iptables..." IPTABLES=/sbin/iptables @@ -47,7 +47,7 @@ $IPTABLES -t nat -A POSTROUTING -o $EXTIF -j MASQUERADE echo "informing client..." sleep 5 -echo "server ready" | /usr/bin/netcat -c $CLIENT 8000 +echo "server ready" | netcat -c $CLIENT 8000 echo "starting bash..." exec /bin/bash diff --git a/configs/boot/natbox-spec-surge.rcS b/configs/boot/natbox-spec-surge.rcS index 8b84b1a35..4346a6229 100644 --- a/configs/boot/natbox-spec-surge.rcS +++ b/configs/boot/natbox-spec-surge.rcS @@ -27,7 +27,7 @@ echo "1" > /proc/sys/net/ipv4/ip_forward echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max echo "waiting for netserver..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo "setting up iptables..." IPTABLES=/sbin/iptables @@ -50,7 +50,7 @@ $IPTABLES -t nat -A POSTROUTING -o $EXTIF -j MASQUERADE echo "informing client..." sleep 5 -echo "server ready" | /usr/bin/netcat -c $CLIENT 8000 +echo "server ready" | netcat -c $CLIENT 8000 echo "starting bash..." exec /bin/bash diff --git a/configs/boot/netperf-rr.rcS b/configs/boot/netperf-rr.rcS index 8c5ea050c..1467c1f67 100644 --- a/configs/boot/netperf-rr.rcS +++ b/configs/boot/netperf-rr.rcS @@ -19,9 +19,9 @@ echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 -BINARY=/benchmarks/netperf/netperf +BINARY=/benchmarks/netperf-bin/netperf TEST="TCP_RR" SHORT_ARGS="-l -1k" LONG_ARGS="-k10000,0 -K10000,0" diff --git a/configs/boot/netperf-server.rcS b/configs/boot/netperf-server.rcS index c75d918a2..95a4ac4cf 100644 --- a/configs/boot/netperf-server.rcS +++ b/configs/boot/netperf-server.rcS @@ -19,11 +19,11 @@ echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog echo "running netserver..." -/benchmarks/netperf/netserver +/benchmarks/netperf-bin/netserver echo -n "signal client to begin..." sleep 1 -echo "server ready" | /usr/bin/netcat -c $CLIENT 8000 +echo "server ready" | netcat -c $CLIENT 8000 echo "done." echo "starting bash..." diff --git a/configs/boot/netperf-stream-client.rcS b/configs/boot/netperf-stream-client.rcS index 430ac265c..9a2cc0ec1 100644 --- a/configs/boot/netperf-stream-client.rcS +++ b/configs/boot/netperf-stream-client.rcS @@ -19,9 +19,9 @@ echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 -BINARY=/benchmarks/netperf/netperf +BINARY=/benchmarks/netperf-bin/netperf TEST="TCP_STREAM" SHORT_ARGS="-l -100k" LONG_ARGS="-k16384,0 -K16384,0 -- -m 65536 -M 65536 -s 262144 -S 262144" diff --git a/configs/boot/netperf-stream-nt-client.rcS b/configs/boot/netperf-stream-nt-client.rcS index 6664cd024..568115525 100644 --- a/configs/boot/netperf-stream-nt-client.rcS +++ b/configs/boot/netperf-stream-nt-client.rcS @@ -19,9 +19,9 @@ echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 -BINARY=/benchmarks/netperf/netperf +BINARY=/benchmarks/netperf-bin/netperf TEST="TCP_STREAM" SHORT_ARGS="-l -100k" LONG_ARGS="-- -m 65536 -M 65536 -s 262144 -S 262144" @@ -34,23 +34,12 @@ echo "starting test..." echo "netperf warmup" echo $SHORT eval $SHORT -NUMCLNTS=`/sbin/m5 initparam` -[ "$NUMCLNTS" -eq "0" ] && NUMCLNTS=1 -echo "netperf benchmark... starting $NUMCLNTS..." -lcv=0 - -while [ "$lcv" -lt "$NUMCLNTS" ] -do - echo $LONG - eval $LONG & - ((lcv += 1)) -done - -ckpt=200000000 -((ckpt = ckpt * 12/3 + 1000000000)) - -echo "configuring checkpointing at $ckpt..." -/sbin/m5 checkpoint $ckpt 2000000000 -echo "done configuring checkpointing..." -sleep 100000 +echo "netperf benchmark" +echo $LONG +/sbin/m5 ivlb 1 +/sbin/m5 resetstats +/sbin/m5 dumpresetstats 200000000 2000000000 +/sbin/m5 checkpoint 200000000 2000000000 +eval $LONG +/sbin/m5 exit diff --git a/configs/boot/nfs-client-nhfsstone.rcS b/configs/boot/nfs-client-nhfsstone.rcS index 6a9650d38..c59655a47 100755 --- a/configs/boot/nfs-client-nhfsstone.rcS +++ b/configs/boot/nfs-client-nhfsstone.rcS @@ -36,7 +36,7 @@ echo -n "starting nfs client..." echo "done." echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo -n "mounting remote share..." mkdir /nfs @@ -44,6 +44,6 @@ mount 10.0.0.1:/nfs /nfs echo "done." /sbin/m5 checkpoint 8000000000 2000000000 -/benchmarks/nfs/nhfsstone -l 300 -t 50 -p 14 -m /benchmarks/nfs/nfs.mix2 /nfs +/sbin/nhfsstone /nfs /sbin/m5 exit diff --git a/configs/boot/nfs-client-tcp-smallb.rcS b/configs/boot/nfs-client-tcp-smallb.rcS index eeb6aaadd..b71ca0bf1 100755 --- a/configs/boot/nfs-client-tcp-smallb.rcS +++ b/configs/boot/nfs-client-tcp-smallb.rcS @@ -36,13 +36,13 @@ echo -n "starting nfs client..." echo "done." echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo -n "mounting remote share..." mkdir /nfs mount -o rsize=1460,wsize=1460,tcp 10.0.0.1:/nfs /nfs echo "done." -/bin/bonnie++ -u 99 -s 700 -r 0 -n 0 -f -F -d /nfs +/usr/bin/bonnie++ -u 99 -s 700 -r 0 -n 0 -f -F -d /nfs /sbin/m5 exit diff --git a/configs/boot/nfs-client-tcp.rcS b/configs/boot/nfs-client-tcp.rcS index 319281385..e707ef257 100755 --- a/configs/boot/nfs-client-tcp.rcS +++ b/configs/boot/nfs-client-tcp.rcS @@ -36,13 +36,13 @@ echo -n "starting nfs client..." echo "done." echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo -n "mounting remote share..." mkdir /nfs mount -o tcp 10.0.0.1:/nfs /nfs echo "done." -/bin/bonnie++ -u 99 -s 700 -r 0 -n 0 -f -F -d /nfs +/usr/bin/bonnie++ -u 99 -s 700 -r 0 -n 0 -f -F -d /nfs /sbin/m5 exit diff --git a/configs/boot/nfs-client.rcS b/configs/boot/nfs-client.rcS index feae55d58..f3fbe0467 100755 --- a/configs/boot/nfs-client.rcS +++ b/configs/boot/nfs-client.rcS @@ -36,13 +36,13 @@ echo -n "starting nfs client..." echo "done." echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo -n "mounting remote share..." mkdir /nfs mount 10.0.0.1:/nfs /nfs echo "done." -/bin/bonnie++ -u 99 -s 700 -r 0 -n 0 -f -F -d /nfs +/usr/bin/bonnie++ -u 99 -s 700 -r 0 -n 0 -f -F -d /nfs /sbin/m5 exit diff --git a/configs/boot/nfs-server-nhfsstone.rcS b/configs/boot/nfs-server-nhfsstone.rcS index 222ba309e..7fa44a5f2 100755 --- a/configs/boot/nfs-server-nhfsstone.rcS +++ b/configs/boot/nfs-server-nhfsstone.rcS @@ -59,7 +59,7 @@ echo "Exporting shares..." echo -n "signal client to mount..." sleep 5 -echo "server ready" | /usr/bin/netcat -c 10.0.0.2 8000 +echo "server ready" | netcat -c 10.0.0.2 8000 echo "done." echo -n "starting bash shell..." diff --git a/configs/boot/nfs-server.rcS b/configs/boot/nfs-server.rcS index ecd4d8317..7314d06c3 100755 --- a/configs/boot/nfs-server.rcS +++ b/configs/boot/nfs-server.rcS @@ -28,17 +28,24 @@ echo "524287" > /proc/sys/net/core/wmem_max echo "524287" > /proc/sys/net/core/optmem_max echo "300000" > /proc/sys/net/core/netdev_max_backlog echo "131072" > /proc/sys/fs/file-max -echo "10" > /proc/sys/vm/dirty_writeback_centisecs echo "done." -echo "load scsi_debug kernel module..." +#if [ ! -x /dev/sda ] +#then +# mknod /dev/sda b 8 0 +# mknod /dev/sda1 b 8 1 +#fi + /sbin/insmod /modules/scsi_debug.ko dev_size_mb=768 echo -n "creating partition and formatting..." +#echo "1,767,L" > /tmp/sfdisk.run +#/usr/sbin/sfdisk -uM --force /dev/sda < /tmp/sfdisk.run /sbin/mke2fs -F /dev/sda mkdir /nfs -/bin/mount /dev/sda /nfs +/bin/mount /dev/sda /nfs chmod a+rwx /nfs +#/usr/sbin/sfdisk -uM -l /dev/sda echo "done." echo "/nfs 10.0.0.0/255.0.0.0(rw,sync,no_root_squash)" > /etc/exports @@ -54,7 +61,7 @@ echo "Exporting shares..." /sbin/exportfs -r -v echo -n "signal client to mount..." -echo "server ready" | /usr/bin/netcat -c 10.0.0.2 8000 +echo "server ready" | netcat -c 10.0.0.2 8000 echo "done." echo -n "starting bash shell..." diff --git a/configs/boot/ping-client.rcS b/configs/boot/ping-client.rcS index 3f0ded75e..260ff42e0 100644 --- a/configs/boot/ping-client.rcS +++ b/configs/boot/ping-client.rcS @@ -19,7 +19,7 @@ echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog echo -n "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 ping $SERVER /sbin/m5 exit diff --git a/configs/boot/ping-server.rcS b/configs/boot/ping-server.rcS index 5dab6effb..311c80212 100644 --- a/configs/boot/ping-server.rcS +++ b/configs/boot/ping-server.rcS @@ -19,7 +19,7 @@ echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog echo -n "signal client to begin..." -echo "server ready" | /usr/bin/netcat -c $CLIENT 8000 +echo "server ready" | netcat -c $CLIENT 8000 echo "done." echo "starting bash..." diff --git a/configs/boot/spec-surge-client.rcS b/configs/boot/spec-surge-client.rcS index f42d6045f..03f25986c 100644 --- a/configs/boot/spec-surge-client.rcS +++ b/configs/boot/spec-surge-client.rcS @@ -32,10 +32,10 @@ echo "131072" > /proc/sys/fs/file-max echo "done." echo "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo -n "running surge client..." -/bin/bash -c "cd /benchmarks/surge && ./spec-m5 1 20 1 192.168.0.1 5 40000 1000000000 1000" +/bin/bash -c "cd /benchmarks/specsurge && ./spec-m5 1 20 1 192.168.0.1 5 40000 1000000000 1000" echo "done." echo -n "halting machine" diff --git a/configs/boot/spec-surge-server.rcS b/configs/boot/spec-surge-server.rcS index e2d0a58d7..89a3fb4f5 100755 --- a/configs/boot/spec-surge-server.rcS +++ b/configs/boot/spec-surge-server.rcS @@ -40,13 +40,13 @@ mount /dev/hdb1 /z/htdocs echo "done." echo -n "starting httpd..." -/benchmarks/apache2/bin/apachectl start +/usr/sbin/apache2 -f /etc/apache2/httpd.conf -k start sleep 2 -cat /benchmarks/apache2/logs/error_log +cat /usr/share/apache2/logs/error_log echo "done." echo "notifying client..." -echo "server ready" | /usr/bin/netcat -c 192.168.0.10 8000 +echo "server ready" | netcat -c 192.168.0.10 8000 echo "done" echo -n "starting bash shell..." diff --git a/configs/boot/surge-client.rcS b/configs/boot/surge-client.rcS index c63cc93f0..ba7d87f66 100755 --- a/configs/boot/surge-client.rcS +++ b/configs/boot/surge-client.rcS @@ -31,10 +31,10 @@ echo "131072" > /proc/sys/fs/file-max echo "done." echo "waiting for server..." -/usr/bin/netcat -c -l -p 8000 +netcat -c -l -p 8000 echo -n "running surge client..." -/bin/bash -c "cd /benchmarks/surge && ./Surge 2 100 1 192.168.0.1 5" +/bin/bash -c "cd /benchmarks/specsurge && ./Surge 2 100 1 192.168.0.1 5" echo "done." echo -n "halting machine" diff --git a/configs/boot/surge-server.rcS b/configs/boot/surge-server.rcS index 234514bd9..140c02fb3 100755 --- a/configs/boot/surge-server.rcS +++ b/configs/boot/surge-server.rcS @@ -41,12 +41,12 @@ mount /dev/hdb1 /z/htdocs echo "done." echo -n "starting httpd..." -/benchmarks/apache2/bin/apachectl start +/usr/sbin/apache2 -f /etc/apache2/httpd.conf -k start sleep 2 -cat /benchmarks/apache2/logs/error_log +cat /usr/share/apache2/logs/error_log echo "done." -echo "server ready" | /usr/bin/netcat -c 192.168.10 8000 +echo "server ready" | netcat -c 192.168.10 8000 echo -n "starting bash shell..." /bin/bash