stas 2003/12/11 21:43:57
Modified: lib/ModPerl TestRun.pm
. Changes
Log:
As the test suite keeps on growing, it takes longer time to
startup. Change the main test suite timeout to 180 secs for threaded
mpms and 120 secs for non-threaded ones.
Revision Changes Path
1.14 +8 -0 modperl-2.0/lib/ModPerl/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TestRun.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- TestRun.pm 5 Nov 2003 09:52:18 -0000 1.13
+++ TestRun.pm 12 Dec 2003 05:43:57 -0000 1.14
@@ -10,8 +10,16 @@
# become available
use constant MIN_MAXCLIENTS => 2;
+use Apache::Build;
+my $build = Apache::Build->build_config;
+
sub new_test_config {
my $self = shift;
+
+ # timeout in secs (threaded mpms are extremely slow to startup,
+ # due to a slow perl_clone operation)
+ $self->{conf_opts}->{startup_timeout} =
+ $build->mpm_is_threaded() ? 180 : 120;
$self->{conf_opts}->{maxclients} = MIN_MAXCLIENTS;
1.277 +4 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -u -r1.276 -r1.277
--- Changes 11 Dec 2003 07:35:09 -0000 1.276
+++ Changes 12 Dec 2003 05:43:57 -0000 1.277
@@ -12,6 +12,10 @@
=item 1.99_12-dev
+As the test suite keeps on growing, it takes longer time to
+startup. Change the main test suite timeout to 180 secs for threaded
+mpms and 120 secs for non-threaded ones. [Stas]
+
use plain malloc/free to allocate filter structs, since they could be
invoked hundreds of times during a single request, causing huge memory
demands if the memory is allocated from the pool, which gets destroyed
