* [PATCH 10/14] spawn: support PerlIO layer in scalar redirects
2023-11-02 9:35 5% [PATCH 00/14] IO/IPC-related cleanups Eric Wong
@ 2023-11-02 9:35 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-11-02 9:35 UTC (permalink / raw)
To: meta
We have to deal with UTF-8 data for generating patches, so make
it easier to pass Perl utf8 data to git, diff, sdiff, etc. to
avoid "Wide character" warnings.
---
lib/PublicInbox/MailDiff.pm | 3 +--
lib/PublicInbox/SearchIdx.pm | 2 +-
lib/PublicInbox/Spawn.pm | 30 ++++++++++++++++++++----------
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/MailDiff.pm b/lib/PublicInbox/MailDiff.pm
index c7b991f1..b1c12d6d 100644
--- a/lib/PublicInbox/MailDiff.pm
+++ b/lib/PublicInbox/MailDiff.pm
@@ -63,7 +63,6 @@ sub next_smsg ($) {
sub emit_msg_diff {
my ($bref, $self) = @_; # bref is `git diff' output
# will be escaped to `•' in HTML
- utf8::decode($$bref);
$self->{ctx}->{ibx}->{obfuscate} and
obfuscate_addrs($self->{ctx}->{ibx}, $$bref, "\x{2022}");
print { $self->{ctx}->{zfh} } '</pre><hr><pre>' if $self->{nr} > 1;
@@ -77,7 +76,7 @@ sub do_diff {
my $dir = "$self->{tmp}/$n";
$self->dump_eml($dir, $eml);
my $cmd = [ qw(git diff --no-index --no-color -- a), $n ];
- my $opt = { -C => "$self->{tmp}", quiet => 1 };
+ my $opt = { -C => "$self->{tmp}", quiet => 1, 1 => [':utf8', \my $o] };
my $qsp = PublicInbox::Qspawn->new($cmd, undef, $opt);
$qsp->psgi_qx($self->{ctx}->{env}, undef, \&emit_msg_diff, $self);
}
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 78519b22..9566b14d 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -353,7 +353,7 @@ sub index_diff ($$$) {
sub patch_id {
my ($self, $sref) = @_;
my $git = ($self->{ibx} // $self->{eidx} // $self)->git;
- my $opt = { 0 => $sref, 2 => \(my $err) };
+ my $opt = { 0 => [ ':utf8', $sref ], 2 => \(my $err) };
my $id = run_qx($git->cmd(qw(patch-id --stable)), undef, $opt);
warn $err if $err;
$id =~ /\A([a-f0-9]{40,})/ ? $1 : undef;
diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm
index d3b7ef6f..b0edeb33 100644
--- a/lib/PublicInbox/Spawn.pm
+++ b/lib/PublicInbox/Spawn.pm
@@ -332,6 +332,18 @@ sub which ($) {
undef;
}
+sub scalar_redirect {
+ my ($layer, $opt, $child_fd, $bref) = @_;
+ open my $fh, '+>'.$layer, undef;
+ $opt->{"fh.$child_fd"} = $fh;
+ if ($child_fd == 0) {
+ print $fh $$bref;
+ $fh->flush or die "flush: $!";
+ sysseek($fh, 0, SEEK_SET);
+ }
+ fileno($fh);
+}
+
sub spawn ($;$$) {
my ($cmd, $env, $opt) = @_;
my $f = which($cmd->[0]) // die "$cmd->[0]: command not found\n";
@@ -342,15 +354,11 @@ sub spawn ($;$$) {
}
for my $child_fd (0..2) {
my $pfd = $opt->{$child_fd};
- if ('SCALAR' eq ref($pfd)) {
- open my $fh, '+>:utf8', undef;
- $opt->{"fh.$child_fd"} = $fh;
- if ($child_fd == 0) {
- print $fh $$pfd;
- $fh->flush or die "flush: $!";
- sysseek($fh, 0, SEEK_SET);
- }
- $pfd = fileno($fh);
+ if ('ARRAY' eq ref($pfd)) {
+ my ($layer, $bref) = @$pfd;
+ $pfd = scalar_redirect($layer, $opt, $child_fd, $bref)
+ } elsif ('SCALAR' eq ref($pfd)) {
+ $pfd = scalar_redirect('', $opt, $child_fd, $pfd);
} elsif (defined($pfd) && $pfd !~ /\A[0-9]+\z/) {
my $fd = fileno($pfd) //
die "$pfd not an IO GLOB? $!";
@@ -394,7 +402,9 @@ sub read_out_err ($) {
for my $fd (1, 2) { # read stdout/stderr
my $fh = delete($opt->{"fh.$fd"}) // next;
seek($fh, 0, SEEK_SET);
- ${$opt->{$fd}} .= <$fh>;
+ my $dst = $opt->{$fd};
+ $dst = $opt->{$fd} = $dst->[1] if ref($dst) eq 'ARRAY';
+ $$dst .= <$fh>;
$fh->error and croak "E: read(FD=$fd): $!";
}
}
^ permalink raw reply related [relevance 7%]
* [PATCH 00/14] IO/IPC-related cleanups
@ 2023-11-02 9:35 5% Eric Wong
2023-11-02 9:35 7% ` [PATCH 10/14] spawn: support PerlIO layer in scalar redirects Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-11-02 9:35 UTC (permalink / raw)
To: meta
8/14 to replace ProcessIO is a major change that I've been
hammering away at for a bit, and many preceding patches to
eliminate ->close calls make it easier to review.
11-12/14 - Error checking for buffered readline is a PITA
(IO::Handle->error was insufficient until Perl 5.34), and I may
switch to sysread eventually to avoid the double-copy overhead
of buffered bulk I/O, anyways. The only place we really benefit
from userspace buffered disk reads is IdxStack, I think...
The new write_file sub in 9/14 seems long overdue.
Eric Wong (14):
xap_helper.pm: use do_fork to Reset and reseed
ds: replace FD map hash table with array
treewide: use ->close method rather than CORE::close
cindex: drop redundant close on regular FH
treewide: use ->close to call ProcessIO->CLOSE
multi_git: use autodie
git_credential: use autodie where appropriate
replace ProcessIO with untied PublicInbox::IO
io: introduce write_file helper sub
spawn: support PerlIO layer in scalar redirects
treewide: check alternates writes with eof + autodie
treewide: use eof and close to detect readline errors
move read_all, try_cat, and poll_in to PublicInbox::IO
t/cindex+extsearch: use write_file, autodie, etc.
MANIFEST | 4 +-
lib/PublicInbox/CodeSearchIdx.pm | 14 +++---
lib/PublicInbox/Config.pm | 2 +-
lib/PublicInbox/DS.pm | 22 ++++-----
lib/PublicInbox/DirIdle.pm | 2 +-
lib/PublicInbox/Gcf2.pm | 4 +-
lib/PublicInbox/Gcf2Client.pm | 7 ++-
lib/PublicInbox/Git.pm | 36 ++++----------
lib/PublicInbox/GitCredential.pm | 16 +++----
lib/PublicInbox/HTTP.pm | 4 +-
lib/PublicInbox/IO.pm | 80 ++++++++++++++++++++++++++++++++
lib/PublicInbox/IdxStack.pm | 2 +-
lib/PublicInbox/Import.pm | 18 ++++---
lib/PublicInbox/Inbox.pm | 2 +-
lib/PublicInbox/InboxWritable.pm | 2 +-
lib/PublicInbox/InputPipe.pm | 1 -
lib/PublicInbox/LEI.pm | 8 ++--
lib/PublicInbox/LeiALE.pm | 6 +--
lib/PublicInbox/LeiBlob.pm | 3 +-
lib/PublicInbox/LeiConfig.pm | 2 +-
lib/PublicInbox/LeiInput.pm | 5 +-
lib/PublicInbox/LeiMailSync.pm | 3 +-
lib/PublicInbox/LeiMirror.pm | 57 +++++++++--------------
lib/PublicInbox/LeiRediff.pm | 11 ++---
lib/PublicInbox/LeiStoreErr.pm | 2 +-
lib/PublicInbox/LeiSucks.pm | 2 +-
lib/PublicInbox/LeiToMail.pm | 34 +++++++-------
lib/PublicInbox/LeiViewText.pm | 2 +-
lib/PublicInbox/LeiXSearch.pm | 8 ++--
lib/PublicInbox/MailDiff.pm | 21 ++++-----
lib/PublicInbox/MboxReader.pm | 4 +-
lib/PublicInbox/MultiGit.pm | 13 +++---
lib/PublicInbox/ProcessIO.pm | 75 ------------------------------
lib/PublicInbox/ProcessIONBF.pm | 25 ----------
lib/PublicInbox/Qspawn.pm | 5 +-
lib/PublicInbox/SearchIdx.pm | 4 +-
lib/PublicInbox/SolverGit.pm | 38 ++++++---------
lib/PublicInbox/Spawn.pm | 42 ++++++++++-------
lib/PublicInbox/TestCommon.pm | 4 +-
lib/PublicInbox/V2Writable.pm | 2 +-
lib/PublicInbox/ViewVCS.pm | 6 +--
lib/PublicInbox/WWW.pm | 2 +-
lib/PublicInbox/XapHelper.pm | 14 ++----
lib/PublicInbox/XapHelperCxx.pm | 3 +-
script/public-inbox-convert | 6 +--
script/public-inbox-edit | 3 +-
script/public-inbox-init | 4 +-
t/cindex.t | 17 ++-----
t/clone-coderepo.t | 10 ++--
t/extsearch.t | 48 ++++++-------------
t/httpd-corner.t | 2 +-
t/init.t | 2 +-
t/io.t | 33 +++++++++++++
t/lei-mirror.t | 10 ++--
t/lei-q-kw.t | 4 +-
t/spawn.t | 36 +++++++-------
xt/check-run.t | 2 +-
xt/git_async_cmp.t | 4 +-
xt/httpd-async-stream.t | 2 +-
59 files changed, 368 insertions(+), 432 deletions(-)
create mode 100644 lib/PublicInbox/IO.pm
delete mode 100644 lib/PublicInbox/ProcessIO.pm
delete mode 100644 lib/PublicInbox/ProcessIONBF.pm
create mode 100644 t/io.t
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-11-02 9:35 5% [PATCH 00/14] IO/IPC-related cleanups Eric Wong
2023-11-02 9:35 7% ` [PATCH 10/14] spawn: support PerlIO layer in scalar redirects 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).