diff options
| author | dx <dx@dxzone.com.ar> | 2015-12-12 12:40:38 -0300 |
|---|---|---|
| committer | dx <dx@dxzone.com.ar> | 2015-12-12 12:40:38 -0300 |
| commit | 4dd7f2b18f9895e440e84c563cfd5c997cac317f (patch) | |
| tree | 4b8d95d68aecf15dbb1f71953a806bcbbfaa626a | |
| parent | 18c3ea24b6377c3e1820e8c49c137260dcbbdc6b (diff) | |
| parent | 9dd2b7c616e48a7525e72d6798a0adae34720616 (diff) | |
| download | irssi-4dd7f2b18f9895e440e84c563cfd5c997cac317f.zip | |
Merge pull request #378 from ailin-nemui/staticperl
deinit perl on staticperl builds
| -rw-r--r-- | src/perl/perl-core.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c index 793f9375..2c0ca49d 100644 --- a/src/perl/perl-core.c +++ b/src/perl/perl-core.c @@ -82,16 +82,18 @@ static void perl_script_destroy(PERL_SCRIPT_REC *script) extern void boot_DynaLoader(pTHX_ CV* cv); #if PERL_STATIC_LIBS == 1 -extern void boot_Irssi(CV *cv); +extern void boot_Irssi(pTHX_ CV *cv); XS(boot_Irssi_Core) { dXSARGS; + PERL_UNUSED_VAR(items); irssi_callXS(boot_Irssi, cv, mark); irssi_boot(Irc); irssi_boot(UI); irssi_boot(TextUI); + /* Make sure to keep this in line with perl_scripts_deinit below. */ XSRETURN_YES; } #endif @@ -155,6 +157,17 @@ void perl_scripts_deinit(void) /* Unload all perl libraries loaded with dynaloader */ perl_eval_pv("foreach my $lib (@DynaLoader::dl_modules) { if ($lib =~ /^Irssi\\b/) { $lib .= '::deinit();'; eval $lib; } }", TRUE); +#if PERL_STATIC_LIBS == 1 + /* If perl is statically built we should manually deinit the modules + which are booted in boot_Irssi_Core above */ + perl_eval_pv("foreach my $lib (qw(" + "Irssi" " " + "Irssi::Irc" " " + "Irssi::UI" " " + "Irssi::TextUI" + ")) { eval $lib . '::deinit();'; }", TRUE); +#endif + /* We could unload all libraries .. but this crashes with some libraries, probably because we don't call some deinit function.. Anyway, this would free some memory with /SCRIPT RESET, but it |