From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/2] syscall: drop syscall.ph support
Date: Fri, 23 Dec 2022 12:51:08 +0000 [thread overview]
Message-ID: <20221223125108.963997-3-e@80x24.org> (raw)
In-Reply-To: <20221223125108.963997-1-e@80x24.org>
h2ph-generated *.ph files are often wrong or incomplete and IME
they cause more problems than they solve. Furthermore, we need
knowledge of struct layouts which h2ph-generated files can't get
us. So trim down some bloat and leave a note for porters.
---
lib/PublicInbox/Syscall.pm | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/lib/PublicInbox/Syscall.pm b/lib/PublicInbox/Syscall.pm
index bda9bbb0..cecb1247 100644
--- a/lib/PublicInbox/Syscall.pm
+++ b/lib/PublicInbox/Syscall.pm
@@ -60,21 +60,6 @@ use constant {
};
my @BYTES_4_hole = BYTES_4_hole ? (0) : ();
-our $loaded_syscall = 0;
-
-sub _load_syscall {
- # props to Gaal for this!
- return if $loaded_syscall++;
- my $clean = sub {
- delete @INC{qw<syscall.ph asm/unistd.ph bits/syscall.ph
- _h2ph_pre.ph sys/syscall.ph>};
- };
- $clean->(); # don't trust modules before us
- my $rv = eval { require 'syscall.ph'; 1 } || eval { require 'sys/syscall.ph'; 1 };
- $clean->(); # don't require modules after us trust us
- $rv;
-}
-
our (
$SYS_epoll_create,
@@ -256,19 +241,12 @@ if ($^O eq "linux") {
$FS_IOC_SETFLAGS = 0x80046602;
$SIGNUM{WINCH} = 20;
} else {
- # as a last resort, try using the *.ph files which may not
- # exist or may be wrong
- _load_syscall();
- $SYS_epoll_create = eval { &SYS_epoll_create; } || 0;
- $SYS_epoll_ctl = eval { &SYS_epoll_ctl; } || 0;
- $SYS_epoll_wait = eval { &SYS_epoll_wait; } || 0;
-
- # Note: do NOT add new syscalls to depend on *.ph, here.
- # Better to miss syscalls (so we can fallback to IO::Poll)
- # than to use wrong ones, since the names are not stable
- # (at least not on FreeBSD), if the actual numbers are.
+ warn <<EOM;
+machine=$machine ptrsize=$Config{ptrsize} has no syscall definitions
+git clone https://80x24.org/public-inbox.git and
+Send the output of ./devel/syscall-list to meta\@public-inbox.org
+EOM
}
-
if ($u64_mod_8) {
*epoll_wait = \&epoll_wait_mod8;
*epoll_ctl = \&epoll_ctl_mod8;
@@ -279,7 +257,7 @@ if ($^O eq "linux") {
}
# use Inline::C for *BSD-only or general POSIX stuff.
# Linux guarantees stable syscall numbering, BSDs only offer a stable libc
-# use scripts/syscall-list on Linux to detect new syscall numbers
+# use devel/syscall-list on Linux to detect new syscall numbers
############################################################################
# epoll functions
prev parent reply other threads:[~2022-12-23 12:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-23 12:51 [PATCH 0/2] syscall debloating Eric Wong
2022-12-23 12:51 ` [PATCH 1/2] syscall: get rid of epoll_defined() sub Eric Wong
2022-12-23 12:51 ` Eric Wong [this message]
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: https://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=20221223125108.963997-3-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).