diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2005-03-09 15:56:29 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2005-03-09 15:56:29 -0500 |
| commit | 28976656858f59dd52c3d9291c167264989f944c (patch) | |
| tree | f9392b69a7dbf213f76538b2a1984c90b1b001c7 /configs | |
| parent | 707a5ca06b59760cdf3c93e3c74bffb3c55df75b (diff) | |
| parent | 7d91bda6bfba1bd0cf49ff7ff20373b5d44df87a (diff) | |
| download | gem5-28976656858f59dd52c3d9291c167264989f944c.tar.xz | |
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : a61ddd67647fc6a6e8e12d918cc71ae9da69f869
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/boot/nat-netperf-maerts-client.rcS | 2 | ||||
| -rw-r--r-- | configs/boot/nat-netperf-server.rcS | 3 | ||||
| -rw-r--r-- | configs/boot/netperf-server.rcS | 1 | ||||
| -rwxr-xr-x | configs/boot/nfs-client.rcS | 2 | ||||
| -rwxr-xr-x | configs/boot/nfs-server.rcS | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/configs/boot/nat-netperf-maerts-client.rcS b/configs/boot/nat-netperf-maerts-client.rcS index ab9fd8c4e..ab66b7d4a 100644 --- a/configs/boot/nat-netperf-maerts-client.rcS +++ b/configs/boot/nat-netperf-maerts-client.rcS @@ -22,7 +22,7 @@ echo "262143" > /proc/sys/net/core/wmem_default echo "262143" > /proc/sys/net/core/optmem_max echo "100000" > /proc/sys/net/core/netdev_max_backlog -echo -n "waiting for server..." +echo -n "waiting for natbox..." /usr/bin/netcat -c -l -p 8000 BINARY=/benchmarks/netperf/netperf diff --git a/configs/boot/nat-netperf-server.rcS b/configs/boot/nat-netperf-server.rcS index 5b094b790..69717b7ce 100644 --- a/configs/boot/nat-netperf-server.rcS +++ b/configs/boot/nat-netperf-server.rcS @@ -23,7 +23,8 @@ echo "100000" > /proc/sys/net/core/netdev_max_backlog echo "running netserver..." /benchmarks/netperf/netserver -echo -n "signal client to begin..." +echo -n "signal natbox to begin..." +sleep 1 echo "server ready" | /usr/bin/netcat -c $NATBOX 8000 echo "done." diff --git a/configs/boot/netperf-server.rcS b/configs/boot/netperf-server.rcS index f77ff0ce8..c75d918a2 100644 --- a/configs/boot/netperf-server.rcS +++ b/configs/boot/netperf-server.rcS @@ -22,6 +22,7 @@ echo "running netserver..." /benchmarks/netperf/netserver echo -n "signal client to begin..." +sleep 1 echo "server ready" | /usr/bin/netcat -c $CLIENT 8000 echo "done." diff --git a/configs/boot/nfs-client.rcS b/configs/boot/nfs-client.rcS index a999fb72c..84d15439f 100755 --- a/configs/boot/nfs-client.rcS +++ b/configs/boot/nfs-client.rcS @@ -45,6 +45,6 @@ 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 +/bin/bonnie++ -u 99 -s 500 -r 0 -n 0 -f -F -d /nfs /sbin/m5 exit diff --git a/configs/boot/nfs-server.rcS b/configs/boot/nfs-server.rcS index 21b7ab83c..0cb489a9d 100755 --- a/configs/boot/nfs-server.rcS +++ b/configs/boot/nfs-server.rcS @@ -38,7 +38,7 @@ echo "done." # mknod /dev/sda1 b 8 1 #fi -/sbin/insmod /modules/scsi_debug.ko dev_size_mb=768 +/sbin/insmod /modules/scsi_debug.ko dev_size_mb=512 echo -n "creating partition and formatting..." #echo "1,767,L" > /tmp/sfdisk.run |