From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 03/14] treewide: use ->close method rather than CORE::close
Date: Thu, 2 Nov 2023 09:35:28 +0000 [thread overview]
Message-ID: <20231102093539.2067470-4-e@80x24.org> (raw)
In-Reply-To: <20231102093539.2067470-1-e@80x24.org>
It's easier-to-read and should open the door for us to get rid
of `tie' for ProcessIO without performance penalties for
more frequently-used perlop calls and ability to do `stat' directly
on the object instead of the awkward `tied' thing.
---
lib/PublicInbox/CodeSearchIdx.pm | 6 +++---
lib/PublicInbox/DS.pm | 4 ++--
lib/PublicInbox/DirIdle.pm | 2 +-
lib/PublicInbox/Git.pm | 6 +++---
lib/PublicInbox/HTTP.pm | 4 ++--
lib/PublicInbox/LeiMirror.pm | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index bf410734..c1a1ee90 100644
--- a/lib/PublicInbox/CodeSearchIdx.pm
+++ b/lib/PublicInbox/CodeSearchIdx.pm
@@ -480,11 +480,11 @@ sub partition_refs ($$$) {
$seen = 0;
}
if ($DO_QUIT) {
- CORE::close($rfh);
+ $rfh->close;
return ();
}
}
- CORE::close($rfh);
+ $rfh->close;
return () if $DO_QUIT;
if (!$? || (($? & 127) == POSIX::SIGPIPE && $seen > $SEEN_MAX)) {
my $n = $NCHANGE - $n0;
@@ -887,7 +887,7 @@ sub associate {
++$score{"$ibx_id $_"} for @root_ids;
}
}
- CORE::close $rd or die "@join failed: $?=$?";
+ $rd->close or die "fatal: @join failed: \$?=$?";
my $min = $self->{-opt}->{'assoc-min'} // 10;
progress($self, scalar(keys %score).' potential pairings...');
for my $k (keys %score) {
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 8331da95..33f80087 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -341,8 +341,8 @@ sub greet {
my $ev = EPOLLIN;
my $wbuf;
if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
- return CORE::close($sock) if $! != EAGAIN;
- $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock);
+ return $sock->close if $! != EAGAIN;
+ $ev = PublicInbox::TLS::epollbit() or return $sock->close;
$wbuf = [ \&accept_tls_step, $self->can('do_greet')];
}
new($self, $sock, $ev | EPOLLONESHOT);
diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm
index de6f229b..e6a326ab 100644
--- a/lib/PublicInbox/DirIdle.pm
+++ b/lib/PublicInbox/DirIdle.pm
@@ -89,7 +89,7 @@ sub force_close {
my ($self) = @_;
my $inot = delete $self->{inot} // return;
if ($inot->can('fh')) { # Linux::Inotify2 2.3+
- CORE::close($inot->fh) or warn "CLOSE ERROR: $!";
+ $inot->fh->close or warn "CLOSE ERROR: $!";
} elsif ($inot->isa('Linux::Inotify2')) {
require PublicInbox::LI2Wrap;
PublicInbox::LI2Wrap::wrapclose($inot);
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 191e4eea..3dac32be 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -441,12 +441,12 @@ sub qx {
my $fh = popen(@_);
if (wantarray) {
my @ret = <$fh>;
- CORE::close $fh; # caller should check $?
+ $fh->close; # caller should check $?
@ret;
} else {
local $/;
my $ret = <$fh>;
- CORE::close $fh; # caller should check $?
+ $fh->close; # caller should check $?
$ret;
}
}
@@ -621,7 +621,7 @@ sub manifest_entry {
}
}
$ent->{fingerprint} = sha_all(1, $sr)->hexdigest;
- CORE::close $sr or return; # empty, uninitialized git repo
+ $sr->close or return; # empty, uninitialized git repo
$ent->{modified} = modified(undef, $mod);
chomp($buf = <$own> // '');
utf8::decode($buf);
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index edc88fe8..85991ae7 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -63,8 +63,8 @@ sub new ($$$) {
my $ev = EPOLLIN;
my $wbuf;
if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
- return CORE::close($sock) if $! != EAGAIN;
- $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock);
+ return $sock->close if $! != EAGAIN;
+ $ev = PublicInbox::TLS::epollbit() or return $sock->close;
$wbuf = [ \&PublicInbox::DS::accept_tls_step ];
}
$self->{wbuf} = $wbuf if $wbuf;
diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index 0f378768..71f41a11 100644
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -334,7 +334,7 @@ sub fgrp_update {
upr($lei, $w, 'create', $ref, $oid);
}
}
- CORE::close($w) or upref_warn();
+ $w->close or upref_warn();
}
sub satellite_done {
@@ -344,7 +344,7 @@ sub satellite_done {
while (my ($ref, $oid) = each %$create) {
upr($fgrp->{lei}, $w, 'create', $ref, $oid);
}
- CORE::close($w) or upref_warn();
+ $w->close or upref_warn();
} else {
pack_refs($fgrp, $fgrp->{cur_dst});
run_puh($fgrp);
next prev parent reply other threads:[~2023-11-02 9:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 9:35 [PATCH 00/14] IO/IPC-related cleanups Eric Wong
2023-11-02 9:35 ` [PATCH 01/14] xap_helper.pm: use do_fork to Reset and reseed Eric Wong
2023-11-02 9:35 ` [PATCH 02/14] ds: replace FD map hash table with array Eric Wong
2023-11-02 9:35 ` Eric Wong [this message]
2023-11-02 21:35 ` [PATCH 15/14] ds: don't try ->close after ->accept_SSL failure Eric Wong
2023-11-02 9:35 ` [PATCH 04/14] cindex: drop redundant close on regular FH Eric Wong
2023-11-02 9:35 ` [PATCH 05/14] treewide: use ->close to call ProcessIO->CLOSE Eric Wong
2023-11-02 9:35 ` [PATCH 06/14] multi_git: use autodie Eric Wong
2023-11-02 9:35 ` [PATCH 07/14] git_credential: use autodie where appropriate Eric Wong
2023-11-02 9:35 ` [PATCH 08/14] replace ProcessIO with untied PublicInbox::IO Eric Wong
2023-11-02 9:35 ` [PATCH 09/14] io: introduce write_file helper sub Eric Wong
2023-11-02 9:35 ` [PATCH 10/14] spawn: support PerlIO layer in scalar redirects Eric Wong
2023-11-02 9:35 ` [PATCH 11/14] treewide: check alternates writes with eof + autodie Eric Wong
2023-11-02 9:35 ` [PATCH 12/14] treewide: use eof and close to detect readline errors Eric Wong
2023-11-02 9:35 ` [PATCH 13/14] move read_all, try_cat, and poll_in to PublicInbox::IO Eric Wong
2023-11-02 20:59 ` www: squash read_all usage fix Eric Wong
2023-11-02 9:35 ` [PATCH 14/14] t/cindex+extsearch: use write_file, autodie, etc Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231102093539.2067470-4-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).