[PATCH 3/7] sysvipc: Remove the linux msq-pad.h file

Alistair Francis alistair23@gmail.com
Thu Jul 2 21:26:14 GMT 2020


On Tue, Jun 30, 2020 at 12:25 PM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> Each architecture overrides the struct msqid_ds which its required
> kernel ABI one.
>
> Checked on x86_64-linux-gnu and some bases sysvipc tests on hppa,
> mips, mipsle, mips64, mips64le, sparc64, sparcv9, powerpc64le,
> powerpc64, and powerpc.
> ---
>  sysdeps/unix/sysv/linux/Makefile              |  2 +-
>  sysdeps/unix/sysv/linux/bits/msq-pad.h        | 31 ----------
>  .../sysv/linux/bits/types/struct_msqid_ds.h   | 28 ++++------
>  sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h   | 26 ---------
>  .../linux/hppa/bits/types/struct_msqid_ds.h   | 47 ++++++++++++++++
>  sysdeps/unix/sysv/linux/mips/bits/msq-pad.h   | 31 ----------
>  .../linux/mips/bits/types/struct_msqid_ds.h   | 56 +++++++++++++++++++
>  .../unix/sysv/linux/powerpc/bits/msq-pad.h    | 26 ---------
>  .../powerpc/bits/types/struct_msqid_ds.h      | 47 ++++++++++++++++
>  sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h  | 26 ---------
>  .../linux/sparc/bits/types/struct_msqid_ds.h  | 47 ++++++++++++++++
>  11 files changed, 210 insertions(+), 157 deletions(-)
>  delete mode 100644 sysdeps/unix/sysv/linux/bits/msq-pad.h
>  delete mode 100644 sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
>  create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h
>  delete mode 100644 sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
>  create mode 100644 sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h
>  delete mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
>  create mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h
>  delete mode 100644 sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
>  create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 70e2d9e044..505087e617 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -85,7 +85,7 @@ sysdep_headers += sys/mount.h sys/acct.h \
>                   bits/siginfo-arch.h bits/siginfo-consts-arch.h \
>                   bits/procfs.h bits/procfs-id.h bits/procfs-extra.h \
>                   bits/procfs-prregset.h bits/mman-map-flags-generic.h \
> -                 bits/msq-pad.h bits/shmlba.h bits/shm-pad.h \
> +                 bits/shmlba.h bits/shm-pad.h \
>                   bits/termios-struct.h bits/termios-c_cc.h \
>                   bits/termios-c_iflag.h bits/termios-c_oflag.h \
>                   bits/termios-baud.h bits/termios-c_cflag.h \
> diff --git a/sysdeps/unix/sysv/linux/bits/msq-pad.h b/sysdeps/unix/sysv/linux/bits/msq-pad.h
> deleted file mode 100644
> index e4ffd39f27..0000000000
> --- a/sysdeps/unix/sysv/linux/bits/msq-pad.h
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -/* Define where padding goes in struct msqid_ds.  Generic version.
> -   Copyright (C) 2018-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-pad.h> directly; include <sys/msg.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -/* On most architectures, padding goes after time fields for 32-bit
> -   systems and is omitted for 64-bit systems.  Some architectures pad
> -   before time fields instead, or omit padding despite being
> -   32-bit.  */
> -
> -#define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32)
> -#define __MSQ_PAD_BEFORE_TIME 0
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
> index bfc56f6ac1..32173a7b60 100644
> --- a/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
> @@ -20,27 +20,23 @@
>  # 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 */
> +#if __TIMESIZE == 32
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved1;
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved2;
> +  __time_t msg_ctime;          /* time of last change */
> +  unsigned long int __glibc_reserved3;
> +#else
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  __time_t msg_ctime;          /* time of last change */
> +#endif
>    __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 */
> diff --git a/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h b/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
> deleted file mode 100644
> index 6986585ae7..0000000000
> --- a/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -/* Define where padding goes in struct msqid_ds.  HPPA version.
> -   Copyright (C) 2018-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-pad.h> directly; include <sys/msg.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -#define __MSQ_PAD_AFTER_TIME 0
> -#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
> diff --git a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h
> new file mode 100644
> index 0000000000..3cf70e36c4
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h
> @@ -0,0 +1,47 @@
> +/* Linux/HPPA 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
> +
> +/* 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 */
> +#if __TIMESIZE == 32
> +  unsigned long int __glibc_reserved1;
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved2;
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved3;
> +  __time_t msg_ctime;          /* time of last change */
> +#else
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  __time_t msg_ctime;          /* time of last change */
> +#endif
> +  __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;
> +};

Looks good.

> diff --git a/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h b/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
> deleted file mode 100644
> index 8e28c5abe1..0000000000
> --- a/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -/* Define where padding goes in struct msqid_ds.  MIPS version.
> -   Copyright (C) 2018-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-pad.h> directly; include <sys/msg.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -#ifdef __MIPSEL__
> -# define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32)
> -# define __MSQ_PAD_BEFORE_TIME 0
> -#else
> -# define __MSQ_PAD_AFTER_TIME 0
> -# define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h
> new file mode 100644
> index 0000000000..85fdeef274
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h
> @@ -0,0 +1,56 @@
> +/* Linux/PowerPC implementation of the SysV message struct msqid_ds.

This should be MIPS, not PowerPC.

> +   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
> +
> +/* 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 */
> +#if __TIMESIZE == 32
> +# ifdef __MIPSEL__
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved1;
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved2;
> +  __time_t msg_ctime;          /* time of last change */
> +  unsigned long int __glibc_reserved3;
> +# else
> +  unsigned long int __glibc_reserved1;
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved2;
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved3;
> +  __time_t msg_ctime;          /* time of last change */
> +# endif
> +#else
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  __time_t msg_ctime;          /* time of last change */
> +#endif
> +  __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;
> +};

Implementation looks good.

> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h b/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
> deleted file mode 100644
> index e2b9310800..0000000000
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -/* Define where padding goes in struct msqid_ds.  PowerPC version.
> -   Copyright (C) 2018-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-pad.h> directly; include <sys/msg.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -#define __MSQ_PAD_AFTER_TIME 0
> -#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h
> new file mode 100644
> index 0000000000..4ae2fbcbdc
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h
> @@ -0,0 +1,47 @@
> +/* Linux/PowerPC 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
> +
> +/* 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 */
> +#if __TIMESIZE == 32
> +  unsigned long int __glibc_reserved1;
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved2;
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved3;
> +  __time_t msg_ctime;          /* time of last change */
> +#else
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  __time_t msg_ctime;          /* time of last change */
> +#endif
> +  __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;
> +};

Looks good.

> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h b/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
> deleted file mode 100644
> index 99fdf8c8f0..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -/* Define where padding goes in struct msqid_ds.  SPARC version.
> -   Copyright (C) 2018-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-pad.h> directly; include <sys/msg.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -#define __MSQ_PAD_AFTER_TIME 0
> -#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h
> new file mode 100644
> index 0000000000..71980839c7
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h
> @@ -0,0 +1,47 @@
> +/* Linux/SPARC 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
> +
> +/* 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 */
> +#if __TIMESIZE == 32
> +  unsigned long int __glibc_reserved1;
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved2;
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  unsigned long int __glibc_reserved3;
> +  __time_t msg_ctime;          /* time of last change */
> +#else
> +  __time_t msg_stime;          /* time of last msgsnd command */
> +  __time_t msg_rtime;          /* time of last msgsnd command */
> +  __time_t msg_ctime;          /* time of last change */
> +#endif
> +  __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;
> +};

Looks good.

Alistair

> --
> 2.25.1
>


More information about the Libc-alpha mailing list