benchmarking suggests that meoization doesn't help even when doing a

--rebuild, so remove it

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 62d284eb6fef018b268e69608c0f4282adc5f607..4966c453ab99732369efa6428e54b84b4ed146da 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -33,7 +33,7 @@ sub gen_wrapper () { #{{{
 EOF
        }
        
 EOF
        }
        

-       $Data::Dumper::Indent=0;
+       $Data::Dumper::Indent=0; # no newlines

        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $configstring=~s/"/\\"/g;
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $configstring=~s/"/\\"/g;

diff --git a/ikiwiki b/ikiwiki
index b59aa8c8fa6c1cdfbe3504f01dd2b18c15f5b863..7f6480e0c7438b561c644872e685c29477aea1d7 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -7,7 +7,6 @@ use lib '.'; # For use without installation, removed by Makefile.
 package IkiWiki;
 use warnings;
 use strict;
 package IkiWiki;
 use warnings;
 use strict;

-use Memoize;

 use File::Spec;
 use HTML::Template;
 
 use File::Spec;
 use HTML::Template;
 


@@ -426,8 +425,6 @@ sub globlist_match ($$) { #{{{
 } #}}}
 
 # main {{{
 } #}}}
 
 # main {{{

-memoize('pagename');
-memoize('bestlink');

 if ($config{setup}) {
        require IkiWiki::Setup;
        setup();
 if ($config{setup}) {
        require IkiWiki::Setup;
        setup();