Module Name: src
Committed By: pooka
Date: Thu Dec 30 16:58:07 UTC 2010
Modified Files:
src/tests/dev/cgd: t_cgd.sh
src/tests/dev/raidframe: t_raid.sh
src/tests/net/icmp: t_ping2.sh
src/tests/usr.sbin/traceroute: t_traceroute.sh
Log Message:
Substitute a surgical rump_server configuration for rump_allserver
now that it's possible. With warm fs cache, the startup time of
the former is 0.01s and the latter 0.1s. With cold caches it's
0.2s vs 2s.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/dev/cgd/t_cgd.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/dev/raidframe/t_raid.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/icmp/t_ping2.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.sbin/traceroute/t_traceroute.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/cgd/t_cgd.sh
diff -u src/tests/dev/cgd/t_cgd.sh:1.3 src/tests/dev/cgd/t_cgd.sh:1.4
--- src/tests/dev/cgd/t_cgd.sh:1.3 Wed Dec 15 19:14:37 2010
+++ src/tests/dev/cgd/t_cgd.sh Thu Dec 30 16:58:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_cgd.sh,v 1.3 2010/12/15 19:14:37 pooka Exp $
+# $NetBSD: t_cgd.sh,v 1.4 2010/12/30 16:58:07 pooka Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,6 +25,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#
+cgdserver=\
+"rump_server -lrumpvfs -lrumpkern_crypto -lrumpdev -lrumpdev_disk -lrumpdev_cgd"
+
atf_test_case basic cleanup
basic_head()
{
@@ -37,7 +40,7 @@
d=$(atf_get_srcdir)
atf_check -s exit:0 \
- rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+ ${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
export RUMP_SERVER=unix://csock
atf_check -s exit:0 sh -c "echo 12345 | \
@@ -67,7 +70,7 @@
d=$(atf_get_srcdir)
atf_check -s exit:0 \
- rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+ ${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
export RUMP_SERVER=unix://csock
atf_check -s exit:0 sh -c "echo 12345 | \
Index: src/tests/dev/raidframe/t_raid.sh
diff -u src/tests/dev/raidframe/t_raid.sh:1.4 src/tests/dev/raidframe/t_raid.sh:1.5
--- src/tests/dev/raidframe/t_raid.sh:1.4 Sat Dec 18 09:44:41 2010
+++ src/tests/dev/raidframe/t_raid.sh Thu Dec 30 16:58:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_raid.sh,v 1.4 2010/12/18 09:44:41 pooka Exp $
+# $NetBSD: t_raid.sh,v 1.5 2010/12/30 16:58:07 pooka Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -27,6 +27,7 @@
rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
rawraid=/dev/rraid0${rawpart}
+raidserver="rump_server -lrumpvfs -lrumpdev -lrumpdev_disk -lrumpdev_raidframe"
makecfg()
{
@@ -55,7 +56,7 @@
{
makecfg 1 2
export RUMP_SERVER=unix://sock
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=1m \
-d key=/disk1,hostpath=disk1.img,size=1m \
${RUMP_SERVER}
@@ -85,7 +86,7 @@
{
makecfg 1 2
export RUMP_SERVER=unix://sock
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
${RUMP_SERVER}
@@ -102,7 +103,7 @@
# restart server with failed component
rump.halt
rm disk1.img # FAIL
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
${RUMP_SERVER}
@@ -131,7 +132,7 @@
{
makecfg 1 2
export RUMP_SERVER=unix://sock
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
${RUMP_SERVER}
@@ -143,7 +144,7 @@
# restart server with failed component
rump.halt
rm disk0.img # FAIL
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
${RUMP_SERVER}
@@ -169,7 +170,7 @@
{
makecfg 5 3
export RUMP_SERVER=unix://sock
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
-d key=/disk2,hostpath=disk2.img,size=${RAID_MEDIASIZE} \
@@ -187,7 +188,7 @@
# restart server with failed component
rump.halt
rm disk2.img # FAIL
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
-d key=/disk2,hostpath=disk2.img,size=${RAID_MEDIASIZE} \
Index: src/tests/net/icmp/t_ping2.sh
diff -u src/tests/net/icmp/t_ping2.sh:1.3 src/tests/net/icmp/t_ping2.sh:1.4
--- src/tests/net/icmp/t_ping2.sh:1.3 Sat Dec 18 08:35:53 2010
+++ src/tests/net/icmp/t_ping2.sh Thu Dec 30 16:58:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_ping2.sh,v 1.3 2010/12/18 08:35:53 pooka Exp $
+# $NetBSD: t_ping2.sh,v 1.4 2010/12/30 16:58:07 pooka Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,6 +25,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+
atf_test_case basic cleanup
basic_head()
{
@@ -49,8 +52,8 @@
basic_body()
{
- atf_check -s exit:0 rump_allserver unix://commsock1
- atf_check -s exit:0 rump_allserver unix://commsock2
+ atf_check -s exit:0 ${netserver} unix://commsock1
+ atf_check -s exit:0 ${netserver} unix://commsock2
docfg unix://commsock1 1.2.3.4
docfg unix://commsock2 1.2.3.5
Index: src/tests/usr.sbin/traceroute/t_traceroute.sh
diff -u src/tests/usr.sbin/traceroute/t_traceroute.sh:1.2 src/tests/usr.sbin/traceroute/t_traceroute.sh:1.3
--- src/tests/usr.sbin/traceroute/t_traceroute.sh:1.2 Sat Dec 18 08:34:56 2010
+++ src/tests/usr.sbin/traceroute/t_traceroute.sh Thu Dec 30 16:58:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_traceroute.sh,v 1.2 2010/12/18 08:34:56 pooka Exp $
+# $NetBSD: t_traceroute.sh,v 1.3 2010/12/30 16:58:07 pooka Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,6 +25,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+
atf_test_case basic cleanup
basic_head()
{
@@ -50,9 +53,9 @@
threeservers()
{
- atf_check -s exit:0 rump_allserver unix://commsock1
- atf_check -s exit:0 rump_allserver unix://commsock2
- atf_check -s exit:0 rump_allserver unix://commsock3
+ atf_check -s exit:0 ${netserver} unix://commsock1
+ atf_check -s exit:0 ${netserver} unix://commsock2
+ atf_check -s exit:0 ${netserver} unix://commsock3
# configure endpoints
cfgendpt unix://commsock1 1.2.3.4 1.2.3.1 bus1
