From 0746680da02f51ff3f85ebde1a3e9219d0946cf0 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 31 Jan 2023 00:05:15 +0000 Subject: lei: drop -watches and -lei_note_event from workers I noticed these while tracking down circular refs for commit 7b654d175cf2e31b (ipc: drop awaitpid_init to avoid circular refs, 2023-01-30). While they're not the cause of circular refs, they're still a waste of memory in worker processes. --- lib/PublicInbox/LEI.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index ffd50db5..d05b20de 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -561,17 +561,17 @@ sub note_sigpipe { # triggers sigpipe_handler sub _lei_atfork_child { my ($self, $persist) = @_; # we need to explicitly close things which are on stack + my $cfg = $self->{cfg}; if ($persist) { open $self->{3}, '<', '/' or die "open(/) $!"; fchdir($self); close($_) for (grep(defined, delete @$self{qw(0 1 2 sock)})); - if (my $cfg = $self->{cfg}) { - delete @$cfg{qw(-lei_store -watches -lei_note_event)}; - } + delete @$cfg{qw(-lei_store -watches -lei_note_event)}; } else { # worker, Net::NNTP (Net::Cmd) uses STDERR directly open STDERR, '+>&='.fileno($self->{2}) or warn "open $!"; STDERR->autoflush(1); POSIX::setpgid(0, $$) // die "setpgid(0, $$): $!"; + delete @$cfg{qw(-watches -lei_note_event)}; } close($_) for (grep(defined, delete @$self{qw(old_1 au_done)})); delete $self->{-socks}; -- cgit v1.2.3-24-ge0c7