From e901a56b3b30b22f16bc9c6460150b2b402b4ee7 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 21 May 2021 10:28:25 +0000 Subject: [PATCH] treewide: favor open(..., '+<&=', $fd) Cut down on unnecessary imports of IO::Handle and method lookup + dispatch overhead. --- examples/unsubscribe.milter | 3 +-- lib/PublicInbox/DS.pm | 3 +-- lib/PublicInbox/Daemon.pm | 2 +- lib/PublicInbox/Sigfd.pm | 3 +-- t/epoll.t | 7 +++++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/unsubscribe.milter b/examples/unsubscribe.milter index 7b126e30..608524cb 100644 --- a/examples/unsubscribe.milter +++ b/examples/unsubscribe.milter @@ -2,7 +2,6 @@ # Copyright (C) 2016-2021 all contributors # License: AGPL-3.0+ use strict; -use warnings; use Sendmail::PMilter qw(:all); use IO::Socket; use Crypt::CBC; @@ -128,7 +127,7 @@ my $fds = $ENV{LISTEN_FDS}; if ($fds && (($ENV{LISTEN_PID} || 0) == $$)) { die "$0 can only listen on one FD\n" if $fds != 1; my $start_fd = 3; - my $s = IO::Socket->new_from_fd($start_fd, 'r') or + open(my $s, '<&=', $start_fd) or die "inherited bad FD from LISTEN_FDS: $!\n"; $milter->set_socket($s); } else { diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 3cddfd18..7a4dfed0 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -25,7 +25,6 @@ use v5.10.1; use parent qw(Exporter); use bytes; use POSIX qw(WNOHANG sigprocmask SIG_SETMASK); -use IO::Handle qw(); use Fcntl qw(SEEK_SET :DEFAULT O_APPEND); use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); use Scalar::Util qw(blessed); @@ -135,7 +134,7 @@ sub add_timer ($$;@) { sub set_cloexec ($) { my ($fd) = @_; - $_io = IO::Handle->new_from_fd($fd, 'r+') or return; + open($_io, '+<&=', $fd) or return; defined(my $fl = fcntl($_io, F_GETFD, 0)) or return; fcntl($_io, F_SETFD, $fl | FD_CLOEXEC); } diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm index b5f97d81..727311a4 100644 --- a/lib/PublicInbox/Daemon.pm +++ b/lib/PublicInbox/Daemon.pm @@ -367,7 +367,7 @@ sub inherit ($) { my $end = $fds + 2; # LISTEN_FDS_START - 1 my @rv = (); foreach my $fd (3..$end) { - my $s = IO::Handle->new_from_fd($fd, 'r'); + open(my $s, '<&=', $fd) or warn "fdopen fd=$fd: $!"; if (my $k = sockname($s)) { my $prev_was_blocking = $s->blocking(0); warn <<"" if $prev_was_blocking; diff --git a/lib/PublicInbox/Sigfd.pm b/lib/PublicInbox/Sigfd.pm index a4d1b3bb..d91ea0e7 100644 --- a/lib/PublicInbox/Sigfd.pm +++ b/lib/PublicInbox/Sigfd.pm @@ -8,7 +8,6 @@ use strict; use parent qw(PublicInbox::DS); use PublicInbox::Syscall qw(signalfd EPOLLIN EPOLLET SFD_NONBLOCK); use POSIX (); -use IO::Handle (); # returns a coderef to unblock signals if neither signalfd or kqueue # are available. @@ -27,7 +26,7 @@ sub new { my $io; my $fd = signalfd(-1, [keys %signo], $flags); if (defined $fd && $fd >= 0) { - $io = IO::Handle->new_from_fd($fd, 'r+'); + open($io, '+<&=', $fd) or die "open: $!"; } elsif (eval { require PublicInbox::DSKQXS }) { $io = PublicInbox::DSKQXS->signalfd([keys %signo], $flags); } else { diff --git a/t/epoll.t b/t/epoll.t index f2a68904..f346b387 100644 --- a/t/epoll.t +++ b/t/epoll.t @@ -1,11 +1,14 @@ +#!perl -w +# Copyright (C) 2020-2021 all contributors +# License: AGPL-3.0+ use strict; +use v5.10.1; use Test::More; -use IO::Handle; use PublicInbox::Syscall qw(:epoll); plan skip_all => 'not Linux' if $^O ne 'linux'; my $epfd = epoll_create(); ok($epfd >= 0, 'epoll_create'); -my $hnd = IO::Handle->new_from_fd($epfd, 'r+'); # close on exit +open(my $hnd, '+<&=', $epfd); # for autoclose pipe(my ($r, $w)) or die "pipe: $!"; is(epoll_ctl($epfd, EPOLL_CTL_ADD, fileno($w), EPOLLOUT), 0, -- 2.44.0