[v4,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 +------------
sysdeps/unix/sysv/linux/bits/semid_ds_t.h | 43 +++++++++++++++++++++++
3 files changed, 45 insertions(+), 23 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/bits/semid_ds_t.h
Comments
On Thu, 26 Mar 2020, 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.
> ---
> sysdeps/unix/sysv/linux/Makefile | 1 +
> sysdeps/unix/sysv/linux/bits/sem.h | 24 +------------
> sysdeps/unix/sysv/linux/bits/semid_ds_t.h | 43 +++++++++++++++++++++++
That's not the naming convention. A header that just defines a given type
for use in other installed headers is bytes/types/<type_name>.h. So
bits/types/struct_semid_ds.h (there's no _t on this type name).
On Thu, Mar 26, 2020 at 11:59 AM Joseph Myers <joseph@codesourcery.com> wrote:
>
> On Thu, 26 Mar 2020, 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.
> > ---
> > sysdeps/unix/sysv/linux/Makefile | 1 +
> > sysdeps/unix/sysv/linux/bits/sem.h | 24 +------------
> > sysdeps/unix/sysv/linux/bits/semid_ds_t.h | 43 +++++++++++++++++++++++
>
> That's not the naming convention. A header that just defines a given type
> for use in other installed headers is bytes/types/<type_name>.h. So
> bits/types/struct_semid_ds.h (there's no _t on this type name).
Fixed!
Alistair
>
> --
> Joseph S. Myers
> joseph@codesourcery.com
@@ -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/semid_ds_t.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/semid_ds_t.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/semid_ds_t.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;
+};