From c7b211e71ffc45906c74821097ba555f80e8f82e Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 16 Sep 2005 22:54:01 -0400 Subject: [PATCH] various changes to the boot scripts configs/boot/iscsi-client.rcS: configs/boot/nfs-client-dbench.rcS: don't use the /proc/m5 stuff, use the m5 binary configs/boot/nfs-client-nhfsstone.rcS: set up checkpoints change nhfsstone configuration configs/boot/nfs-client.rcS: use more memory configs/boot/nfs-server.rcS: change the writeback frequency load a larger simulated disk image. create more nfsd threads --HG-- extra : convert_revision : 242dfd261d62782c06847d64b9f6aa06664a1ec9 --- configs/boot/iscsi-client.rcS | 2 +- configs/boot/nfs-client-dbench.rcS | 2 +- configs/boot/nfs-client-nhfsstone.rcS | 3 ++- configs/boot/nfs-client.rcS | 2 +- configs/boot/nfs-server.rcS | 17 +++++------------ 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/configs/boot/iscsi-client.rcS b/configs/boot/iscsi-client.rcS index d0916d0b9..5532b03cc 100644 --- a/configs/boot/iscsi-client.rcS +++ b/configs/boot/iscsi-client.rcS @@ -75,7 +75,7 @@ sleep 5 mount /dev/sda /mnt cd /mnt -initparam=`cat /proc/m5/initparam` +initparam=`m5 initparam` if test X$initparam == X0; then /sbin/m5 checkpoint 100000000 2000000000 diff --git a/configs/boot/nfs-client-dbench.rcS b/configs/boot/nfs-client-dbench.rcS index 32fb1d1da..29b5043bf 100644 --- a/configs/boot/nfs-client-dbench.rcS +++ b/configs/boot/nfs-client-dbench.rcS @@ -46,7 +46,7 @@ echo "done." cd /nfs -initparam=`cat /proc/m5/initparam` +initparam=`m5 initparam` if test X$initparam == X0; then /sbin/m5 checkpoint 100000000 2000000000 diff --git a/configs/boot/nfs-client-nhfsstone.rcS b/configs/boot/nfs-client-nhfsstone.rcS index aa2903919..6a9650d38 100755 --- a/configs/boot/nfs-client-nhfsstone.rcS +++ b/configs/boot/nfs-client-nhfsstone.rcS @@ -43,6 +43,7 @@ mkdir /nfs mount 10.0.0.1:/nfs /nfs echo "done." -/benchmarks/nhfsstone/nhfsstone -t 30 -p 10 /nfs +/sbin/m5 checkpoint 8000000000 2000000000 +/benchmarks/nfs/nhfsstone -l 300 -t 50 -p 14 -m /benchmarks/nfs/nfs.mix2 /nfs /sbin/m5 exit diff --git a/configs/boot/nfs-client.rcS b/configs/boot/nfs-client.rcS index 2d64f1999..feae55d58 100755 --- a/configs/boot/nfs-client.rcS +++ b/configs/boot/nfs-client.rcS @@ -43,6 +43,6 @@ mkdir /nfs mount 10.0.0.1:/nfs /nfs echo "done." -/bin/bonnie++ -u 99 -s 500 -r 0 -n 0 -f -F -d /nfs +/bin/bonnie++ -u 99 -s 700 -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 9e68597e6..ecd4d8317 100755 --- a/configs/boot/nfs-server.rcS +++ b/configs/boot/nfs-server.rcS @@ -28,24 +28,17 @@ 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." -#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=512 +echo "load scsi_debug kernel module..." +/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 @@ -53,7 +46,7 @@ echo -n "starting nfs kernel server..." /sbin/portmap /sbin/lockd /sbin/statd -/sbin/nfsd 8 +/sbin/nfsd 15 /sbin/mountd echo "done."