qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bits/sem.h: Split out struct semid_ds 

Split out the struct semid_ds into it's own file. This will allow us to
have architectures specify their own version.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Alistair Francis 2020-02-25 14:52:27 -08:00
parent 86f4f2263b
commit 246a53d3c6
3 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysdeps/unix/sysv/linux/Makefile
View File

@ -90,6 +90,7 @@ sysdep_headers += sys/mount.h sys/acct.h \
bits/termios-baud.h bits/termios-c_cflag.h \ bits/termios-baud.h bits/termios-c_cflag.h \
bits/termios-c_lflag.h bits/termios-tcflow.h \ bits/termios-c_lflag.h bits/termios-tcflow.h \
bits/termios-misc.h \ bits/termios-misc.h \
bits/types/struct_semid_ds.h \
bits/ipc-perm.h bits/ipc-perm.h
tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \

24
sysdeps/unix/sysv/linux/bits/sem.h
View File

@ -21,6 +21,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <bits/sem-pad.h> #include <bits/sem-pad.h>
#include <bits/types/struct_semid_ds.h>
/* Flags for `semop'. */ /* Flags for `semop'. */
#define SEM_UNDO 0x1000 /* undo the operation on exit */ #define SEM_UNDO 0x1000 /* undo the operation on exit */
@ -34,29 +35,6 @@
#define SETVAL 16 /* set semval */ #define SETVAL 16 /* set semval */
#define SETALL 17 /* set all semval's */ #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 /* The user should define a union like the following to use it for arguments
for `semctl'. for `semctl'.

43
sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h Normal file
View File

@ -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;
};