From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 02/15] Consolidate Linux msgrcv implementation
Date: Tue, 01 Nov 2016 14:25:00 -0000 [thread overview]
Message-ID: <1478010323-13076-3-git-send-email-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <1478010323-13076-1-git-send-email-adhemerval.zanella@linaro.org>
This patch consolidates the msgrcv Linux implementation in only
one default file, sysdeps/unix/sysv/linux/msgrcv.c. If tries to use
the direct syscall if it is defined, otherwise will use the old ipc
multiplex mechanism.
Checked on x86_64, i686, powerpc64le, aarch64, and armhf.
* sysdeps/unix/sysv/linux/msgrcv.c (__libc_msgrcv): Use msgrcv syscall
if defined.
* sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c: Remove file.
---
ChangeLog | 4 ++++
sysdeps/unix/sysv/linux/msgrcv.c | 25 ++++++++------------
sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c | 32 --------------------------
3 files changed, 13 insertions(+), 48 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c
diff --git a/sysdeps/unix/sysv/linux/msgrcv.c b/sysdeps/unix/sysv/linux/msgrcv.c
index c4dd219..53e6332 100644
--- a/sysdeps/unix/sysv/linux/msgrcv.c
+++ b/sysdeps/unix/sysv/linux/msgrcv.c
@@ -16,33 +16,26 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <sys/msg.h>
#include <ipc_priv.h>
-
#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-/* Kludge to work around Linux' restriction of only up to five
- arguments to a system call. */
-struct ipc_kludge
- {
- void *msgp;
- long int msgtyp;
- };
-
ssize_t
__libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
int msgflg)
{
+#ifdef __NR_msgrcv
+ return SYSCALL_CANCEL (msgrc, msqid, msgp, msgsz, msgtyp, msgflg);
+#else
/* The problem here is that Linux' calling convention only allows up to
fives parameters to a system call. */
- struct ipc_kludge tmp;
-
- tmp.msgp = msgp;
- tmp.msgtyp = msgtyp;
+ struct
+ {
+ void *msgp;
+ long int msgtyp;
+ } tmp = { msgp, msgtyp };
return SYSCALL_CANCEL (ipc, IPCOP_msgrcv, msqid, msgsz, msgflg, &tmp);
+#endif
}
weak_alias (__libc_msgrcv, msgrcv)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c b/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c
deleted file mode 100644
index ccaa4ee..0000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2010-2016 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
- <http://www.gnu.org/licenses/>. */
-
-#include <errno.h>
-#include <sys/msg.h>
-#include <ipc_priv.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-ssize_t
-__libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
- int msgflg)
-{
- return SYSCALL_CANCEL (ipc, IPCOP_msgrcv, msqid, msgsz, msgflg,
- msgp, msgtyp);
-}
-weak_alias (__libc_msgrcv, msgrcv)
--
2.7.4
next prev parent reply other threads:[~2016-11-01 14:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-01 14:25 [PATCH 00/15] Consolidate Linux sysvipc implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 11/15] Use shmat syscall for Linux implementation Adhemerval Zanella
2016-11-01 14:25 ` Adhemerval Zanella [this message]
2016-11-01 14:25 ` [PATCH 12/15] Consolidate Linux shmctl implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 07/15] Use semget syscall for Linux implementation Adhemerval Zanella
2016-11-01 15:34 ` Andreas Schwab
2016-11-01 16:41 ` Joseph Myers
2016-11-01 17:17 ` Adhemerval Zanella
2016-11-01 17:28 ` Zack Weinberg
2016-11-01 17:35 ` Joseph Myers
2016-11-01 14:25 ` [PATCH 03/15] Use msgsnd " Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 10/15] Add SYSV semaphore test Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 13/15] Use shmdt syscall for linux implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 15/15] Add SYSV shared memory test Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 09/15] Consolidate Linux semtimedop implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 01/15] Consolidate Linux msgctl implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 14/15] Use shmget syscall for linux implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 05/15] Add SYSV message queue test Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 08/15] Use semop syscall for Linux implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 04/15] Use msgget " Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 06/15] Consolidate Linux semctl implementation Adhemerval Zanella
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=1478010323-13076-3-git-send-email-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/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).