diff options
| author | Eric Wong <e@80x24.org> | 2021-02-07 08:51:48 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-02-07 22:56:58 +0000 |
| commit | 472d0ff8cfe9cc1da2ca16500731f93d1c9ed316 (patch) | |
| tree | 6dd1190a2399f7233dc3e804eab727fa040f7ca7 /lib | |
| parent | 41045a11867303e5949f557dd37061923c37c202 (diff) | |
| download | public-inbox-472d0ff8cfe9cc1da2ca16500731f93d1c9ed316.tar.gz | |
It's distributed with Perl and our Makefile.PL even declares a dependency on it, just like Encode and all the Compress::* stuff.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/PublicInbox/IPC.pm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm index 8f6f4ded..3713b56b 100644 --- a/lib/PublicInbox/IPC.pm +++ b/lib/PublicInbox/IPC.pm @@ -38,12 +38,9 @@ if ($enc && $dec) { # should be custom ops *ipc_freeze = sub ($) { sereal_encode_with_object $enc, $_[0] }; *ipc_thaw = sub ($) { sereal_decode_with_object $dec, $_[0], my $ret }; } else { - eval { # some distros have Storable as a separate package from Perl - require Storable; - *ipc_freeze = \&Storable::freeze; - *ipc_thaw = \&Storable::thaw; - $enc = 1; - } // warn("Storable (part of Perl) missing: $@\n"); + require Storable; + *ipc_freeze = \&Storable::freeze; + *ipc_thaw = \&Storable::thaw; } my $recv_cmd = PublicInbox::Spawn->can('recv_cmd4'); @@ -102,7 +99,6 @@ sub ipc_worker_loop ($$$) { # starts a worker if Sereal or Storable is installed sub ipc_worker_spawn { my ($self, $ident, $oldset, $fields) = @_; - return unless $enc; # no Sereal or Storable return if ($self->{-ipc_ppid} // -1) == $$; # idempotent delete(@$self{qw(-ipc_req -ipc_res -ipc_ppid -ipc_pid)}); pipe(my ($r_req, $w_req)) or die "pipe: $!"; @@ -364,7 +360,7 @@ sub _wq_worker_start ($$$) { # starts workqueue workers if Sereal or Storable is installed sub wq_workers_start { my ($self, $ident, $nr_workers, $oldset, $fields) = @_; - ($enc && $send_cmd && $recv_cmd && defined($SEQPACKET)) or return; + ($send_cmd && $recv_cmd && defined($SEQPACKET)) or return; return if $self->{-wq_s1}; # idempotent $self->{-wq_s1} = $self->{-wq_s2} = undef; socketpair($self->{-wq_s1}, $self->{-wq_s2}, AF_UNIX, $SEQPACKET, 0) or |