stas 2004/04/22 15:30:56
Modified: . Changes
ModPerl-Registry/t/conf extra.conf.in
t/conf extra.conf.in
t/response/TestDirective perlrequire.pm
t/response/TestPerl ithreads.pm
t/response/TestVhost config.pm
Log:
significantly speedup the startup of threaded mpm test suite, by
configuring only the minimal number of perl interprters to start
Revision Changes Path
1.359 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -u -r1.358 -r1.359
--- Changes 8 Apr 2004 20:47:41 -0000 1.358
+++ Changes 22 Apr 2004 22:30:55 -0000 1.359
@@ -12,6 +12,9 @@
=item 1.99_14-dev
+significantly speedup the startup of threaded mpm test suite, by
+configuring only the minimal number of perl interprters to start [Stas]
+
make APR::Socket::opt_(set|get) working (and change the previous
behavior) [Stas]
1.15 +9 -0 modperl-2.0/ModPerl-Registry/t/conf/extra.conf.in
Index: extra.conf.in
===================================================================
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/conf/extra.conf.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- extra.conf.in 26 Jan 2004 16:10:07 -0000 1.14
+++ extra.conf.in 22 Apr 2004 22:30:56 -0000 1.15
@@ -1,5 +1,14 @@
#this file will be Include-d by @ServerRoot@/httpd.conf
+# Adjust PerlInterpMax and PerlInterpMaxSpare if the requirements change
+# at the moment all tests require only 1 interprter
+<IfDefine PERL_USEITHREADS>
+ PerlInterpStart 1
+ PerlInterpMax 1
+ PerlInterpMinSpare 1
+ PerlInterpMaxSpare 1
+</IfDefine>
+
# make sure that we test under Taint and warnings mode enabled
PerlSwitches -wT
1.10 +30 -0 modperl-2.0/t/conf/extra.conf.in
Index: extra.conf.in
===================================================================
RCS file: /home/cvs/modperl-2.0/t/conf/extra.conf.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- extra.conf.in 15 Nov 2003 19:36:00 -0000 1.9
+++ extra.conf.in 22 Apr 2004 22:30:56 -0000 1.10
@@ -1,3 +1,33 @@
+# The following tests require more then 1 interpreters during the same
+# request:
+#
+# perls Test
+# -----------
+# 2 t/modules/apache_status
+# 2 t/filter/both_str_req_proxy
+# 2 t/modules/proxy
+#
+# the following tests will clone a new perl interpreter via
+# ithreads.pm regardless of how many interpreters mod_perl has:
+#
+# t/perl/ithreads
+# t/perl/ithreads2
+#
+# therefore we need at most 2 interpreters, the missing one loading on
+# demand, but we start only with 1, so the startup is quick,
+# especially since we immediately restart. We also want MaxSpare to be
+# the same as Max, since we have more than one test that requires more
+# than one interpreter, so don't waste time to kill and start a new
+# one later -- keep it around once spawned
+#
+# Adjust PerlInterpMax and PerlInterpMaxSpare if the requirements change
+<IfDefine PERL_USEITHREADS>
+ PerlInterpStart 1
+ PerlInterpMax 2
+ PerlInterpMinSpare 1
+ PerlInterpMaxSpare 2
+</IfDefine>
+
# make sure that we test under Taint and warnings mode enabled
PerlSwitches -wT
1.13 +4 -0 modperl-2.0/t/response/TestDirective/perlrequire.pm
Index: perlrequire.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlrequire.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- perlrequire.pm 18 Apr 2003 06:18:58 -0000 1.12
+++ perlrequire.pm 22 Apr 2004 22:30:56 -0000 1.13
@@ -66,6 +66,10 @@
<IfDefine PERL_USEITHREADS>
# a new interpreter pool
PerlOptions +Parent
+ PerlInterpStart 1
+ PerlInterpMax 1
+ PerlInterpMinSpare 1
+ PerlInterpMaxSpare 1
</IfDefine>
# use test system's @INC
1.8 +4 -0 modperl-2.0/t/response/TestPerl/ithreads.pm
Index: ithreads.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestPerl/ithreads.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- ithreads.pm 27 Oct 2003 21:14:32 -0000 1.7
+++ ithreads.pm 22 Apr 2004 22:30:56 -0000 1.8
@@ -76,6 +76,10 @@
<IfDefine PERL_USEITHREADS>
# a new interpreter pool
PerlOptions +Parent
+ PerlInterpStart 1
+ PerlInterpMax 1
+ PerlInterpMinSpare 1
+ PerlInterpMaxSpare 1
</IfDefine>
# use test system's @INC
1.3 +4 -0 modperl-2.0/t/response/TestVhost/config.pm
Index: config.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestVhost/config.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- config.pm 23 Jan 2004 00:15:18 -0000 1.2
+++ config.pm 22 Apr 2004 22:30:56 -0000 1.3
@@ -42,6 +42,10 @@
<IfDefine PERL_USEITHREADS>
# a new interpreter pool
PerlOptions +Parent
+ PerlInterpStart 1
+ PerlInterpMax 1
+ PerlInterpMinSpare 1
+ PerlInterpMaxSpare 1
</IfDefine>
# use test system's @INC
