Changeset 5392

Timestamp:

10/29/09 11:09:03 (2 years ago)

Author:

SvenDowideit

Message:

Item2286: port memory leak changes from rel branch

Location:

trunk

Files:

• MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm (modified) (1 diff)
• UnitTestContrib/lib/Unit/TestRunner.pm (modified) (3 diffs)
• UnitTestContrib/test/unit/AccessControlTests.pm (modified) (1 diff)
• UnitTestContrib/test/unit/ExceptionTests.pm (modified) (1 diff)
• WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm (modified) (1 diff)
• WysiwygPlugin/test/unit/WysiwygPlugin/WysiwygPluginTests.pm (modified) (3 diffs)
• core/lib/Foswiki.pm (modified) (3 diffs)
• core/tools/MemoryCycleTests.pl (modified) (2 diffs)
• core/tools/extender.pl (modified) (1 diff)

trunk/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm

@@ -73 +73 @@
     # Must create a new wiki object to force re-registration of users
     $Foswiki::cfg{EnableEmail} = 1;
+        $this->{session}->finish();
     $this->{session} = new Foswiki();
     $this->{session}->net->setMailHandler( \&FoswikiFnTestCase::sentMail );

trunk/UnitTestContrib/lib/Unit/TestRunner.pm

@@ -5 +5 @@
 use Devel::Symdump;
 use Error qw(:try);
+#use Devel::Leak::Object qw{ GLOBAL_bless };
+#$Devel::Leak::Object::TRACKSOURCELINES = 1;
 
 sub new {
@@ -103 +105 @@
             die "Test suite $suite aborted\n" unless $completed;
         }
-    }
+   }
 
     if ( $this->{unexpected_failures} || $this->{unexpected_passes} ) {
@@ -267 +269 @@
     }
     foreach my $test (@tests) {
+                #Devel::Leak::Object::checkpoint();
         print "\t$test\n";
         $tester->set_up();

trunk/UnitTestContrib/test/unit/AccessControlTests.pm

@@ -20 +20 @@
     my $this = shift;
     $this->SUPER::set_up();
-    $this->{session} = new Foswiki();
 
     my $topicObject = Foswiki::Meta->new(

trunk/UnitTestContrib/test/unit/ExceptionTests.pm

@@ -130 +130 @@
     $this->assert_matches( qr/^the rat$/m,          $output );
     $this->assert_matches( qr/^phlegm$/m,           $output );
+    
+        $session->finish();
 }
 

trunk/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -2116 +2116 @@
     }
     $query->path_info("/Current/TestTopic");
+    $this->{session}->finish() if (defined($this->{session}));
     $this->{session} = new Foswiki( undef, $query );
     $Foswiki::Plugins::SESSION = $this->{session};

trunk/WysiwygPlugin/test/unit/WysiwygPlugin/WysiwygPluginTests.pm

@@ -94 +94 @@
     $query->method('GET');
 
-    $Foswiki::Plugins::SESSION = new Foswiki( 'guest', $query );
+    $this->{session}->finish();
+    $this->{session} = new Foswiki( 'guest', $query );
+    $Foswiki::Plugins::SESSION = $this->{session};
 
     # charset definition affects output, so it is a response method and
@@ -174 +176 @@
     $this->assert( $text eq $out,
         "'" . anal($out) . "' !=\n'" . anal($text) . "'" );
+    $foswiki->finish();
 }
 
@@ -226 +229 @@
     $this->assert_str_equals( $text, $out,
         "'" . anal($out) . "' !=\n'" . anal($text) . "'" );
+    $foswiki->finish();
 }
 

trunk/core/lib/Foswiki.pm

@@ -1554 +1554 @@
     $query ||= new Foswiki::Request();
     my $this = bless( { sandbox => 'Foswiki::Sandbox' }, $class );
+
     $this->{request}  = $query;
     $this->{cgiQuery} = $query;    # for backwards compatibility in contribs
@@ -1908 +1909 @@
 =begin TML
 
