[PATCH 0/3] some lei fixes

[PATCH 0/3] some lei fixes

[Eric Wong]

Some trivial fixes I noticed while (still) working on getting
lei to use checkpoint to improve parallelism.

Eric Wong (3):
  lei_remote: solver supports uncommitted blobs
  io: avoid redundant waitpid in DESTROY
  lei: remove leftover debugging message

 lib/PublicInbox/IO.pm        | 10 +++++-----
 lib/PublicInbox/LEI.pm       |  2 --
 lib/PublicInbox/LeiRemote.pm | 13 ++++++++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

[PATCH 1/3] lei_remote: solver supports uncommitted blobs

[Eric Wong]

This should improve `lei blob' and `lei rediff' functionality
for folks relying on `lei index' and allows future work to
improve parallelism via checkpointing in lei/store.
---
 lib/PublicInbox/LeiRemote.pm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/PublicInbox/LeiRemote.pm b/lib/PublicInbox/LeiRemote.pm
index 559fb8d5..ddcaf2c9 100644
--- a/lib/PublicInbox/LeiRemote.pm
+++ b/lib/PublicInbox/LeiRemote.pm
@@ -67,9 +67,16 @@ sub base_url { "$_[0]->{uri}" }
 
 sub smsg_eml {
 	my ($self, $smsg) = @_;
-	if (my $bref = $self->{lei}->ale->git->cat_file($smsg->{blob})) {
-		return PublicInbox::Eml->new($bref);
-	}
+	my $bref = $self->{lei}->ale->git->cat_file($smsg->{blob}) // do {
+		my $lms = $self->{lei}->lms;
+		($lms ? $lms->local_blob($smsg->{blob}, 1) : undef) // do {
+			my $sto = $self->{lei}->{sto} //
+					$self->{lei}->_lei_store;
+			$sto && $sto->{-wq_s1} ?
+				$sto->wq_do('cat_blob', $smsg->{blob}) : undef;
+		}
+	};
+	return PublicInbox::Eml->new($bref) if $bref;
 	warn("E: $self->{uri} $smsg->{blob} gone <$smsg->{mid}>\n");
 	undef;
 }

[PATCH 2/3] io: avoid redundant waitpid in DESTROY

[Eric Wong]

We shouldn't attempt to reap a process again after it's been
reaped asynchronously in the SIGCHLD handler.  Noticed while
working on changes to get lei/store to use checkpointing.
---
 lib/PublicInbox/IO.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/IO.pm b/lib/PublicInbox/IO.pm
index 02057600..8640f112 100644
--- a/lib/PublicInbox/IO.pm
+++ b/lib/PublicInbox/IO.pm
@@ -16,7 +16,7 @@ use PublicInbox::OnDestroy;
 
 sub waitcb { # awaitpid callback
 	my ($pid, $errref, $cb, @args) = @_;
-	$$errref = $? if $errref; # sets .cerr for _close
+	$$errref = $?; # sets .cerr for _close
 	$cb->($pid, @args) if $cb; # may clobber $?
 }
 
@@ -24,9 +24,9 @@ sub attach_pid {
 	my ($io, $pid, @cb_arg) = @_;
 	bless $io, __PACKAGE__;
 	# we share $err (and not $self) with awaitpid to avoid a ref cycle
-	${*$io}{pi_io_reap} = [ $PublicInbox::OnDestroy::fork_gen,
-				$pid, \(my $err) ];
-	awaitpid($pid, \&waitcb, \$err, @cb_arg);
+	my $e = \(my $err);
+	${*$io}{pi_io_reap} = [ $PublicInbox::OnDestroy::fork_gen, $pid, $e ];
+	awaitpid($pid, \&waitcb, $e, @cb_arg);
 	$io;
 }
 
@@ -60,7 +60,7 @@ sub DESTROY {
 	my $reap = delete ${*$io}{pi_io_reap};
 	if (($reap->[0] // -1) == $PublicInbox::OnDestroy::fork_gen) {
 		$io->SUPER::close;
-		awaitpid($reap->[1]);
+		${$reap->[2]} // awaitpid($reap->[1]);
 	}
 	$io->SUPER::DESTROY;
 }

[PATCH 3/3] lei: remove leftover debugging message

[Eric Wong]

Noticed while working on other things...

Fixes: 299aac294ec3 (lei: do label/keyword parsing in optparse, 2023-10-02)
---
 lib/PublicInbox/LEI.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 06592358..5b46686a 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -728,8 +728,6 @@ sub optparse ($$$) {
 		require PublicInbox::LeiInput;
 		my @err = PublicInbox::LeiInput::vmd_mod_extract($self, $argv);
 		return $self->fail(join("\n", @err)) if @err;
-	} else {
-		warn "proto $proto\n" if $cmd =~ /(add-watch|tag|index)/;
 	}
 
 	my $i = 0;