[v5,1/3] bits/sem.h: Split out struct semid_ds
Commit Message
Split out the struct semid_ds into it's own file. This will allow us to
have architectures specify their own version.
---
sysdeps/unix/sysv/linux/Makefile | 1 +
sysdeps/unix/sysv/linux/bits/sem.h | 24 +----------
.../sysv/linux/bits/types/struct_semid_ds.h | 43 +++++++++++++++++++
3 files changed, 45 insertions(+), 23 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
Comments
On 01/04/2020 13:53, Alistair Francis via Libc-alpha wrote:
> Split out the struct semid_ds into it's own file. This will allow us to
> have architectures specify their own version.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> sysdeps/unix/sysv/linux/Makefile | 1 +
> sysdeps/unix/sysv/linux/bits/sem.h | 24 +----------
> .../sysv/linux/bits/types/struct_semid_ds.h | 43 +++++++++++++++++++
> 3 files changed, 45 insertions(+), 23 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 60dc5cf9e5..bbf1d60fc6 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -92,6 +92,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
> bits/termios-baud.h bits/termios-c_cflag.h \
> bits/termios-c_lflag.h bits/termios-tcflow.h \
> bits/termios-misc.h \
> + bits/types/struct_semid_ds.h \
> bits/ipc-perm.h
>
> tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
Ok.
> diff --git a/sysdeps/unix/sysv/linux/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h
> index e0f4155c67..0d1813ec67 100644
> --- a/sysdeps/unix/sysv/linux/bits/sem.h
> +++ b/sysdeps/unix/sysv/linux/bits/sem.h
> @@ -21,6 +21,7 @@
>
> #include <sys/types.h>
> #include <bits/sem-pad.h>
> +#include <bits/types/struct_semid_ds.h>
>
> /* Flags for `semop'. */
> #define SEM_UNDO 0x1000 /* undo the operation on exit */
> @@ -34,29 +35,6 @@
> #define SETVAL 16 /* set semval */
> #define SETALL 17 /* set all semval's */
>
> -
> -#if __SEM_PAD_BEFORE_TIME
> -# define __SEM_PAD_TIME(NAME, RES) \
> - __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME
> -#elif __SEM_PAD_AFTER_TIME
> -# define __SEM_PAD_TIME(NAME, RES) \
> - __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES
> -#else
> -# define __SEM_PAD_TIME(NAME, RES) \
> - __time_t NAME
> -#endif
> -
> -/* Data structure describing a set of semaphores. */
> -struct semid_ds
> -{
> - struct ipc_perm sem_perm; /* operation permission struct */
> - __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */
> - __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */
> - __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> - __syscall_ulong_t __glibc_reserved3;
> - __syscall_ulong_t __glibc_reserved4;
> -};
> -
> /* The user should define a union like the following to use it for arguments
> for `semctl'.
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
> new file mode 100644
> index 0000000000..ba0719e77a
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
> @@ -0,0 +1,43 @@
> +/* Generic implementation of the semaphore struct semid_ds
Missing period.
> + Copyright (C) 1995-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_SEM_H
> +# error "Never include <bits/types/struct_semid_ds.h> directly; use <sys/sem.h> instead."
> +#endif
> +
> +#if __SEM_PAD_BEFORE_TIME
> +# define __SEM_PAD_TIME(NAME, RES) \
> + __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME
> +#elif __SEM_PAD_AFTER_TIME
> +# define __SEM_PAD_TIME(NAME, RES) \
> + __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES
> +#else
> +# define __SEM_PAD_TIME(NAME, RES) \
> + __time_t NAME
> +#endif
> +
> +/* Data structure describing a set of semaphores. */
> +struct semid_ds
> +{
> + struct ipc_perm sem_perm; /* operation permission struct */
> + __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */
> + __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */
> + __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> + __syscall_ulong_t __glibc_reserved3;
> + __syscall_ulong_t __glibc_reserved4;
> +};
>
Ok.
@@ -92,6 +92,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
bits/termios-baud.h bits/termios-c_cflag.h \
bits/termios-c_lflag.h bits/termios-tcflow.h \
bits/termios-misc.h \
+ bits/types/struct_semid_ds.h \
bits/ipc-perm.h
tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
@@ -21,6 +21,7 @@
#include <sys/types.h>
#include <bits/sem-pad.h>
+#include <bits/types/struct_semid_ds.h>
/* Flags for `semop'. */
#define SEM_UNDO 0x1000 /* undo the operation on exit */
@@ -34,29 +35,6 @@
#define SETVAL 16 /* set semval */
#define SETALL 17 /* set all semval's */
-
-#if __SEM_PAD_BEFORE_TIME
-# define __SEM_PAD_TIME(NAME, RES) \
- __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME
-#elif __SEM_PAD_AFTER_TIME
-# define __SEM_PAD_TIME(NAME, RES) \
- __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES
-#else
-# define __SEM_PAD_TIME(NAME, RES) \
- __time_t NAME
-#endif
-
-/* Data structure describing a set of semaphores. */
-struct semid_ds
-{
- struct ipc_perm sem_perm; /* operation permission struct */
- __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */
- __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */
- __syscall_ulong_t sem_nsems; /* number of semaphores in set */
- __syscall_ulong_t __glibc_reserved3;
- __syscall_ulong_t __glibc_reserved4;
-};
-
/* The user should define a union like the following to use it for arguments
for `semctl'.
new file mode 100644
@@ -0,0 +1,43 @@
+/* Generic implementation of the semaphore struct semid_ds
+ Copyright (C) 1995-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_SEM_H
+# error "Never include <bits/types/struct_semid_ds.h> directly; use <sys/sem.h> instead."
+#endif
+
+#if __SEM_PAD_BEFORE_TIME
+# define __SEM_PAD_TIME(NAME, RES) \
+ __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME
+#elif __SEM_PAD_AFTER_TIME
+# define __SEM_PAD_TIME(NAME, RES) \
+ __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES
+#else
+# define __SEM_PAD_TIME(NAME, RES) \
+ __time_t NAME
+#endif
+
+/* Data structure describing a set of semaphores. */
+struct semid_ds
+{
+ struct ipc_perm sem_perm; /* operation permission struct */
+ __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */
+ __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */
+ __syscall_ulong_t sem_nsems; /* number of semaphores in set */
+ __syscall_ulong_t __glibc_reserved3;
+ __syscall_ulong_t __glibc_reserved4;
+};