+---++ ObjectMethod DESTROY()
+
+called by Perl when the Foswiki object goes out of scope
+(maybe should be used kist to ASSERT that finish() was called..
+
+=cut
+
+#sub DESTROY {
+#    my $this = shift;
+#    $this->finish();
+#}
+
+=begin TML
+
 ---++ ObjectMethod finish()
 Break circular references.
@@ -1920 +1935 @@
 
     $_->finish() foreach values %{ $this->{forms} };
-    $this->{plugins}->finish() if $this->{plugins};
+    $this->{plugins}->finish()   if $this->{plugins};
     undef $this->{plugins};
-    $this->{users}->finish() if $this->{users};
+    $this->{users}->finish()     if $this->{users};
     undef $this->{users};
-    $this->{prefs}->finish() if $this->{prefs};
+    $this->{prefs}->finish()     if $this->{prefs};
     undef $this->{prefs};
     $this->{templates}->finish() if $this->{templates};
     undef $this->{templates};
-    $this->{renderer}->finish() if $this->{renderer};
+    $this->{renderer}->finish()  if $this->{renderer};
     undef $this->{renderer};
-    $this->{net}->finish() if $this->{net};
+    $this->{net}->finish()       if $this->{net};
     undef $this->{net};
-    $this->{store}->finish() if $this->{store};
+    $this->{store}->finish()     if $this->{store};
     undef $this->{store};
-    $this->{search}->finish() if $this->{search};
+    $this->{search}->finish()    if $this->{search};
     undef $this->{search};
-    $this->{attach}->finish() if $this->{attach};
+    $this->{attach}->finish()    if $this->{attach};
     undef $this->{attach};
-    $this->{security}->finish() if $this->{security};
+    $this->{security}->finish()  if $this->{security};
     undef $this->{security};
-    $this->{i18n}->finish() if $this->{i18n};
+    $this->{i18n}->finish()      if $this->{i18n};
     undef $this->{i18n};
     $this->{cache}->finish() if $this->{cache};
     undef $this->{cache};
+#TODO: the logger doesn't seem to have a finish...
+#    $this->{logger}->finish()      if $this->{logger};
+    undef $this->{logger};
 
     undef $this->{_HTMLHEADERS};

trunk/core/tools/MemoryCycleTests.pl

@@ -21 +21 @@
 use Devel::Monitor qw(:all);
 
+
 BEGIN {
-    use File::Spec;
-
-    unshift @INC, split(/:/, $ENV{FOSWIKI_LIBS} || '../lib' );
-
-    # designed to be run within a SVN checkout area
-    my @path = split( /\/+/, File::Spec->rel2abs($0) );
-    pop(@path); # the script name
-
-    while (scalar(@path) > 0) {
-        last if -d join( '/', @path).'/twikiplugins/BuildContrib';
-        pop( @path );
+    if ( defined $ENV{GATEWAY_INTERFACE} ) {
+        $Foswiki::cfg{Engine} = 'Foswiki::Engine::CGI';
+        use CGI::Carp qw(fatalsToBrowser);
+        $SIG{__DIE__} = \&CGI::Carp::confess;
     }
-
-    if(scalar(@path)) {
-        unshift @INC, join( '/', @path ).'/lib';
-        unshift @INC, join( '/', @path ).'/twikiplugins/BuildContrib/lib';
+    else {
+        $Foswiki::cfg{Engine} = 'Foswiki::Engine::CLI';
+        require Carp;
+        $SIG{__DIE__} = \&Carp::confess;
     }
+    $ENV{FOSWIKI_ACTION} = 'view';
+    @INC = ('../bin', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
 }
 
@@ -45 +42 @@
 
 {
-    my $twiki = new Foswiki();
-    $Foswiki::Plugins::SESSION = $twiki;
-    monitor('TWiki' => \$Foswiki::Plugins::SESSION );
+    my $session = new Foswiki();
+
+    #NOTE that Foswiki::finish() is hiding many circular references by foricbly clearing
+    #them with the %$this = (); its worth uncommenting this line once in a while to 
+    #see if its gettign worse (56 are found as of Jun2006)
+    #*Foswiki::finish = sub {};
+
+    $Foswiki::Plugins::SESSION = $session;
+    monitor('Foswiki' => \$Foswiki::Plugins::SESSION );
 
     Foswiki::UI::run( \&Foswiki::UI::View::view );
-    
-    #NOTE that Foswiki::finish() is hiding many circular references by foricbly clearing
-    #them with the %$this = (); its worth commenting out this line once in a while to 
-    #see if its gettign worse (56 are found as of Jun2006)
     
     print_circular_ref(\$Foswiki::Plugins::SESSION );

trunk/core/tools/extender.pl

@@ -127 +127 @@
     # Can't do this until we have setlib.cfg
     require Foswiki::Configure::Dependency;
+    
+    $session->finish();
+    undef $session;
 }