daemon: make SO_ACCEPTFILTER a shared variable

Constant subroutines use more memory and there's no need to
optimize it for inlining since it's only used at startup.

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 727311a4aa10eb8d97612022869f3ce9f2e15c5b..24dc7791b43de73eaa51e9984c1fc08c3dc92e2b 100644 (file)
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -12,7 +12,6 @@ use IO::Handle; # ->autoflush
 use IO::Socket;
 use POSIX qw(WNOHANG :signal_h);
 use Socket qw(IPPROTO_TCP SOL_SOCKET);
-sub SO_ACCEPTFILTER () { 0x1000 }
 STDOUT->autoflush(1);
 STDERR->autoflush(1);
 use PublicInbox::DS qw(now);
@@ -21,6 +20,7 @@ require PublicInbox::Listener;
 use PublicInbox::EOFpipe;
 use PublicInbox::Sigfd;
 use PublicInbox::GitAsyncCat;
+our $SO_ACCEPTFILTER = 0x1000;
 my @CMD;
 my ($set_user, $oldset);
 my (@cfg_listen, $stdout, $stderr, $group, $user, $pid_file, $daemonize);
@@ -579,10 +579,10 @@ sub defer_accept ($$) {
                return if $sec > 0; # systemd users may set a higher value
                setsockopt($s, IPPROTO_TCP, $TCP_DEFER_ACCEPT, 1);
        } elsif ($^O eq 'freebsd') {
-               my $x = getsockopt($s, SOL_SOCKET, SO_ACCEPTFILTER);
+               my $x = getsockopt($s, SOL_SOCKET, $SO_ACCEPTFILTER);
                return if defined $x; # don't change if set
                my $accf_arg = pack('a16a240', $af_name, '');
-               setsockopt($s, SOL_SOCKET, SO_ACCEPTFILTER, $accf_arg);
+               setsockopt($s, SOL_SOCKET, $SO_ACCEPTFILTER, $accf_arg);
        }
 }
 

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 5dc5734e96d1cb77028641c1ca47e0ad20afe0e8..cec754c9c13ae2a051a3586275c6a838838cf777 100644 (file)
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -36,7 +36,7 @@ if ($^O eq 'linux') {
        }
 } elsif ($^O eq 'freebsd' && system('kldstat -m accf_data >/dev/null') == 0) {
        require PublicInbox::Daemon;
-       my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
+       my $var = $PublicInbox::Daemon::SO_ACCEPTFILTER;
        $accf_arg = pack('a16a240', 'dataready', '');
        setsockopt($sock, SOL_SOCKET, $var, $accf_arg) or die "setsockopt: $!";
 }
@@ -596,7 +596,7 @@ SKIP: {
 SKIP: {
        skip 'SO_ACCEPTFILTER is FreeBSD-only', 1 if $^O ne 'freebsd';
        skip 'accf_data not loaded: kldload accf_data' if !defined $accf_arg;
-       my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
+       my $var = $PublicInbox::Daemon::SO_ACCEPTFILTER;
        defined(my $x = getsockopt($sock, SOL_SOCKET, $var)) or die;
        is($x, $accf_arg, 'SO_ACCEPTFILTER unchanged if previously set');
 };

diff --git a/t/httpd-https.t b/t/httpd-https.t
index bf7d3f94de6c57965aa6883e9cdd68955cc36d08..d42d7c509949ce7137770bb9a8ed488650bac4ef 100644 (file)
--- a/t/httpd-https.t
+++ b/t/httpd-https.t
@@ -98,8 +98,10 @@ for my $args (
                        skip 'accf_data not loaded? kldload accf_data', 2;
                }
                require PublicInbox::Daemon;
-               my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
-               my $x = getsockopt($https, SOL_SOCKET, $var);
+               ok(defined($PublicInbox::Daemon::SO_ACCEPTFILTER),
+                       'SO_ACCEPTFILTER defined');
+               my $x = getsockopt($https, SOL_SOCKET,
+                               $PublicInbox::Daemon::SO_ACCEPTFILTER);
                like($x, qr/\Adataready\0+\z/, 'got dataready accf for https');
        };
 

diff --git a/t/httpd.t b/t/httpd.t
index 849f61bb82ce3807c1b0372e2dfdc4a72ab1c168..aa60121031419d49b6ca1b2ab66ed5b90ff3c542 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -109,8 +109,10 @@ SKIP: {
                skip 'accf_http not loaded: kldload accf_http', 1;
        }
        require PublicInbox::Daemon;
-       my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
-       my $x = getsockopt($sock, SOL_SOCKET, $var);
+       ok(defined($PublicInbox::Daemon::SO_ACCEPTFILTER),
+               'SO_ACCEPTFILTER defined');
+       my $x = getsockopt($sock, SOL_SOCKET,
+                       $PublicInbox::Daemon::SO_ACCEPTFILTER);
        like($x, qr/\Ahttpready\0+\z/, 'got httpready accf for HTTP');
 };
 

diff --git a/t/imapd-tls.t b/t/imapd-tls.t
index 73f5112fcb7275e672be10a944f4c143e9a2be16..44ab350c95b34a7240320e41a88803e3643779e1 100644 (file)
--- a/t/imapd-tls.t
+++ b/t/imapd-tls.t
@@ -176,10 +176,11 @@ for my $args (
                        skip 'accf_data not loaded? kldload accf_data', 2;
                }
                require PublicInbox::Daemon;
-               my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
-               my $x = getsockopt($imaps, SOL_SOCKET, $var);
+               my $x = getsockopt($imaps, SOL_SOCKET,
+                               $PublicInbox::Daemon::SO_ACCEPTFILTER);
                like($x, qr/\Adataready\0+\z/, 'got dataready accf for IMAPS');
-               $x = getsockopt($starttls, IPPROTO_TCP, $var);
+               $x = getsockopt($starttls, IPPROTO_TCP,
+                               $PublicInbox::Daemon::SO_ACCEPTFILTER);
                is($x, undef, 'no BSD accept filter for plain IMAP');
        };
 

diff --git a/t/nntpd-tls.t b/t/nntpd-tls.t
index 9af6c25443a07d768adceadf186e6e3568a9bf61..d81d1e1303fc75f175407aa6c0afe207afc80c02 100644 (file)
--- a/t/nntpd-tls.t
+++ b/t/nntpd-tls.t
@@ -168,10 +168,11 @@ for my $args (
                        skip 'accf_data not loaded? kldload accf_data', 2;
                }
                require PublicInbox::Daemon;
-               my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
-               my $x = getsockopt($nntps, SOL_SOCKET, $var);
+               my $x = getsockopt($nntps, SOL_SOCKET,
+                               $PublicInbox::Daemon::SO_ACCEPTFILTER);
                like($x, qr/\Adataready\0+\z/, 'got dataready accf for NNTPS');
-               $x = getsockopt($starttls, IPPROTO_TCP, $var);
+               $x = getsockopt($starttls, IPPROTO_TCP,
+                               $PublicInbox::Daemon::SO_ACCEPTFILTER);
                is($x, undef, 'no BSD accept filter for plain NNTP');
        };