X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FXapcmd.pm;h=b6279218c880880fbcc3b3930dad29b2e3fc8471;hp=6fcc9e90cd42e45d22eee17993bf2edc84fec028;hb=eace79f62e5cab2ecaf05d4e8773ab99f7662f48;hpb=a3aebf796f9b06a04ebb6156240b74b6cc53fdb8

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 6fcc9e90..b6279218 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -9,7 +9,7 @@ use PublicInbox::SearchIdx;
 use File::Temp 0.19 (); # ->newdir
 use File::Path qw(remove_tree);
 use File::Basename qw(dirname);
-use POSIX ();
+use POSIX qw(WNOHANG);
 
 # support testing with dev versions of Xapian which installs
 # commands with a version number suffix (e.g. "xapian-compact-1.5")
@@ -151,14 +151,17 @@ sub process_queue {
 			$pids{cb_spawn($cb, $args, $opt)} = $args;
 		}
 
+		my $flags = 0;
 		while (scalar keys %pids) {
-			my $pid = waitpid(-1, 0);
+			my $pid = waitpid(-1, $flags) or last;
+			last if $pid < 0;
 			my $args = delete $pids{$pid};
 			if ($args) {
 				die join(' ', @$args)." failed: $?\n" if $?;
 			} else {
 				warn "unknown PID($pid) reaped: $?\n";
 			}
+			$flags = WNOHANG if scalar(@$queue);
 		}
 	}
 }