about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2022-04-18 09:50:03 +0000
committerEric Wong <e@80x24.org>2022-04-18 21:53:46 +0000
commit88c7c7c26b44ee4c1141fddb628a518b4d4d21a4 (patch)
tree6c579e1df8ac9d31584c08f1a204cf77796b665b
parentf9a8fba3102362e07dc27bde8e2bc7bd2a42a1ed (diff)
downloadpublic-inbox-88c7c7c26b44ee4c1141fddb628a518b4d4d21a4.tar.gz
This enables lei-daemon to work without Inline::C nor
Socket::MsgHdr installed.  Prior to this, only the `lei' client
was using the pure Perl implementation.  Either C implementation
is still marginally faster, however.
-rw-r--r--lib/PublicInbox/IPC.pm4
-rw-r--r--lib/PublicInbox/LEI.pm3
-rw-r--r--lib/PublicInbox/TestCommon.pm16
-rw-r--r--t/lei-daemon.t6
-rw-r--r--t/lei-externals.t1
5 files changed, 25 insertions, 5 deletions
diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index 8376275e..67e86a43 100644
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -47,6 +47,10 @@ my $send_cmd = PublicInbox::Spawn->can('send_cmd4') // do {
         require PublicInbox::CmdIPC4;
         $recv_cmd //= PublicInbox::CmdIPC4->can('recv_cmd4');
         PublicInbox::CmdIPC4->can('send_cmd4');
+} // do {
+        require PublicInbox::Syscall;
+        $recv_cmd //= PublicInbox::Syscall->can('recv_cmd4');
+        PublicInbox::Syscall->can('send_cmd4');
 };
 
 sub _get_rec ($) {
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 9ab91714..4bd9183e 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1277,6 +1277,9 @@ sub lazy_start {
                         require PublicInbox::CmdIPC4;
                         $send_cmd = PublicInbox::CmdIPC4->can('send_cmd4');
                         PublicInbox::CmdIPC4->can('recv_cmd4');
+                } // do {
+                        $send_cmd = PublicInbox::Syscall->can('send_cmd4');
+                        PublicInbox::Syscall->can('recv_cmd4');
                 };
         }
         $recv_cmd or die <<"";
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index ca732811..943dd2fa 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # internal APIs used only for tests
@@ -19,7 +19,8 @@ BEGIN {
                 run_script start_script key2sub xsys xsys_e xqx eml_load tick
                 have_xapian_compact json_utf8 setup_public_inboxes create_inbox
                 tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt
-                test_httpd xbail require_cmd is_xdeeply tail_f);
+                test_httpd xbail require_cmd is_xdeeply tail_f
+                ignore_inline_c_missing);
         require Test::More;
         my @methods = grep(!/\W/, @Test::More::EXPORT);
         eval(join('', map { "*$_=\\&Test::More::$_;" } @methods));
@@ -547,6 +548,11 @@ sub is_xdeeply ($$$) {
         $ok;
 }
 
+sub ignore_inline_c_missing {
+        $_[0] = join('', grep(/\S/, grep(!/compilation aborted/,
+                grep(!/\bInline\b/, split(/^/m, $_[0])))));
+}
+
 sub test_lei {
 SKIP: {
         my ($cb) = pop @_;
@@ -571,8 +577,10 @@ SKIP: {
         $ENV{LANG} = $ENV{LC_ALL} = 'C';
         my (undef, $fn, $lineno) = caller(0);
         my $t = "$fn:$lineno";
-        state $lei_daemon = PublicInbox::Spawn->can('send_cmd4') ||
-                                eval { require Socket::MsgHdr; 1 };
+        state $lei_daemon = PublicInbox::Spawn->can('send_cmd4') || do {
+                        require PublicInbox::Syscall;
+                        PublicInbox::Syscall->can('send_cmd4');
+                } || eval { require Socket::MsgHdr; 1 };
         unless ($lei_daemon) {
                 skip('Inline::C unconfigured/missing '.
 '(mkdir -p ~/.cache/public-inbox/inline-c) OR Socket::MsgHdr missing',
diff --git a/t/lei-daemon.t b/t/lei-daemon.t
index b60c7ce6..e11105bc 100644
--- a/t/lei-daemon.t
+++ b/t/lei-daemon.t
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un);
@@ -8,12 +8,16 @@ test_lei({ daemon_only => 1 }, sub {
         my $send_cmd = PublicInbox::Spawn->can('send_cmd4') // do {
                 require PublicInbox::CmdIPC4;
                 PublicInbox::CmdIPC4->can('send_cmd4');
+        } // do {
+                require PublicInbox::Syscall;
+                PublicInbox::Syscall->can('send_cmd4');
         };
         $send_cmd or BAIL_OUT 'started testing lei-daemon w/o send_cmd4!';
 
         my $sock = "$ENV{XDG_RUNTIME_DIR}/lei/5.seq.sock";
         my $err_log = "$ENV{XDG_RUNTIME_DIR}/lei/errors.log";
         lei_ok('daemon-pid');
+        ignore_inline_c_missing($lei_err);
         is($lei_err, '', 'no error from daemon-pid');
         like($lei_out, qr/\A[0-9]+\n\z/s, 'pid returned') or BAIL_OUT;
         chomp(my $pid = $lei_out);
diff --git a/t/lei-externals.t b/t/lei-externals.t
index fed57789..284be1b9 100644
--- a/t/lei-externals.t
+++ b/t/lei-externals.t
@@ -76,6 +76,7 @@ test_lei(sub {
         my $config_file = "$home/.config/lei/config";
         my $store_dir = "$home/.local/share/lei";
         lei_ok 'ls-external', \'ls-external on fresh install';
+        ignore_inline_c_missing($lei_err);
         is($lei_out.$lei_err, '', 'ls-external no output, yet');
         ok(!-e $config_file && !-e $store_dir,
                 'nothing created by ls-external');