]> git.ipfire.org Git - thirdparty/public-inbox.git/commitdiff
extindex: use nproc_shards directly from IPC
authorEric Wong <e@80x24.org>
Thu, 2 Jan 2025 22:50:31 +0000 (22:50 +0000)
committerEric Wong <e@80x24.org>
Sat, 4 Jan 2025 22:19:46 +0000 (22:19 +0000)
There's no reason to use it from the V2Writable namespace
since it was moved to PublicInbox::IPC in commit
9225145d (ipc: move nproc_shards from v2writable, 2023-03-21)
Import it early via `use' so we can take advantage of prototype
checking while we're at it.

lib/PublicInbox/ExtSearchIdx.pm

index 4a4799789c32f60dd344f829b464b1aba8e3171f..970d5eb3170ff32873a0a39c81a1c7693bb66056 100644 (file)
@@ -28,6 +28,7 @@ use PublicInbox::Spawn ();
 use PublicInbox::Search;
 use PublicInbox::SearchIdx qw(prepare_stack is_ancestor is_bad_blob
        update_checkpoint);
+use PublicInbox::IPC qw(nproc_shards);
 use PublicInbox::OverIdx;
 use PublicInbox::MiscIdx;
 use PublicInbox::MID qw(mids);
@@ -61,7 +62,7 @@ sub new {
                lock_path => "$dir/ei.lock",
        }, __PACKAGE__;
        $self->{shards} = $self->count_shards ||
-               nproc_shards({ nproc => $opt->{jobs} });
+               nproc_shards { nproc => $opt->{jobs} };
        my $oidx = PublicInbox::OverIdx->new("$self->{xpfx}/over.sqlite3");
        $self->{-no_fsync} = $oidx->{-no_fsync} = 1 if !$opt->{fsync};
        $self->{-dangerous} = 1 if $opt->{dangerous};
@@ -1401,7 +1402,6 @@ sub eidx_watch { # public-inbox-extindex --watch main loop
 no warnings 'once';
 *done = \&PublicInbox::V2Writable::done;
 *parallel_init = \&PublicInbox::V2Writable::parallel_init;
-*nproc_shards = \&PublicInbox::V2Writable::nproc_shards;
 *sync_prepare = \&PublicInbox::V2Writable::sync_prepare;
 *index_todo = \&PublicInbox::V2Writable::index_todo;
 *count_shards = \&PublicInbox::V2Writable::count_shards;