eliminate some unused subs

[public-inbox.git] / lib / PublicInbox / SearchIdxShard.pm

diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index 83cbbb258a8474c52d31ac8643e2bada08086bb7..000abd9413b5ba5159f2d540f8344805564c6ad9 100644 (file)
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -21,6 +21,14 @@ sub new {
        if ($v2w->{parallel}) {
                local $self->{-v2w_afc} = $v2w;
                $self->ipc_worker_spawn("shard[$shard]");
+               # F_SETPIPE_SZ = 1031 on Linux; increasing the pipe size for
+               # inputs speeds V2Writable batch imports across 8 cores by
+               # nearly 20%.  Since any of our responses are small, make
+               # the response pipe as small as possible
+               if ($^O eq 'linux') {
+                       fcntl($self->{-ipc_req}, 1031, 1048576);
+                       fcntl($self->{-ipc_res}, 1031, 4096);
+               }
        }
        $self;
 }
@@ -36,7 +44,7 @@ sub _worker_done {
 sub ipc_atfork_child { # called automatically before ipc_worker_loop
        my ($self) = @_;
        my $v2w = delete $self->{-v2w_afc} or die 'BUG: {-v2w_afc} missing';
-       $v2w->atfork_child; # calls shard_atfork_child on our siblings
+       $v2w->atfork_child; # calls ipc_sibling_atfork_child on our siblings
        $v2w->{current_info} = "[$self->{shard}]"; # for $SIG{__WARN__}
        $self->begin_txn_lazy;
        # caller must capture this:
@@ -46,18 +54,7 @@ sub ipc_atfork_child { # called automatically before ipc_worker_loop
 sub index_eml {
        my ($self, $eml, $smsg, $eidx_key) = @_;
        $smsg->{eidx_key} = $eidx_key if defined $eidx_key;
-       $self->ipc_do('add_message', $eml, $smsg);
-}
-
-# needed when there's multiple IPC workers and the parent forking
-# causes newer siblings to inherit older siblings sockets
-sub shard_atfork_child {
-       my ($self) = @_;
-       my $pid = delete($self->{-ipc_worker_pid}) or
-                       die "BUG: $$ no -ipc_worker_pid";
-       my $s1 = delete($self->{-ipc_sock}) or die "BUG: $$ no -ipc_sock";
-       $pid == $$ and die "BUG: $$ shard_atfork_child called on itself";
-       close($s1) or die "close -ipc_sock: $!";
+       $self->ipc_do('add_xapian', $eml, $smsg);
 }
 
 # wait for return to determine when ipc_do('commit_txn_lazy') is done
@@ -78,13 +75,4 @@ sub shard_close {
        $self->ipc_worker_stop;
 }
 
-sub shard_over_check {
-       my ($self, $over) = @_;
-       if ($self->{-ipc_sock} && $over->{dbh}) {
-               # can't send DB handles over IPC
-               $over = ref($over)->new($over->{dbh}->sqlite_db_filename);
-       }
-       $self->ipc_do('over_check', $over);
-}
-
 1;