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

sysvipc: Split out linux struct shmid_ds 

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>
Tested-by: Alistair Francis <alistair.francis@wdc.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella 2020-06-30 10:30:14 -03:00
parent 3283f71113
commit 380b7ced6a
3 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 \
sys/rseq.h bits/rseq.h

34
sysdeps/unix/sysv/linux/bits/shm.h
View File

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

57
sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h Normal file
View File

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