From modperl-cvs-return-4292-apmail-perl-modperl-cvs-archive=perl.apache.org@perl.apache.org Thu Apr 22 21:36:12 2004 Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 43496 invoked from network); 22 Apr 2004 21:36:12 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 22 Apr 2004 21:36:12 -0000 Received: (qmail 97236 invoked by uid 500); 22 Apr 2004 21:36:00 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 97224 invoked by uid 500); 22 Apr 2004 21:35:59 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@perl.apache.org Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 97210 invoked by uid 500); 22 Apr 2004 21:35:59 -0000 Delivered-To: apmail-modperl-2.0-cvs@apache.org Date: 22 Apr 2004 21:36:12 -0000 Message-ID: <20040422213612.43479.qmail@minotaur.apache.org> From: stas@apache.org To: modperl-2.0-cvs@apache.org Subject: cvs commit: modperl-2.0/t/conf modperl_extra.pl X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N stas 2004/04/22 14:36:11 Modified: t/conf modperl_extra.pl Log: perlbug #24660 affects any threaded perl that spawns threads, not only threaded mpm. disable creating of gtop objects for ithreads enabled perl Revision Changes Path 1.44 +5 -9 modperl-2.0/t/conf/modperl_extra.pl Index: modperl_extra.pl =================================================================== RCS file: /home/cvs/modperl-2.0/t/conf/modperl_extra.pl,v retrieving revision 1.43 retrieving revision 1.44 diff -u -u -r1.43 -r1.44 --- modperl_extra.pl 22 Apr 2004 20:00:02 -0000 1.43 +++ modperl_extra.pl 22 Apr 2004 21:36:11 -0000 1.44 @@ -320,16 +320,12 @@ # XXX: as of 5.8.4 when spawning ithreads we get an annoying # Attempt to free unreferenced scalar ... perlbug #24660 -# because of $gtop's CLONE'd object, so skip it for now - +# because of $gtop's CLONE'd object, so pretend that we have no gtop +# for now if perl is threaded # GTop v0.12 is the first version that will work under threaded mpms -use constant MPM_IS_THREADED => eval { - require Apache::Build; - Apache::Build->build_config->mpm_is_threaded(); -}; -use constant HAS_GTOP => eval { - !MPM_IS_THREADED && require GTop && GTop->VERSION >= 0.12 -}; +use Config; +use constant HAS_GTOP => eval { !$Config{useithreads} && + require GTop && GTop->VERSION >= 0.12 }; my $gtop = HAS_GTOP ? GTop->new : undef; my @attrs = qw(size vsize resident share rss);