urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache highlighters to optimise 

Setting up a new highlighter object is slightly expensive since it
reads and parses the langfile each time. So cache them.

This also speeds up ext2langfile by avoiding it needing to check for the
existence of a language file in some cases.
master
Joey Hess 2009-05-23 18:39:49 -04:00
parent 8ba98ad1dc
commit 39e5e25000
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
IkiWiki/Plugin/highlight.pm
View File

@ -74,6 +74,7 @@ sub htmlizefallback {
my %ext2lang; my %ext2lang;
my $filetypes_read=0; my $filetypes_read=0;
my %highlighters;
# Parse highlight's config file to get extension => language mappings. # Parse highlight's config file to get extension => language mappings.
sub read_filetypes () { sub read_filetypes () {
@ -88,23 +89,23 @@ sub read_filetypes () {
$filetypes_read=1; $filetypes_read=1;
} }
sub langfile ($) {
return "$langdefdir/$_[0].lang";
}
# Given a filename extension, determines the language definition to # Given a filename extension, determines the language definition to
# use to highlight it. # use to highlight it.
sub ext2langfile ($) { sub ext2langfile ($) {
my $ext=shift; my $ext=shift;
my $langfile="$langdefdir/$ext.lang";
return $langfile if exists $highlighters{$langfile};
read_filetypes() unless $filetypes_read; read_filetypes() unless $filetypes_read;
if (exists $ext2lang{$ext}) { if (exists $ext2lang{$ext}) {
return langfile($ext2lang{$ext}); return "$langdefdir/$ext2lang{$ext}.lang";
} }
# If a language only has one common extension, it will not # If a language only has one common extension, it will not
# be listed in filetypes, so check the langfile. # be listed in filetypes, so check the langfile.
elsif (-e langfile($ext)) { elsif (-e $langfile) {
return langfile($ext); return $langfile;
} }
else { else {
return undef; return undef;
@ -122,16 +123,21 @@ sub highlight ($$) {
return $input; return $input;
} }
my $gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML); my $gen;
if (! exists $highlighters{$langfile}) {
$gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
$gen->setFragmentCode(1); # generate html fragment $gen->setFragmentCode(1); # generate html fragment
$gen->setHTMLEnclosePreTag(1); # include stylish <pre> $gen->setHTMLEnclosePreTag(1); # include stylish <pre>
$gen->initLanguage($langfile); $gen->initLanguage($langfile);
$gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted $gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted
$gen->setEncoding("utf-8"); $gen->setEncoding("utf-8");
$highlighters{$langfile}=$gen;
}
else {
$gen=$highlighters{$langfile};
}
my $output=$gen->generateString($input); return $gen->generateString($input);
highlightc::CodeGenerator_deleteInstance($gen);
return $output;
} }
1 1