From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH v2 12/16] Use shmat syscall for Linux implementation
Date: Wed, 02 Nov 2016 19:27:00 -0000 [thread overview]
Message-ID: <1478114813-3526-13-git-send-email-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <1478114813-3526-1-git-send-email-adhemerval.zanella@linaro.org>
Changes from previous version:
- Use __ASSUME_SYSVIPC_SYSCALL instead of __NR_syscall to issue the
wired syscall or the ipc one.
--
This patch add a direct call to shmat syscall if it is supported by
kernel features.
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..97a15c2 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 __ASSUME_SYSVIPC_SYSCALL
+ 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-02 19:27 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-02 19:27 [PATCH v2 00/16] Consolidate Linux sysvipc implementation Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 06/16] Add SYSV message queue test Adhemerval Zanella
2016-11-03 17:09 ` Yury Norov
2016-11-03 20:12 ` Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 07/16] Consolidate Linux semctl implementation Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 08/16] Use semget syscall for Linux implementation Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 03/16] Consolidate Linux msgrcv implementation Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 14/16] Use shmdt syscall for linux implementation Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 16/16] Add SYSV shared memory test Adhemerval Zanella
2016-11-03 17:14 ` Yury Norov
2016-11-02 19:27 ` [PATCH v2 01/16] Add __ASSUME_SYSVIPC_SYSCALL for Linux Adhemerval Zanella
2016-11-02 21:10 ` Joseph Myers
2016-11-02 22:27 ` Adhemerval Zanella
2016-11-02 22:34 ` Adhemerval Zanella
2016-11-03 17:07 ` Yury Norov
2016-11-03 20:13 ` Adhemerval Zanella
2016-11-07 11:28 ` Arnd Bergmann
2016-11-07 13:17 ` Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 13/16] Consolidate Linux shmctl implementation Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 04/16] Use msgsnd syscall for Linux implementation Adhemerval Zanella
2016-11-03 14:15 ` Yury Norov
2016-11-03 20:27 ` Adhemerval Zanella
2016-11-02 19:27 ` Adhemerval Zanella [this message]
2016-11-07 11:02 ` [PATCH v2 12/16] Use shmat " Arnd Bergmann
2016-11-07 13:10 ` Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 05/16] Use msgget " Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 11/16] Add SYSV semaphore test Adhemerval Zanella
2016-11-03 17:10 ` Yury Norov
2016-11-03 20:11 ` Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 02/16] Consolidate Linux msgctl implementation Adhemerval Zanella
2016-11-04 15:33 ` Yury Norov
2016-11-04 17:03 ` Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 10/16] Consolidate Linux semtimedop implementation Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 15/16] Use shmget syscall for linux implementation Adhemerval Zanella
2016-11-02 19:27 ` [PATCH v2 09/16] Use semop syscall for Linux 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=1478114813-3526-13-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).