From: Alistair Francis <alistair23@gmail.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: GNU C Library <libc-alpha@sourceware.org>,
Stepan Golosunov <stepan@golosunov.pp.ru>,
Alistair Francis <alistair.francis@wdc.com>
Subject: Re: [PATCH 2/7] sysvipc: Split out linux struct semid_ds
Date: Thu, 2 Jul 2020 14:20:39 -0700 [thread overview]
Message-ID: <CAKmqyKMCBwTLLDUCYGk9danAyiVz_ixzh0O5OvjgcUd=LMYAEw@mail.gmail.com> (raw)
In-Reply-To: <20200630192441.3299710-2-adhemerval.zanella@linaro.org>
On Tue, Jun 30, 2020 at 12:24 PM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> This will allow us to have architectures specify their own version.
>
> Not semantic changes expected. Checked with a build against the
> all affected ABIs.
I have the exact same patch in my tree, looks good.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> sysdeps/unix/sysv/linux/Makefile | 1 +
> sysdeps/unix/sysv/linux/bits/msq.h | 39 +++-----------
> .../sysv/linux/bits/types/struct_msqid_ds.h | 51 +++++++++++++++++++
> 3 files changed, 58 insertions(+), 33 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index e02065dc8d..70e2d9e044 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -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
>
> tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
> diff --git a/sysdeps/unix/sysv/linux/bits/msq.h b/sysdeps/unix/sysv/linux/bits/msq.h
> index cc4ebae0f0..6ce6408ebc 100644
> --- a/sysdeps/unix/sysv/linux/bits/msq.h
> +++ b/sysdeps/unix/sysv/linux/bits/msq.h
> @@ -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
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
> new file mode 100644
> index 0000000000..bfc56f6ac1
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
> @@ -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;
> +};
> --
> 2.25.1
>
next prev parent reply other threads:[~2020-07-02 21:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 19:24 [PATCH 1/7] sysv: linux: Add 64-bit time_t variant for semctl Adhemerval Zanella
2020-06-30 19:24 ` [PATCH 2/7] sysvipc: Split out linux struct semid_ds Adhemerval Zanella
2020-07-02 21:20 ` Alistair Francis [this message]
2020-07-07 19:01 ` Carlos O'Donell
2020-06-30 19:24 ` [PATCH 3/7] sysvipc: Remove the linux msq-pad.h file Adhemerval Zanella
2020-07-02 21:26 ` Alistair Francis
2020-07-07 19:05 ` Carlos O'Donell
2020-06-30 19:24 ` [PATCH 4/7] sysv: linux: Add 64-bit time_t variant for msgctl Adhemerval Zanella
2020-07-02 21:39 ` Alistair Francis
2020-07-08 18:07 ` Adhemerval Zanella
2020-07-07 19:51 ` Carlos O'Donell
2020-07-08 15:32 ` [PATCH v2] " Adhemerval Zanella
2020-07-08 17:04 ` Carlos O'Donell
2020-07-08 17:56 ` Alistair Francis
2020-06-30 19:24 ` [PATCH 5/7] sysvipc: Split out linux struct shmid_ds Adhemerval Zanella
2020-07-02 21:40 ` Alistair Francis
2020-07-07 19:52 ` Carlos O'Donell
2020-06-30 19:24 ` [PATCH 6/7] sysvipc: Remove the linux shm-pad.h file Adhemerval Zanella
2020-07-07 19:57 ` Carlos O'Donell
2020-06-30 19:24 ` [PATCH 7/7] sysv: linux: Add 64-bit time_t variant for shmctl Adhemerval Zanella
2020-07-01 2:28 ` Alistair Francis
2020-07-01 12:19 ` Adhemerval Zanella
2020-07-01 15:48 ` Alistair Francis
2020-07-01 16:35 ` Adhemerval Zanella
2020-07-01 17:07 ` Adhemerval Zanella
2020-07-01 20:59 ` Vineet Gupta
2020-07-01 23:00 ` Alistair Francis
2020-07-02 21:41 ` Alistair Francis
2020-07-07 21:33 ` Carlos O'Donell
2020-07-08 15:32 ` [PATCH v2] " Adhemerval Zanella
2020-07-08 17:02 ` Carlos O'Donell
2020-07-08 18:01 ` Alistair Francis
2020-07-10 17:13 ` Joseph Myers
2020-07-10 17:49 ` Adhemerval Zanella
2020-07-10 17:57 ` Joseph Myers
2020-07-10 17:59 ` Adhemerval Zanella
2020-07-02 19:01 ` [PATCH 1/7] sysv: linux: Add 64-bit time_t variant for semctl Alistair Francis
2020-07-07 3:32 ` Carlos O'Donell
2020-07-07 14:09 ` Adhemerval Zanella
2020-07-08 15:32 ` [PATCH v2] " Adhemerval Zanella
2020-07-08 17:04 ` Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKmqyKMCBwTLLDUCYGk9danAyiVz_ixzh0O5OvjgcUd=LMYAEw@mail.gmail.com' \
--to=alistair23@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=libc-alpha@sourceware.org \
--cc=stepan@golosunov.pp.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).