* [PATCH 4/7] xap_helper: allow PI_NO_CXX to disable C++ in more places
2023-11-26 2:10 6% [PATCH 0/7] more I/O + process reliability and cleanups Eric Wong
@ 2023-11-26 2:11 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-11-26 2:11 UTC (permalink / raw)
To: meta
This also reduces repetition in the setup code.
---
lib/PublicInbox/XapClient.pm | 4 +---
lib/PublicInbox/XapHelperCxx.pm | 1 +
t/xap_helper.t | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/XapClient.pm b/lib/PublicInbox/XapClient.pm
index 1f9ddccc..4dcbbe5d 100644
--- a/lib/PublicInbox/XapClient.pm
+++ b/lib/PublicInbox/XapClient.pm
@@ -28,12 +28,10 @@ sub mkreq {
sub start_helper {
my @argv = @_;
socketpair(my $sock, my $in, AF_UNIX, SOCK_SEQPACKET, 0);
- require PublicInbox::XapHelperCxx;
my $cls = 'PublicInbox::XapHelperCxx';
my $env;
- my $cmd = eval { PublicInbox::XapHelperCxx::cmd() };
+ my $cmd = eval "require $cls; ${cls}::cmd()";
if ($@) { # fall back to Perl + XS|SWIG
- require PublicInbox::XapHelper;
$cls = 'PublicInbox::XapHelper';
# ensure the child process has the same @INC we do:
$env = { PERL5LIB => join(':', @INC) };
diff --git a/lib/PublicInbox/XapHelperCxx.pm b/lib/PublicInbox/XapHelperCxx.pm
index b1deb665..f421c7bc 100644
--- a/lib/PublicInbox/XapHelperCxx.pm
+++ b/lib/PublicInbox/XapHelperCxx.pm
@@ -110,6 +110,7 @@ sub check_build () {
# returns spawn arg
sub cmd {
+ die 'PI_NO_CXX set' if $ENV{PI_NO_CXX};
check_build();
my @cmd;
if (my $v = $ENV{VALGRIND}) {
diff --git a/t/xap_helper.t b/t/xap_helper.t
index 02e5ec7d..e3abeded 100644
--- a/t/xap_helper.t
+++ b/t/xap_helper.t
@@ -149,7 +149,7 @@ unless ($ENV{TEST_XH_CXX_ONLY}) {
SKIP: {
require PublicInbox::XapHelperCxx;
my $cmd = eval { PublicInbox::XapHelperCxx::cmd() };
- skip "XapHelperCxx build: $@", 1 if $@ || $ENV{PI_NO_CXX};
+ skip "XapHelperCxx build: $@", 1 if $@;
@NO_CXX = $ENV{TEST_XH_CXX_ONLY} ? (0) : (0, 1);
my $ar = $test->(@$cmd, '-j0');
^ permalink raw reply related [relevance 7%]
* [PATCH 0/7] more I/O + process reliability and cleanups
@ 2023-11-26 2:10 6% Eric Wong
2023-11-26 2:11 7% ` [PATCH 4/7] xap_helper: allow PI_NO_CXX to disable C++ in more places Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-11-26 2:10 UTC (permalink / raw)
To: meta
6/7 ought to fix another hang in t/lei-q-save.t when writing to
v2 outputs.
Much of this stuff will be relevant to code search since Xapian
searches will be moved to C++ (if available) to support features
which aren't usable from Perl bindings and allow more
predictable performance anyways.
Eric Wong (7):
xap_helper_cxx: do not copy xap_helper.h source
xap_client: attach PID to the IO object
xap_client: pass arguments to top-level xap_helper
xap_helper: allow PI_NO_CXX to disable C++ in more places
git: move rbuf handling to PublicInbox::IO
git: improve coupling with {sock} and {inflight} fields
drop redundant calls to DS->Reset
lib/PublicInbox/CodeSearchIdx.pm | 11 +--
lib/PublicInbox/Daemon.pm | 1 -
lib/PublicInbox/Gcf2Client.pm | 7 +-
lib/PublicInbox/Git.pm | 138 ++++++++++++-------------------
lib/PublicInbox/GitAsyncCat.pm | 2 +-
lib/PublicInbox/IO.pm | 70 ++++++++++++++--
lib/PublicInbox/TestCommon.pm | 2 +-
lib/PublicInbox/Watch.pm | 6 +-
lib/PublicInbox/XapClient.pm | 9 +-
lib/PublicInbox/XapHelperCxx.pm | 11 +--
lib/PublicInbox/Xapcmd.pm | 6 +-
t/xap_helper.t | 5 +-
12 files changed, 145 insertions(+), 123 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-11-26 2:10 6% [PATCH 0/7] more I/O + process reliability and cleanups Eric Wong
2023-11-26 2:11 7% ` [PATCH 4/7] xap_helper: allow PI_NO_CXX to disable C++ in more places Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).