diff options
author | Eric Wong <e@80x24.org> | 2023-09-04 10:36:01 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2023-09-05 03:01:38 +0000 |
commit | 56706d5d25de794539a974221d553f20f1e619ea (patch) | |
tree | ea0cd7e1b2217dcbff63e723f80422fe5a9d229c | |
parent | 60b0467f838fe712f28880aa3f902991950f6361 (diff) | |
download | public-inbox-56706d5d25de794539a974221d553f20f1e619ea.tar.gz |
We use it to dump SIGWINCH and _SC_NPROCESSORS_ONLN, so "sysdefs" is a more appropriate list for *BSD users.
-rw-r--r-- | MANIFEST | 2 | ||||
-rwxr-xr-x | devel/sysdefs-list (renamed from devel/syscall-list) | 47 | ||||
-rw-r--r-- | lib/PublicInbox/Syscall.pm | 7 |
3 files changed, 30 insertions, 26 deletions
@@ -123,7 +123,7 @@ contrib/selinux/el7/publicinbox.fc contrib/selinux/el7/publicinbox.te devel/README devel/longest-tests -devel/syscall-list +devel/sysdefs-list examples/README examples/README.unsubscribe examples/cgit-commit-filter.lua diff --git a/devel/syscall-list b/devel/sysdefs-list index 0b36c0e2..9764cc29 100755 --- a/devel/syscall-list +++ b/devel/sysdefs-list @@ -1,31 +1,37 @@ # Copyright all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <http://www.gnu.org/licenses/agpl-3.0.txt> -# Dump syscall numbers under Linux and any other kernel which -# promises stable syscall numbers. This is to maintain -# PublicInbox::Syscall -# DO NOT USE this for *BSDs, none of the current BSD kernels -# we know about promise stable syscall numbers, we'll use -# Inline::C to support them. +# Dump system-specific constant numbers this is to maintain +# PublicInbox::Syscall and any other system-specific pieces. +# DO NOT USE syscall numbers for *BSDs, none of the current BSD kernels +# we know about promise stable syscall numbers (unlike Linux). +# However, sysconf(3) constants are stable ABI on all safe to dump. eval 'exec perl -S $0 ${1+"$@"}' # no shebang if 0; # running under some shell -use strict; -use v5.10.1; +use v5.12; use File::Temp 0.19; use POSIX qw(uname); +use Config; say '$machine='.(POSIX::uname())[-1]; -my $cc = $ENV{CC} // 'cc'; -my @cflags = split(/\s+/, $ENV{CFLAGS} // '-Wall'); +my $cc = $ENV{CC} // $Config{cc} // 'cc'; +my @cflags = split(/\s+/, $ENV{CFLAGS} // $Config{ccflags} // '-Wall'); my $str = do { local $/; <DATA> }; -my $tmp = File::Temp->newdir('syscall-list-XXXX', TMPDIR => 1); -my $f = "$tmp/sc.c"; -my $x = "$tmp/sc"; +$str =~ s/^\s*MAYBE\s*(\w+)\s*$/ +#ifdef $1 + D($1); +#endif +/sgxm; +my $tmp = File::Temp->newdir('sysdefs-list-XXXX', TMPDIR => 1); +my $f = "$tmp/sysdefs.c"; +my $x = "$tmp/sysdefs"; open my $fh, '>', $f or die "open $f $!"; print $fh $str or die "print $f $!"; close $fh or die "close $f $!"; -system($cc, '-o', $x, $f, @cflags) == 0 or die "cc failed \$?=$?"; +system($cc, '-o', $x, $f, @cflags) == 0 or die "$cc failed \$?=$?"; exec($x); __DATA__ -#define _GNU_SOURCE +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif #include <signal.h> #include <sys/syscall.h> #include <sys/ioctl.h> @@ -43,9 +49,7 @@ int main(void) #ifdef __linux__ D(SYS_epoll_create1); D(SYS_epoll_ctl); -#ifdef SYS_epoll_wait - D(SYS_epoll_wait); -#endif + MAYBE SYS_epoll_wait D(SYS_epoll_pwait); D(SYS_signalfd4); D(SYS_inotify_init1); @@ -59,13 +63,12 @@ int main(void) printf("FS_IOC_GETFLAGS=%#lx\nFS_IOC_SETFLAGS=%#lx\n", (unsigned long)FS_IOC_GETFLAGS, (unsigned long)FS_IOC_SETFLAGS); #endif - -#ifdef SYS_renameat2 - D(SYS_renameat2); -#endif + MAYBE SYS_renameat2 #endif /* Linux, any other OSes with stable syscalls? */ printf("size_t=%zu off_t=%zu pid_t=%zu\n", sizeof(size_t), sizeof(off_t), sizeof(pid_t)); D(SIGWINCH); + MAYBE _SC_NPROCESSORS_ONLN + return 0; } diff --git a/lib/PublicInbox/Syscall.pm b/lib/PublicInbox/Syscall.pm index 841a2106..4609b32d 100644 --- a/lib/PublicInbox/Syscall.pm +++ b/lib/PublicInbox/Syscall.pm @@ -2,7 +2,7 @@ # specifically the Debian libsys-syscall-perl 0.25-6 version to # fix upstream regressions in 0.25. # -# See devel/syscall-list in the public-inbox source tree for maintenance +# See devel/sysdefs-list in the public-inbox source tree for maintenance # <https://80x24.org/public-inbox.git>, and machines from the GCC Farm: # <https://cfarm.tetaneutral.net/> # @@ -246,7 +246,7 @@ if ($^O eq "linux") { 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 +Send the output of ./devel/sysdefs-list to meta\@public-inbox.org EOM } if ($u64_mod_8) { @@ -259,7 +259,8 @@ EOM } # use Inline::C for *BSD-only or general POSIX stuff. # Linux guarantees stable syscall numbering, BSDs only offer a stable libc -# use devel/syscall-list on Linux to detect new syscall numbers +# use devel/sysdefs-list on Linux to detect new syscall numbers and +# other system constants ############################################################################ # epoll functions |