From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id CAF4F1F565 for ; Fri, 1 Sep 2023 21:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1693602864; bh=D/8wy9GVvs7LZDr3O6u+FjpW0ldwTNLf7ESfQapNFn0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=enCG0DGWGd3aD3JBSR1GZM/ZjZ/5btSGK8UKAYnUAaJTsLDVbqWwaMFAVgU/XdJVt 1yo3uCWww35PNB45pd5yvtZV6Z2IJ5S55Osqgy+jNhwFClRRjNhXX6AWIq4TYvhwm6 vX78Z2fu2eBmQcevTK6eAm1532QQn1NaBibFRZQE= From: Eric Wong To: spew@80x24.org Subject: [PATCH 3/3] update devel/syscall-list to devel/sysdefs-list Date: Fri, 1 Sep 2023 21:12:44 +0000 Message-ID: <20230901211244.32050-3-e@80x24.org> In-Reply-To: <20230901211244.32050-1-e@80x24.org> References: <20230901211244.32050-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We use it to dump SIGWINCH and _SC_NPROCESSORS_ONLN, so "sysdefs" is a more appropriate list for *BSD users. --- MANIFEST | 2 +- devel/{syscall-list => sysdefs-list} | 47 +++++++++++++++------------- lib/PublicInbox/Syscall.pm | 7 +++-- 3 files changed, 30 insertions(+), 26 deletions(-) rename devel/{syscall-list => sysdefs-list} (60%) diff --git a/MANIFEST b/MANIFEST index 918ec2e1..5964794e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -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 similarity index 60% rename from devel/syscall-list rename to devel/sysdefs-list index 0b36c0e2..9764cc29 100755 --- a/devel/syscall-list +++ b/devel/sysdefs-list @@ -1,31 +1,37 @@ # Copyright all contributors # License: AGPL-3.0+ -# 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 $/; }; -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 #include #include @@ -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 # , and machines from the GCC Farm: # # @@ -246,7 +246,7 @@ if ($^O eq "linux") { warn <