perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0/t/conf modperl_extra.pl
Date Thu, 22 Apr 2004 21:36:12 GMT
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);
  
  
  

Mime
View raw message