summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b28e74c)
Making them immortal doesn't seem worth it, since doing immortal
allocations after process startup leads to fragmentation. While
the allocations made by highlight are small, those small
allocations can break up contiguous regions and prevent
consolidation by the malloc implementation.
Since instantiating code generators doesn't seem too expensive,
just use and delete them ASAP.
# wrapper for SWIG-generated highlight.pm bindings
package PublicInbox::HlMod;
use strict;
# wrapper for SWIG-generated highlight.pm bindings
package PublicInbox::HlMod;
use strict;
use highlight; # SWIG-generated stuff
use PublicInbox::Hval qw(src_escape ascii_html);
my $hl;
use highlight; # SWIG-generated stuff
use PublicInbox::Hval qw(src_escape ascii_html);
my $hl;
(\%ext2lang, \@shebang);
}
(\%ext2lang, \@shebang);
}
-# We only need one instance, so we don't need to do
-# highlight::CodeGenerator::deleteInstance
+# We only need one instance
sub new {
my ($class) = @_;
$hl ||= do {
sub new {
my ($class) = @_;
$hl ||= do {
sub do_hl_lang {
my ($self, $str, $lang) = @_;
sub do_hl_lang {
my ($self, $str, $lang) = @_;
- my $dir = $self->{-dir};
- $langpath = $dir->getLangPath("$lang.lang") or return;
- $lang = undef unless -f $langpath
- }
- unless (defined $lang) {
- $lang = _shebang2lang($self, $str) or return;
- $langpath = $dir->getLangPath("$lang.lang") or return;
- return unless -f $langpath
+ $langpath = $self->{-dir}->getLangPath("$lang.lang") or return;
+ undef $lang unless -f $langpath;
- my $gen = $self->{$langpath} ||= do {
- my $g = highlight::CodeGenerator::getInstance($highlight::HTML);
- $g->setFragmentCode(1); # generate html fragment
+ $lang //= _shebang2lang($self, $str) // return;
+ $langpath = $self->{-dir}->getLangPath("$lang.lang") or return;
+ return unless -f $langpath;
- # whatever theme works
- my $themepath = $dir->getThemePath('print.theme');
- $g->initTheme($themepath);
- $g->loadLanguage($langpath);
- $g->setEncoding('utf-8');
- $g;
- };
+ my $g = highlight::CodeGenerator::getInstance($highlight::HTML);
+ $g->setFragmentCode(1); # generate html fragment
+ # whatever theme works
+ $g->initTheme($self->{-dir}->getThemePath('print.theme'));
+ $g->loadLanguage($langpath);
+ $g->setEncoding('utf-8');
# we assume $$str is valid UTF-8, but the SWIG binding doesn't
# know that, so ensure it's marked as UTF-8 even if it isnt...
# we assume $$str is valid UTF-8, but the SWIG binding doesn't
# know that, so ensure it's marked as UTF-8 even if it isnt...
- my $out = $gen->generateString($$str);
+ my $out = $g->generateString($$str);
+ highlight::CodeGenerator::deleteInstance($g);
utf8::decode($out);
src_escape($out);
\$out;
utf8::decode($out);
src_escape($out);
\$out;
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict; use v5.10.1; use PublicInbox::TestCommon; use IO::Handle; # ->autoflush
use Fcntl qw(:seek);
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict; use v5.10.1; use PublicInbox::TestCommon; use IO::Handle; # ->autoflush
use Fcntl qw(:seek);
-eval { require highlight } or
- plan skip_all => "failed to load highlight.pm for $0";
+require_mods 'highlight';
use_ok 'PublicInbox::HlMod';
my $hls = PublicInbox::HlMod->new;
ok($hls, 'initialized OK');
use_ok 'PublicInbox::HlMod';
my $hls = PublicInbox::HlMod->new;
ok($hls, 'initialized OK');