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

diff --git a/configs/boot/iscsi-client.rcS b/configs/boot/iscsi-client.rcS
index d0916d0b99289332ae883cf520e31489dac8a615..5532b03cc1d1fe87e1c8309cb185222beb149cc5 100644 (file)
--- 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 32fb1d1daaa25df5a2b8e6b91629549a399a2daa..29b5043bfcf81d6ff76f89da46a3b85743c1fa30 100644 (file)
--- 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 aa290391905b2d5a3a032b22accb3f5346be7490..6a9650d381809f08c81b9c03b7370d694d3aeb2f 100755 (executable)
--- 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 2d64f199954355941def81c5ce8a20ab1aa45f32..feae55d5819e1e0fcd7f3a27b66f3b8ef47b3e01 100755 (executable)
--- 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 9e68597e648199f1e117bf2a267c2271673bf8f9..ecd4d8317865b6f83d01958dea7e00e9996c8152 100755 (executable)
--- 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."