X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiStore.pm;h=52a1456fb41544e4bee7ad21c1a0f662bc59d13c;hb=13a2fcc724576a78d0955f64dc0f4494545153c3;hp=e8bcb04e972bcf31945f13800ac04be2bb3bf3c9;hpb=b833e4095c6dab8d81bbcdedaddafa4b6a2a235c;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index e8bcb04e..52a1456f 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -190,7 +190,7 @@ sub export1_kw_md ($$$$$) {
 				syslog('warning', "unlink($src): $!");
 			}
 			# TODO: verify oidbin?
-			lms_mv_src($self, "maildir:$mdir",
+			$self->{lms}->mv_src("maildir:$mdir",
 					$oidbin, \$orig, $bn);
 			return;
 		} elsif ($! == EEXIST) { # lost race with "lei export-kw"?
@@ -200,7 +200,7 @@ sub export1_kw_md ($$$$$) {
 		}
 	}
 	for (@try) { return if -e "$mdir/$_/$orig" };
-	lms_clear_src($self, "maildir:$mdir", \$orig);
+	$self->{lms}->clear_src("maildir:$mdir", \$orig);
 }
 
 sub sto_export_kw ($$$) {
@@ -255,7 +255,7 @@ sub remove_eml_vmd { # remove just the VMD
 	\@docids;
 }
 
-sub _lms_rw ($) {
+sub _lms_rw ($) { # it is important to have eidx processes open before lms
 	my ($self) = @_;
 	my ($eidx, $tl) = eidx_init($self);
 	$self->{lms} //= do {
@@ -267,27 +267,6 @@ sub _lms_rw ($) {
 	};
 }
 
-sub lms_clear_src {
-	my ($self, $folder, $id) = @_;
-	_lms_rw($self)->clear_src($folder, $id);
-}
-
-sub lms_mv_src {
-	my ($self, $folder, $oidbin, $id, $newbn) = @_;
-	_lms_rw($self)->mv_src($folder, $oidbin, $id, $newbn);
-}
-
-sub lms_forget_folders {
-	my ($self, @folders) = @_;
-	my $lms = _lms_rw($self);
-	for my $f (@folders) { $lms->forget_folder($f) }
-}
-
-sub lms_rename_folder {
-	my ($self, $old, $new) = @_;
-	_lms_rw($self)->rename_folder($old, $new);
-}
-
 sub set_sync_info {
 	my ($self, $oidhex, $folder, $id) = @_;
 	_lms_rw($self)->set_src(pack('H*', $oidhex), $folder, $id);
@@ -326,7 +305,7 @@ sub remove_eml {
 			$git->cat_async($oidhex, \&_remove_if_local, $self);
 		}
 	}
-	$git->cat_async_wait;
+	$git->async_wait_all;
 	remove_docids($self, @docids);
 	\@docids;
 }
@@ -555,10 +534,6 @@ sub done {
 	$self->{priv_eidx}->done; # V2Writable::done
 	xchg_stderr($self);
 	die $err if $err;
-
-	# notify clients ->done has been issued
-	defined($sock_ref) and
-		$self->{s2d_op_p}->pkt_do('sto_done_complete', $sock_ref);
 }
 
 sub ipc_atfork_child {
@@ -573,41 +548,32 @@ sub ipc_atfork_child {
 	$self->SUPER::ipc_atfork_child;
 }
 
+sub recv_and_run {
+	my ($self, @args) = @_;
+	local $PublicInbox::DS::in_loop = 0; # waitpid synchronously
+	$self->SUPER::recv_and_run(@args);
+}
+
 sub write_prepare {
 	my ($self, $lei) = @_;
 	$lei // die 'BUG: $lei not passed';
 	unless ($self->{-ipc_req}) {
-		# s2d => store-to-daemon messages
-		require PublicInbox::PktOp;
-		my ($s2d_op_c, $s2d_op_p) = PublicInbox::PktOp->pair;
 		my $dir = $lei->store_path;
-		$self->ipc_lock_init("$dir/ipc.lock");
 		substr($dir, -length('/lei/store'), 10, '');
 		pipe(my ($r, $w)) or die "pipe: $!";
 		$w->autoflush(1);
 		# Mail we import into lei are private, so headers filtered out
 		# by -mda for public mail are not appropriate
 		local @PublicInbox::MDA::BAD_HEADERS = ();
-		$self->ipc_worker_spawn("lei/store $dir", $lei->oldset, {
+		$self->wq_workers_start("lei/store $dir", 1, $lei->oldset, {
 					lei => $lei,
 					-err_wr => $w,
-					to_close => [ $r, $s2d_op_c->{sock} ],
-					s2d_op_p => $s2d_op_p,
+					to_close => [ $r ],
 				});
 		require PublicInbox::LeiStoreErr;
 		PublicInbox::LeiStoreErr->new($r, $lei);
-		$s2d_op_c->{ops} = {
-			sto_done_complete => [ $lei->can('sto_done_complete') ]
-		};
 	}
 	$lei->{sto} = $self;
 }
 
-# called by lei-daemon before lei->refresh_watches
-sub add_sync_folders {
-	my ($self, @folders) = @_;
-	my $lms = _lms_rw($self);
-	for my $f (@folders) { $lms->fid_for($f, 1) }
-}
-
 1;