diff options
| -rw-r--r-- | IkiWiki.pm | 10 | ||||
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 28 | ||||
| -rw-r--r-- | debian/changelog | 2 |
4 files changed, 20 insertions, 22 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 98145a585..88407584f 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -282,18 +282,22 @@ sub htmlpage ($) { #{{{ return targetpage($page, $config{htmlext}); } #}}} -sub srcfile ($;$) { #{{{ +sub srcfile_stat { #{{{ my $file=shift; my $nothrow=shift; - return "$config{srcdir}/$file" if -e "$config{srcdir}/$file"; + return "$config{srcdir}/$file", stat(_) if -e "$config{srcdir}/$file"; foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) { - return "$dir/$file" if -e "$dir/$file"; + return "$dir/$file", stat(_) if -e "$dir/$file"; } error("internal error: $file cannot be found in $config{srcdir} or underlay") unless $nothrow; return; } #}}} +sub srcfile ($;$) { #{{{ + return (srcfile_stat(@_))[0]; +} #}}} + sub add_underlay ($) { #{{{ my $dir=shift; diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 40f6aa81d..d7117b611 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -445,7 +445,7 @@ sub genfeed ($$$$@) { #{{{ $itemtemplate->param(content => $pcontent); } else { - my ($a, $b, $c, $d, $e, $f, $g, $size) = stat(srcfile($file)); + my $size=(srcfile_stat($file))[8]; my $mime="unknown"; eval q{use File::MimeInfo}; if (! $@) { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 18324914b..959279fc8 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -146,12 +146,6 @@ sub genpage ($$) { #{{{ return $content; } #}}} -sub mtime ($) { #{{{ - my $file=shift; - - return (stat($file))[9]; -} #}}} - sub scan ($) { #{{{ my $file=shift; @@ -283,7 +277,7 @@ sub refresh () { #{{{ if (file_pruned($_, $config{srcdir})) { $File::Find::prune=1; } - elsif (! -d $_ && ! -l $_) { + elsif (! -l $_ && ! -d _) { my ($f)=/$config{wiki_file_regexp}/; # untaint if (! defined $f) { warn(sprintf(gettext("skipping bad filename %s"), $_)."\n"); @@ -304,7 +298,7 @@ sub refresh () { #{{{ if (file_pruned($_, $dir)) { $File::Find::prune=1; } - elsif (! -d $_ && ! -l $_) { + elsif (! -l $_ && ! -d _) { my ($f)=/$config{wiki_file_regexp}/; # untaint if (! defined $f) { warn(sprintf(gettext("skipping bad filename %s"), $_)."\n"); @@ -314,8 +308,8 @@ sub refresh () { #{{{ # avoid underlaydir # override attacks; see # security.mdwn - if (! -e "$config{srcdir}/$f" && - ! -l "$config{srcdir}/$f") { + if (! -l "$config{srcdir}/$f" && + ! -e _) { my $page=pagename($f); if (! $exists{$page}) { push @files, $f; @@ -329,7 +323,6 @@ sub refresh () { #{{{ }; my (%rendered, @add, @del, @internal); - # check for added or removed pages foreach my $file (@files) { my $page=pagename($file); @@ -352,7 +345,7 @@ sub refresh () { #{{{ } $pagecase{lc $page}=$page; if (! exists $pagectime{$page}) { - $pagectime{$page}=mtime(srcfile($file)); + $pagectime{$page}=(srcfile_stat($file))[10]; } } } @@ -383,16 +376,15 @@ sub refresh () { #{{{ my @needsbuild; foreach my $file (@files) { my $page=pagename($file); - - my $mtime=mtime(srcfile($file)); + my ($srcfile, @stat)=srcfile_stat($file); if (! exists $pagemtime{$page} || - $mtime > $pagemtime{$page} || + $stat[9] > $pagemtime{$page} || $forcerebuild{$page}) { - $pagemtime{$page}=$mtime; + $pagemtime{$page}=$stat[9]; if (isinternal($page)) { push @internal, $file; # Preprocess internal page in scan-only mode. - preprocess($page, $page, readfile(srcfile($file)), 1); + preprocess($page, $page, readfile($srcfile), 1); } else { push @needsbuild, $file; @@ -535,7 +527,7 @@ sub commandline_render () { #{{{ $content=preprocess($page, $page, $content); $content=linkify($page, $page, $content); $content=htmlize($page, $type, $content); - $pagemtime{$page}=mtime($srcfile); + $pagemtime{$page}=(stat($srcfile))[9]; print genpage($page, $content); exit 0; diff --git a/debian/changelog b/debian/changelog index 4eeb6d0ef..3ff3f0087 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (2.46) UNRELEASED; urgency=low via the `aggregate_webtrigger` configuration optiom. * Add pinger and pingee plugins, which allow setting up mirrors and branched wikis that automatically ping one another to stay up to date. + * Optimised file statting code when scanning for modified pages; + cut the number of system calls in half. (Still room for improvement.) -- Joey Hess <joeyh@debian.org> Mon, 05 May 2008 19:34:51 -0400 |