From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 11/15] Use shmat syscall for Linux implementation
Date: Tue, 01 Nov 2016 14:25:00 -0000 [thread overview]
Message-ID: <1478010323-13076-12-git-send-email-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <1478010323-13076-1-git-send-email-adhemerval.zanella@linaro.org>
This patch add a direct call to shmat syscall if it is defined by
kernel headers.
Checked on x86_64, i686, powerpc64le, aarch64, and armhf.
* sysdeps/unix/sysv/linux/shmat.c (shmat): Use shmat syscall if it is
defined.
---
ChangeLog | 3 +++
sysdeps/unix/sysv/linux/shmat.c | 17 ++++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c
index 5afc93c..b247db9 100644
--- a/sysdeps/unix/sysv/linux/shmat.c
+++ b/sysdeps/unix/sysv/linux/shmat.c
@@ -16,13 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <sys/shm.h>
+#include <sys/msg.h>
#include <ipc_priv.h>
-
#include <sysdep.h>
-#include <unistd.h>
-#include <sys/syscall.h>
+#include <errno.h>
/* Attach the shared memory segment associated with SHMID to the data
segment of the calling process. SHMADDR and SHMFLG determine how
@@ -31,17 +28,19 @@
void *
shmat (int shmid, const void *shmaddr, int shmflg)
{
+#ifdef __NR_shmat
+ return INLINE_SYSCALL_CALL (shmat, shmid, shmaddr, shmflg);
+#else
INTERNAL_SYSCALL_DECL(err);
unsigned long resultvar;
void *raddr;
- resultvar = INTERNAL_SYSCALL (ipc, err, 5, IPCOP_shmat,
- shmid, shmflg,
- (long int) &raddr,
- (void *) shmaddr);
+ resultvar = INTERNAL_SYSCALL_CALL (ipc, err, IPCOP_shmat, shmid, shmflg,
+ &raddr, shmaddr);
if (INTERNAL_SYSCALL_ERROR_P (resultvar, err))
return (void *) INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (resultvar,
err));
return raddr;
+#endif
}
--
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 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 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 12/15] Consolidate Linux shmctl implementation Adhemerval Zanella
2016-11-01 14:25 ` Adhemerval Zanella [this message]
2016-11-01 14:25 ` [PATCH 02/15] Consolidate Linux msgrcv implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 06/15] Consolidate Linux semctl implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 04/15] Use msgget syscall for Linux implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 08/15] Use semop " Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 05/15] Add SYSV message queue test Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 14/15] Use shmget syscall for linux implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 01/15] Consolidate Linux msgctl implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 09/15] Consolidate Linux semtimedop implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 15/15] Add SYSV shared memory test 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-12-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).