[PATCH 1/6] cindex: simplify internal structs

[Eric Wong <e@80x24.org>]

---
 lib/PublicInbox/CodeSearchIdx.pm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index e353f452..09b15e5f 100644
--- a/lib/PublicInbox/CodeSearchIdx.pm
+++ b/lib/PublicInbox/CodeSearchIdx.pm
@@ -289,10 +289,9 @@ sub docids_by_postlist ($$) { # consider moving to PublicInbox::Search
 	@ids;
 }
 
-sub run_todo ($) {
-	my ($self) = @_;
+sub run_deferred () {
 	my $n;
-	while (defined(my $x = shift(@{$self->{todo} // []}))) {
+	while (defined(my $x = shift(@{$DEFER // []}))) {
 		my $cb = shift @$x;
 		$cb->(@$x);
 		++$n;
@@ -308,12 +307,12 @@ sub need_reap { # post_loop_do
 
 sub cidx_reap ($$) {
 	my ($self, $jobs) = @_;
-	while (run_todo($self)) {}
+	while (run_deferred()) {}
 	local @PublicInbox::DS::post_loop_do = (\&need_reap, $jobs);
 	while (need_reap(undef, $jobs)) {
 		PublicInbox::DS::event_loop($MY_SIG, $SIGSET);
 	}
-	while (!$jobs && run_todo($self)) {}
+	while (!$jobs && run_deferred()) {}
 }
 
 sub cidx_await_cb { # awaitpid cb
@@ -527,7 +526,7 @@ sub index_repo { # cidx_await cb
 		$consumers->{$repo->{shard_n}} = undef;
 		commit_used_shards($self, $git, $consumers);
 		progress($self, "$git->{git_dir}: done");
-		return run_todo($self);
+		return run_deferred();
 	}
 	die "E: store_repo $git->{git_dir}: id=$id";
 }
@@ -750,14 +749,12 @@ sub prep_umask ($) {
 sub cidx_run { # main entry point
 	my ($self) = @_;
 	my $restore_umask = prep_umask($self);
-	local $self->{todo} = [];
-	local $DEFER = $self->{todo};
+	local $DEFER = [];
 	local $SIGSET = PublicInbox::DS::block_signals();
 	my $restore = PublicInbox::OnDestroy->new($$,
 		\&PublicInbox::DS::sig_setmask, $SIGSET);
 	local $LIVE = {};
-	local $DO_QUIT;
-	local $TMP_GIT;
+	local ($DO_QUIT, $TMP_GIT, $REINDEX);
 	local @IDX_SHARDS = cidx_init($self);
 	local $self->{current_info} = '';
 	local $MY_SIG = {