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

diff --git a/configs/boot/devtime.rcS b/configs/boot/devtime.rcS
index 91fddc20d49fdc351e6c9ef6160b312247852e66..22a5469b80e0864ae30d63b9a833b65f4e5a6e46 100644 (file)
--- 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 51ed5a284d8177d4bd30179ea7643e34f4b643f1..cfa87652e09eabfe0b9bce337f00ccdcb2caa0e4 100644 (file)
--- 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 904368a4baa3bcb357061e1ab369b138aed412c6..210f4eaef114c82e63b5f00c6a762bb6a54650b8 100644 (file)
--- 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 50ee8efb35ff317090d12ca9a47be4a39605e9ce..3bf6b6b2b5a3440baeea00827ce021aa94946c8e 100644 (file)
--- 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 7b4c445c6fdbbb98c11c71a0151b7acb74622c28..1cf3a7dc3e1023380ac8e71cecfb2e374a74e1c7 100644 (file)
--- 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 ab05fd9ff9ba477fac032369178235a434395959..fd5fd53c14bd1f24e914e85c075e0705a6fffa11 100644 (file)
--- 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 ab66b7d4a122982f5de5ca42c7c851e13626d6c4..863766a6b9a9bc760510b2cb8b2fbca2d81306a9 100644 (file)
--- 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 61b4bea7ad802de79aa075175608b4b5af74d546..23b99a13a0fe12b624432936474de674bfcac41d 100644 (file)
--- 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 e37b8e5651d9b97c0c67d2cce5ab02064fcff8f9..f20e92c5c1fe5deb6abd349ce11354386807519b 100644 (file)
--- 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 67c831eb0fb8c7d740ad3642368d26b499fae312..d26e38378d57779684833d1f05807dc3f32846a5 100644 (file)
--- 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 279cd5652743857d4ee815100ca02013c20cec39..0f462568cc56b1970ca3fa8888bfa2b775cab400 100755 (executable)
--- 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 32a7371a027c1110e78f1d5e01c81e031fac94bf..e6384757e56c1e85bb82eecb6bc8e0d61f43187b 100644 (file)
--- 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 8b84b1a351b9ee147c2d52630ad6886231735f6c..4346a622968cfa9e94bc24c8935c5773338cf8b4 100644 (file)
--- 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 8c5ea050c1be13768e46b9cf3c02497cc5d0bd9b..1467c1f67a89afce7cb404b3e7e6bc355eb03534 100644 (file)
--- 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 c75d918a28143fe15b9862493a491914c0115216..95a4ac4cf5a1cf927f9452ff14610cc2f07528cc 100644 (file)
--- 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 430ac265ca2e0e17226d1dcb606ebc2e25c88623..9a2cc0ec1f93e71ca5df430303e0003db1dab2d0 100644 (file)
--- 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 6664cd02433ca9103bbabf33db9220e5008a3ab7..56811552502d90794cf527dc6f148f87b5293a64 100644 (file)
--- 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 6a9650d381809f08c81b9c03b7370d694d3aeb2f..c59655a4747a1cdd1687c74236f26de658abf6a7 100755 (executable)
--- 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 eeb6aaadd660fa8c641bd2cf040a6fca72413f1c..b71ca0bf188c67f0b2ba263b725648f755a42296 100755 (executable)
--- 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 319281385f5a4885c173fa16c48602b0de2e84df..e707ef2578c1bdab8b69ad188ce605a68bc43cb1 100755 (executable)
--- 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 feae55d5819e1e0fcd7f3a27b66f3b8ef47b3e01..f3fbe0467718eb00cdab7dc5700420cf771cb676 100755 (executable)
--- 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 222ba309e693134293095a6956547be6feaeb92a..7fa44a5f29f5d740cc0018de6165749ba2daf616 100755 (executable)
--- 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 ecd4d8317865b6f83d01958dea7e00e9996c8152..7314d06c30b846c0ead38fcdb23425e0ab8c9912 100755 (executable)
--- 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 3f0ded75e24d3c515426ffaf01bbedb035285145..260ff42e07e35d4390bdec1c5dec53e25b1cc6e2 100644 (file)
--- 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 5dab6effb2157d630eea8d03a27dc0d8e8725b2e..311c80212bfe1a3e8f35960fa4fd60bb95af7765 100644 (file)
--- 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 f42d6045f64e768362a6f1bfc848ea097a3295b0..03f25986c35358ed5517ee2b29e4e79c9bac3e2c 100644 (file)
--- 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 e2d0a58d7a5b60349507b2c12f73d42990325f98..89a3fb4f5f5a85431135cde4d5a9058f1137d6c4 100755 (executable)
--- 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 c63cc93f000f814f7c7b5d6b401f3d0aca1712a7..ba7d87f66d2892b660ca8da607ec0f8d5943835c 100755 (executable)
--- 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 234514bd97667250d1b63672912692bdc6982250..140c02fb31b23c7c675b067eb2c499ea2c9a37b1 100755 (executable)
--- 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