[5/7] sysvipc: Split out linux struct shmid_ds
Commit Message
This will allow us to have architectures specify their own version.
Not semantic changes expected. Checked with a build against the
all affected ABIs.
---
sysdeps/unix/sysv/linux/Makefile | 1 +
sysdeps/unix/sysv/linux/bits/shm.h | 34 +----------
.../sysv/linux/bits/types/struct_shmid_ds.h | 57 +++++++++++++++++++
3 files changed, 59 insertions(+), 33 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
Comments
On Tue, Jun 30, 2020 at 12:27 PM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> This will allow us to have architectures specify their own version.
>
> Not semantic changes expected. Checked with a build against the
> all affected ABIs.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> sysdeps/unix/sysv/linux/Makefile | 1 +
> sysdeps/unix/sysv/linux/bits/shm.h | 34 +----------
> .../sysv/linux/bits/types/struct_shmid_ds.h | 57 +++++++++++++++++++
> 3 files changed, 59 insertions(+), 33 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 505087e617..bdd187af73 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -93,6 +93,7 @@ sysdep_headers += sys/mount.h sys/acct.h \
> bits/termios-misc.h \
> bits/types/struct_semid_ds.h \
> bits/types/struct_msqid_ds.h \
> + bits/types/struct_shmid_ds.h \
> bits/ipc-perm.h
>
> tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
> diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h
> index 113c05ee89..9ef6aeaf92 100644
> --- a/sysdeps/unix/sysv/linux/bits/shm.h
> +++ b/sysdeps/unix/sysv/linux/bits/shm.h
> @@ -43,39 +43,7 @@ __BEGIN_DECLS
> /* Type to count number of attaches. */
> typedef __syscall_ulong_t shmatt_t;
>
> -#if __SHM_PAD_BEFORE_TIME
> -# define __SHM_PAD_TIME(NAME, RES) \
> - unsigned long int __glibc_reserved ## RES; __time_t NAME
> -#elif __SHM_PAD_AFTER_TIME
> -# define __SHM_PAD_TIME(NAME, RES) \
> - __time_t NAME; unsigned long int __glibc_reserved ## RES
> -#else
> -# define __SHM_PAD_TIME(NAME, RES) \
> - __time_t NAME
> -#endif
> -
> -/* Data structure describing a shared memory segment. */
> -struct shmid_ds
> - {
> - struct ipc_perm shm_perm; /* operation permission struct */
> -#if !__SHM_SEGSZ_AFTER_TIME
> - size_t shm_segsz; /* size of segment in bytes */
> -#endif
> - __SHM_PAD_TIME (shm_atime, 1); /* time of last shmat() */
> - __SHM_PAD_TIME (shm_dtime, 2); /* time of last shmdt() */
> - __SHM_PAD_TIME (shm_ctime, 3); /* time of last change by shmctl() */
> -#if __SHM_PAD_BETWEEN_TIME_AND_SEGSZ
> - unsigned long int __glibc_reserved4;
> -#endif
> -#if __SHM_SEGSZ_AFTER_TIME
> - size_t shm_segsz; /* size of segment in bytes */
> -#endif
> - __pid_t shm_cpid; /* pid of creator */
> - __pid_t shm_lpid; /* pid of last shmop */
> - shmatt_t shm_nattch; /* number of current attaches */
> - __syscall_ulong_t __glibc_reserved5;
> - __syscall_ulong_t __glibc_reserved6;
> - };
> +#include <bits/types/struct_shmid_ds.h>
>
> #ifdef __USE_MISC
>
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
> new file mode 100644
> index 0000000000..938bbedfcd
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
> @@ -0,0 +1,57 @@
> +/* Generic implementation of the shared memory struct shmid_ds.
> + Copyright (C) 2020 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/>. */
> +
> +#ifndef _SYS_SHM_H
> +# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
> +#endif
> +
> +#include <bits/shm-pad.h>
> +
> +#if __SHM_PAD_BEFORE_TIME
> +# define __SHM_PAD_TIME(NAME, RES) \
> + unsigned long int __glibc_reserved ## RES; __time_t NAME
> +#elif __SHM_PAD_AFTER_TIME
> +# define __SHM_PAD_TIME(NAME, RES) \
> + __time_t NAME; unsigned long int __glibc_reserved ## RES
> +#else
> +# define __SHM_PAD_TIME(NAME, RES) \
> + __time_t NAME
> +#endif
> +
> +/* Data structure describing a shared memory segment. */
> +struct shmid_ds
> + {
> + struct ipc_perm shm_perm; /* operation permission struct */
> +#if !__SHM_SEGSZ_AFTER_TIME
> + size_t shm_segsz; /* size of segment in bytes */
> +#endif
> + __SHM_PAD_TIME (shm_atime, 1); /* time of last shmat() */
> + __SHM_PAD_TIME (shm_dtime, 2); /* time of last shmdt() */
> + __SHM_PAD_TIME (shm_ctime, 3); /* time of last change by shmctl() */
> +#if __SHM_PAD_BETWEEN_TIME_AND_SEGSZ
> + unsigned long int __glibc_reserved4;
> +#endif
> +#if __SHM_SEGSZ_AFTER_TIME
> + size_t shm_segsz; /* size of segment in bytes */
> +#endif
> + __pid_t shm_cpid; /* pid of creator */
> + __pid_t shm_lpid; /* pid of last shmop */
> + shmatt_t shm_nattch; /* number of current attaches */
> + __syscall_ulong_t __glibc_reserved5;
> + __syscall_ulong_t __glibc_reserved6;
> + };
> --
> 2.25.1
>
On 6/30/20 3:24 PM, Adhemerval Zanella via Libc-alpha wrote:
> This will allow us to have architectures specify their own version.
OK for master.
No regressions on x86_64 and i686.
Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
>
> Not semantic changes expected. Checked with a build against the
> all affected ABIs.
> ---
> sysdeps/unix/sysv/linux/Makefile | 1 +
> sysdeps/unix/sysv/linux/bits/shm.h | 34 +----------
> .../sysv/linux/bits/types/struct_shmid_ds.h | 57 +++++++++++++++++++
> 3 files changed, 59 insertions(+), 33 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 505087e617..bdd187af73 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -93,6 +93,7 @@ sysdep_headers += sys/mount.h sys/acct.h \
> bits/termios-misc.h \
> bits/types/struct_semid_ds.h \
> bits/types/struct_msqid_ds.h \
> + bits/types/struct_shmid_ds.h \
OK.
> bits/ipc-perm.h
>
> tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
> diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h
> index 113c05ee89..9ef6aeaf92 100644
> --- a/sysdeps/unix/sysv/linux/bits/shm.h
> +++ b/sysdeps/unix/sysv/linux/bits/shm.h
> @@ -43,39 +43,7 @@ __BEGIN_DECLS
> /* Type to count number of attaches. */
> typedef __syscall_ulong_t shmatt_t;
>
> -#if __SHM_PAD_BEFORE_TIME
> -# define __SHM_PAD_TIME(NAME, RES) \
> - unsigned long int __glibc_reserved ## RES; __time_t NAME
> -#elif __SHM_PAD_AFTER_TIME
> -# define __SHM_PAD_TIME(NAME, RES) \
> - __time_t NAME; unsigned long int __glibc_reserved ## RES
> -#else
> -# define __SHM_PAD_TIME(NAME, RES) \
> - __time_t NAME
> -#endif
> -
> -/* Data structure describing a shared memory segment. */
> -struct shmid_ds
> - {
> - struct ipc_perm shm_perm; /* operation permission struct */
> -#if !__SHM_SEGSZ_AFTER_TIME
> - size_t shm_segsz; /* size of segment in bytes */
> -#endif
> - __SHM_PAD_TIME (shm_atime, 1); /* time of last shmat() */
> - __SHM_PAD_TIME (shm_dtime, 2); /* time of last shmdt() */
> - __SHM_PAD_TIME (shm_ctime, 3); /* time of last change by shmctl() */
> -#if __SHM_PAD_BETWEEN_TIME_AND_SEGSZ
> - unsigned long int __glibc_reserved4;
> -#endif
> -#if __SHM_SEGSZ_AFTER_TIME
> - size_t shm_segsz; /* size of segment in bytes */
> -#endif
> - __pid_t shm_cpid; /* pid of creator */
> - __pid_t shm_lpid; /* pid of last shmop */
> - shmatt_t shm_nattch; /* number of current attaches */
> - __syscall_ulong_t __glibc_reserved5;
> - __syscall_ulong_t __glibc_reserved6;
> - };
> +#include <bits/types/struct_shmid_ds.h>
OK.
>
> #ifdef __USE_MISC
>
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
> new file mode 100644
> index 0000000000..938bbedfcd
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
> @@ -0,0 +1,57 @@
> +/* Generic implementation of the shared memory struct shmid_ds.
OK.
> + Copyright (C) 2020 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/>. */
> +
> +#ifndef _SYS_SHM_H
> +# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
> +#endif
> +
> +#include <bits/shm-pad.h>
> +
> +#if __SHM_PAD_BEFORE_TIME
> +# define __SHM_PAD_TIME(NAME, RES) \
> + unsigned long int __glibc_reserved ## RES; __time_t NAME
> +#elif __SHM_PAD_AFTER_TIME
> +# define __SHM_PAD_TIME(NAME, RES) \
> + __time_t NAME; unsigned long int __glibc_reserved ## RES
> +#else
> +# define __SHM_PAD_TIME(NAME, RES) \
> + __time_t NAME
> +#endif
> +
> +/* Data structure describing a shared memory segment. */
> +struct shmid_ds
> + {
> + struct ipc_perm shm_perm; /* operation permission struct */
> +#if !__SHM_SEGSZ_AFTER_TIME
> + size_t shm_segsz; /* size of segment in bytes */
> +#endif
> + __SHM_PAD_TIME (shm_atime, 1); /* time of last shmat() */
> + __SHM_PAD_TIME (shm_dtime, 2); /* time of last shmdt() */
> + __SHM_PAD_TIME (shm_ctime, 3); /* time of last change by shmctl() */
> +#if __SHM_PAD_BETWEEN_TIME_AND_SEGSZ
> + unsigned long int __glibc_reserved4;
> +#endif
> +#if __SHM_SEGSZ_AFTER_TIME
> + size_t shm_segsz; /* size of segment in bytes */
> +#endif
> + __pid_t shm_cpid; /* pid of creator */
> + __pid_t shm_lpid; /* pid of last shmop */
> + shmatt_t shm_nattch; /* number of current attaches */
> + __syscall_ulong_t __glibc_reserved5;
> + __syscall_ulong_t __glibc_reserved6;
> + };
>
@@ -93,6 +93,7 @@ sysdep_headers += sys/mount.h sys/acct.h \
bits/termios-misc.h \
bits/types/struct_semid_ds.h \
bits/types/struct_msqid_ds.h \
+ bits/types/struct_shmid_ds.h \
bits/ipc-perm.h
tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
@@ -43,39 +43,7 @@ __BEGIN_DECLS
/* Type to count number of attaches. */
typedef __syscall_ulong_t shmatt_t;
-#if __SHM_PAD_BEFORE_TIME
-# define __SHM_PAD_TIME(NAME, RES) \
- unsigned long int __glibc_reserved ## RES; __time_t NAME
-#elif __SHM_PAD_AFTER_TIME
-# define __SHM_PAD_TIME(NAME, RES) \
- __time_t NAME; unsigned long int __glibc_reserved ## RES
-#else
-# define __SHM_PAD_TIME(NAME, RES) \
- __time_t NAME
-#endif
-
-/* Data structure describing a shared memory segment. */
-struct shmid_ds
- {
- struct ipc_perm shm_perm; /* operation permission struct */
-#if !__SHM_SEGSZ_AFTER_TIME
- size_t shm_segsz; /* size of segment in bytes */
-#endif
- __SHM_PAD_TIME (shm_atime, 1); /* time of last shmat() */
- __SHM_PAD_TIME (shm_dtime, 2); /* time of last shmdt() */
- __SHM_PAD_TIME (shm_ctime, 3); /* time of last change by shmctl() */
-#if __SHM_PAD_BETWEEN_TIME_AND_SEGSZ
- unsigned long int __glibc_reserved4;
-#endif
-#if __SHM_SEGSZ_AFTER_TIME
- size_t shm_segsz; /* size of segment in bytes */
-#endif
- __pid_t shm_cpid; /* pid of creator */
- __pid_t shm_lpid; /* pid of last shmop */
- shmatt_t shm_nattch; /* number of current attaches */
- __syscall_ulong_t __glibc_reserved5;
- __syscall_ulong_t __glibc_reserved6;
- };
+#include <bits/types/struct_shmid_ds.h>
#ifdef __USE_MISC
new file mode 100644
@@ -0,0 +1,57 @@
+/* Generic implementation of the shared memory struct shmid_ds.
+ Copyright (C) 2020 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/>. */
+
+#ifndef _SYS_SHM_H
+# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
+#endif
+
+#include <bits/shm-pad.h>
+
+#if __SHM_PAD_BEFORE_TIME
+# define __SHM_PAD_TIME(NAME, RES) \
+ unsigned long int __glibc_reserved ## RES; __time_t NAME
+#elif __SHM_PAD_AFTER_TIME
+# define __SHM_PAD_TIME(NAME, RES) \
+ __time_t NAME; unsigned long int __glibc_reserved ## RES
+#else
+# define __SHM_PAD_TIME(NAME, RES) \
+ __time_t NAME
+#endif
+
+/* Data structure describing a shared memory segment. */
+struct shmid_ds
+ {
+ struct ipc_perm shm_perm; /* operation permission struct */
+#if !__SHM_SEGSZ_AFTER_TIME
+ size_t shm_segsz; /* size of segment in bytes */
+#endif
+ __SHM_PAD_TIME (shm_atime, 1); /* time of last shmat() */
+ __SHM_PAD_TIME (shm_dtime, 2); /* time of last shmdt() */
+ __SHM_PAD_TIME (shm_ctime, 3); /* time of last change by shmctl() */
+#if __SHM_PAD_BETWEEN_TIME_AND_SEGSZ
+ unsigned long int __glibc_reserved4;
+#endif
+#if __SHM_SEGSZ_AFTER_TIME
+ size_t shm_segsz; /* size of segment in bytes */
+#endif
+ __pid_t shm_cpid; /* pid of creator */
+ __pid_t shm_lpid; /* pid of last shmop */
+ shmatt_t shm_nattch; /* number of current attaches */
+ __syscall_ulong_t __glibc_reserved5;
+ __syscall_ulong_t __glibc_reserved6;
+ };