AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-24 11:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysvipc: Split out linux struct semid_ds

Browse Source 
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>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella 2020-06-29 18:21:14 -03:00
parent dba950e317
commit 078a892085
3 changed files with 58 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

@ -92,6 +92,7 @@ sysdep_headers += sys/mount.h sys/acct.h \
bits/termios-c_lflag.h bits/termios-tcflow.h \
bits/termios-misc.h \
bits/types/struct_semid_ds.h \
bits/types/struct_msqid_ds.h \
bits/ipc-perm.h \
sys/rseq.h bits/rseq.h

39
sysdeps/unix/sysv/linux/bits/msq.h
View File

@ -20,7 +20,12 @@
#endif
#include <bits/types.h>
#include <bits/msq-pad.h>
/* Types used in the MSQID_DS structure definition. */
typedef __syscall_ulong_t msgqnum_t;
typedef __syscall_ulong_t msglen_t;
#include <bits/types/struct_msqid_ds.h>
/* Define options for message queue functions. */
#define MSG_NOERROR 010000 /* no error if message is too big */
@ -29,38 +34,6 @@
# define MSG_COPY 040000 /* copy (not remove) all queue messages */
#endif
/* Types used in the structure definition. */
typedef __syscall_ulong_t msgqnum_t;
typedef __syscall_ulong_t msglen_t;
#if __MSQ_PAD_BEFORE_TIME
# define __MSQ_PAD_TIME(NAME, RES) \
unsigned long int __glibc_reserved ## RES; __time_t NAME
#elif __MSQ_PAD_AFTER_TIME
# define __MSQ_PAD_TIME(NAME, RES) \
__time_t NAME; unsigned long int __glibc_reserved ## RES
#else
# define __MSQ_PAD_TIME(NAME, RES) \
__time_t NAME
#endif
/* Structure of record for one message inside the kernel.
The type `struct msg' is opaque. */
struct msqid_ds
{
struct ipc_perm msg_perm; /* structure describing operation permission */
__MSQ_PAD_TIME (msg_stime, 1); /* time of last msgsnd command */
__MSQ_PAD_TIME (msg_rtime, 2); /* time of last msgrcv command */
__MSQ_PAD_TIME (msg_ctime, 3); /* time of last change */
__syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */
msgqnum_t msg_qnum; /* number of messages currently on queue */
msglen_t msg_qbytes; /* max number of bytes allowed on queue */
__pid_t msg_lspid; /* pid of last msgsnd() */
__pid_t msg_lrpid; /* pid of last msgrcv() */
__syscall_ulong_t __glibc_reserved4;
__syscall_ulong_t __glibc_reserved5;
};
#ifdef __USE_MISC
# define msg_cbytes __msg_cbytes

51
sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h Normal file
View File

@ -0,0 +1,51 @@
/* Generic implementation of the SysV message struct msqid_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_MSG_H
# error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
#endif
#include <bits/msq-pad.h>
#if __MSQ_PAD_BEFORE_TIME
# define __MSQ_PAD_TIME(NAME, RES) \
unsigned long int __glibc_reserved ## RES; __time_t NAME
#elif __MSQ_PAD_AFTER_TIME
# define __MSQ_PAD_TIME(NAME, RES) \
__time_t NAME; unsigned long int __glibc_reserved ## RES
#else
# define __MSQ_PAD_TIME(NAME, RES) \
__time_t NAME
#endif
/* Structure of record for one message inside the kernel.
The type `struct msg' is opaque. */
struct msqid_ds
{
struct ipc_perm msg_perm; /* structure describing operation permission */
__MSQ_PAD_TIME (msg_stime, 1); /* time of last msgsnd command */
__MSQ_PAD_TIME (msg_rtime, 2); /* time of last msgrcv command */
__MSQ_PAD_TIME (msg_ctime, 3); /* time of last change */
__syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */
msgqnum_t msg_qnum; /* number of messages currently on queue */
msglen_t msg_qbytes; /* max number of bytes allowed on queue */
__pid_t msg_lspid; /* pid of last msgsnd() */
__pid_t msg_lrpid; /* pid of last msgrcv() */
__syscall_ulong_t __glibc_reserved4;
__syscall_ulong_t __glibc_reserved5;
};