From: Carlos O'Donell <carlos@redhat.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH v3 14/24] y2038: Use a common definition for semid_ds
Date: Mon, 14 Jun 2021 10:52:04 -0400 [thread overview]
Message-ID: <f1e5d047-a08d-6b15-8c35-f62bf43816e3@redhat.com> (raw)
In-Reply-To: <20210607203613.282543-15-adhemerval.zanella@linaro.org>
On 6/7/21 4:36 PM, Adhemerval Zanella wrote:
> Instead of replicate the same definitions from struct_semid64_ds.h
> on the multiple struct_semid_ds.h, use a common header which is included
> when required (struct_semid64_ds_helper.h).
>
> The __USE_TIME_BITS64 is not defined internally yet, although the
> internal header is used when building the 64-bit semctl implementation.
No regressions on x86_64 and i686 and reviewed resulting ABI for correctness.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/unix/sysv/linux/Makefile | 3 ++-
> .../sysv/linux/bits/types/struct_semid64_ds.h | 5 +---
> .../bits/types/struct_semid64_ds_helper.h | 25 +++++++++++++++++++
> .../sysv/linux/bits/types/struct_semid_ds.h | 10 +++++---
> .../linux/hppa/bits/types/struct_semid_ds.h | 4 +++
> .../linux/mips/bits/types/struct_semid_ds.h | 4 +++
> .../powerpc/bits/types/struct_semid_ds.h | 10 +++++---
> .../linux/sparc/bits/types/struct_semid_ds.h | 10 +++++---
> .../linux/x86/bits/types/struct_semid_ds.h | 4 +++
> 9 files changed, 61 insertions(+), 14 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 6715a4b623..b6abcb1365 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -102,7 +102,8 @@ sysdep_headers += sys/mount.h sys/acct.h \
> bits/ipc-perm.h \
> bits/struct_stat.h \
> bits/struct_stat_time64_helper.h \
> - bits/types/struct_msqid64_ds_helper.h
> + bits/types/struct_msqid64_ds_helper.h \
> + bits/types/struct_semid64_ds_helper.h
>
> tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
> tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h
> index 7263e50bbf..adaee3eb9e 100644
> --- a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h
> @@ -25,9 +25,6 @@
> #else
> struct __semid64_ds
> {
> - struct ipc_perm sem_perm; /* operation permission struct */
> - __time64_t sem_otime; /* last semop() time */
> - __time64_t sem_ctime; /* last time changed by semctl() */
> - __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> +# include <bits/types/struct_semid64_ds_helper.h>
> };
> #endif
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h
> new file mode 100644
> index 0000000000..e6592e6c3f
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h
> @@ -0,0 +1,25 @@
> +/* Common definitions for struct semid_ds with 64-bit time.
> + Copyright (C) 2020-2021 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> + /* Content of internal __semid64_ds. */
> + struct ipc_perm sem_perm; /* operation permission struct */
> + __time64_t sem_otime; /* last semop() time */
> + __time64_t sem_ctime; /* last time changed by semctl() */
> + __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> + unsigned long int __glibc_reserved3;
> + unsigned long int __glibc_reserved4;
OK. Includes serverd entries for the kernel.
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
> index 2f32fa500e..a7b2c9022e 100644
> --- a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
> @@ -23,17 +23,21 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> -#if __TIMESIZE == 32
> +# if __TIMESIZE == 32
> __time_t sem_otime; /* last semop() time */
> __syscall_ulong_t __sem_otime_high;
> __time_t sem_ctime; /* last time changed by semctl() */
> __syscall_ulong_t __sem_ctime_high;
> -#else
> +# else
> __time_t sem_otime;
> __time_t sem_ctime;
> -#endif
> +# endif
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h
> index 16a9735e7b..5067fb1572 100644
> --- a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h
> @@ -23,6 +23,9 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> __syscall_ulong_t __sem_otime_high;
> __time_t sem_otime; /* last semop() time */
> @@ -31,4 +34,5 @@ struct semid_ds
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h
> index 73587ea634..ee9a1e5e61 100644
> --- a/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h
> @@ -23,10 +23,14 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> __time_t sem_otime; /* last semop() time */
> __time_t sem_ctime; /* last time changed by semctl() */
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __sem_otime_high;
> __syscall_ulong_t __sem_ctime_high;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h
> index 8fdbc5d776..0c080fed61 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h
> @@ -23,17 +23,21 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> -#if __TIMESIZE == 32
> +# if __TIMESIZE == 32
> __syscall_ulong_t __sem_otime_high;
> __time_t sem_otime; /* last semop() time */
> __syscall_ulong_t __sem_ctime_high;
> __time_t sem_ctime; /* last time changed by semctl() */
> -#else
> +# else
> __time_t sem_otime; /* last semop() time */
> __time_t sem_ctime; /* last time changed by semctl() */
> -#endif
> +# endif
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h
> index 6b9b3639b2..76810427f6 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h
> @@ -23,17 +23,21 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> -#if __TIMESIZE == 32
> +# if __TIMESIZE == 32
> __syscall_ulong_t __sem_otime_high;
> __time_t sem_otime; /* last semop() time */
> __syscall_ulong_t __sem_ctime_high;
> __time_t sem_ctime; /* last time changed by semctl() */
> -#else
> +# else
> __time_t sem_otime; /* last semop() time */
> __time_t sem_ctime; /* last time changed by semctl() */
> -#endif
> +# endif
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h
> index 90f03b2407..affd38b6bd 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h
> @@ -23,6 +23,9 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> __time_t sem_otime; /* last semop() time */
> __syscall_ulong_t __sem_otime_high;
> @@ -31,4 +34,5 @@ struct semid_ds
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-06-14 14:52 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 20:35 [PATCH v3 00/24] Add 64 bit time support on legacy ABIs Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 01/24] linux: mips: Split librt.abilist in n32 and n64 Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 02/24] linux: mips: Split libanl.abilist " Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 03/24] linux: s390: Add libanl.abilist in s390 and s390x Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 04/24] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO Adhemerval Zanella
2021-06-14 14:52 ` [PATCH v3 04/24] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO Carlos O'Donell
2021-06-07 20:35 ` [PATCH v3 05/24] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Adhemerval Zanella
2021-06-25 15:20 ` Florian Weimer
2021-06-25 18:11 ` Adhemerval Zanella
2021-06-25 19:16 ` Florian Weimer
2021-06-28 13:36 ` Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 06/24] linux: Add recvvmsg " Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 07/24] y2038: Add __USE_TIME_BITS64 support for time_t Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 08/24] y2038: Add __USE_TIME_BITS64 support for struct timeval Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 09/24] y2038: Add __USE_TIME_BITS64 support for struct timespec Adhemerval Zanella
2021-06-07 20:35 ` [PATCH v3 10/24] y2038: Add __USE_TIME_BITS64 support for struct utimbuf Adhemerval Zanella
2021-06-07 20:36 ` [PATCH v3 11/24] y2038: linux: Add __USE_TIME_BITS64 support for struct timex Adhemerval Zanella
2021-06-07 20:36 ` [PATCH v3 12/24] y2038: Use a common definition for stat Adhemerval Zanella
2021-06-14 14:52 ` Carlos O'Donell
2021-06-07 20:36 ` [PATCH v3 13/24] y2038: Use a common definition for msqid_ds Adhemerval Zanella
2021-06-14 14:52 ` Carlos O'Donell
2021-06-07 20:36 ` [PATCH v3 14/24] y2038: Use a common definition for semid_ds Adhemerval Zanella
2021-06-14 14:52 ` Carlos O'Donell [this message]
2021-06-07 20:36 ` [PATCH v3 15/24] y2038: Use a common definition for shmid_ds Adhemerval Zanella
2021-06-14 14:59 ` Carlos O'Donell
2021-06-07 20:36 ` [PATCH v3 16/24] y2038: Add __USE_TIME_BITS64 support for socket-constants.h Adhemerval Zanella
2021-06-07 20:36 ` [PATCH v3 17/24] time: Add 64-bit time support for getdate Adhemerval Zanella
2021-06-07 20:36 ` [PATCH v3 18/24] y2038: Add support for 64-bit time on legacy ABIs Adhemerval Zanella
2021-10-13 11:44 ` Stafford Horne
2021-10-13 16:45 ` Paul Eggert
2021-10-13 21:51 ` Stafford Horne
2021-10-13 20:47 ` Joseph Myers
2021-10-13 21:50 ` Stafford Horne
2021-06-07 20:36 ` [PATCH v3 19/24] posix: Add glob64 with 64-bit time_t support Adhemerval Zanella
2021-06-14 14:52 ` Carlos O'Donell
2021-06-07 20:36 ` [PATCH v3 20/24] io: Add fts64 " Adhemerval Zanella
2021-06-07 20:36 ` [PATCH v3 21/24] io: Add ftw64 " Adhemerval Zanella
2021-06-07 20:36 ` [PATCH v3 22/24] libsupport: Add 64-bit time_t support for time functions Adhemerval Zanella
2021-06-14 14:52 ` Carlos O'Donell
2021-06-07 20:36 ` [PATCH v3 23/24] libsupport: Add 64-bit time_t support for stat functions Adhemerval Zanella
2021-06-07 20:36 ` [PATCH v3 24/24] y2038: Add test coverage Adhemerval Zanella
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f1e5d047-a08d-6b15-8c35-f62bf43816e3@redhat.com \
--to=carlos@redhat.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.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.
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).