From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 09/15] Consolidate Linux semtimedop implementation
Date: Tue, 01 Nov 2016 14:25:00 -0000 [thread overview]
Message-ID: <1478010323-13076-10-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 semtimedop Linux implementation in only
one default file, sysdeps/unix/sysv/linux/semtimedop.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/m68k/semtimedop.S: Remove file.
* sysdeps/unix/sysv/linux/s390/semtimedop.c: Reorganize headers and
add a comment about s390 syscall difference from default one.
* sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Use semtimedop
syscall if it is defined.
---
ChangeLog | 6 +++
sysdeps/unix/sysv/linux/m68k/semtimedop.S | 69 -------------------------------
sysdeps/unix/sysv/linux/s390/semtimedop.c | 12 +++---
sysdeps/unix/sysv/linux/semtimedop.c | 13 +++---
4 files changed, 20 insertions(+), 80 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/m68k/semtimedop.S
diff --git a/sysdeps/unix/sysv/linux/m68k/semtimedop.S b/sysdeps/unix/sysv/linux/m68k/semtimedop.S
deleted file mode 100644
index b291070..0000000
--- a/sysdeps/unix/sysv/linux/m68k/semtimedop.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright (C) 2003-2016 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Andreas Schwab <schwab@suse.de>, 2003.
-
- 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 <sysdep.h>
-
-#define SYSOP_semtimedop 4
-
-#define SVRSP 8 /* saved register space */
-#define PARMS 4+SVRSP /* space for 3 saved regs */
-#define SEMID PARMS
-#define SOPS SEMID+4
-#define NSOPS SOPS+4
-#define TIMEOUT NSOPS+4
-
- .text
-ENTRY (semtimedop)
-
- /* Save registers. */
- move.l %d2, %a1
- move.l %d3, -(%sp)
- cfi_adjust_cfa_offset (4)
- move.l %d5, -(%sp)
- cfi_adjust_cfa_offset (4)
- cfi_register (%d2, %a1)
- cfi_rel_offset (%d3, 0)
- cfi_rel_offset (%d5, 4)
-
- move.l #SYSOP_semtimedop, %d1
- move.l SEMID(%sp), %d2
- move.l NSOPS(%sp), %d3
- move.l SOPS(%sp), %d5
- move.l TIMEOUT(%sp), %a0
- move.l #SYS_ify (ipc), %d0
-
- trap #0
-
- /* Restore registers. */
- move.l (%sp)+, %d5
- cfi_adjust_cfa_offset (-4)
- cfi_restore (%d5)
- move.l (%sp)+, %d3
- cfi_adjust_cfa_offset (-4)
- cfi_restore (%d3)
- move.l %a1, %d2
- cfi_restore (%d2)
-
- /* Check for error. */
- tst.l %d0
- jmi SYSCALL_ERROR_LABEL
-
- /* Successful; return the syscall's value. */
- ret
-
-PSEUDO_END (semtimedop)
diff --git a/sysdeps/unix/sysv/linux/s390/semtimedop.c b/sysdeps/unix/sysv/linux/s390/semtimedop.c
index f226953..db43f00 100644
--- a/sysdeps/unix/sysv/linux/s390/semtimedop.c
+++ b/sysdeps/unix/sysv/linux/s390/semtimedop.c
@@ -16,12 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <sys/sem.h>
#include <ipc_priv.h>
-
#include <sysdep.h>
-#include <sys/syscall.h>
+#include <errno.h>
/* Perform user-defined atomical operation of array of semaphores. */
@@ -29,6 +27,10 @@ int
semtimedop (int semid, struct sembuf *sops, size_t nsops,
const struct timespec *timeout)
{
- return INLINE_SYSCALL (ipc, 5, IPCOP_semtimedop,
- semid, (int) nsops, timeout, sops);
+ /* The s390 sys_ipc variant has only five parameters instead of six
+ (as for default variant) and the only difference is the handling of
+ SEMTIMEDOP where on s390 the third parameter is used as a pointer
+ to a struct timespec where the generic variant uses fifth parameter. */
+ return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, nsops, timeout,
+ sops);
}
diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c
index 30ee7fe..9a6d010 100644
--- a/sysdeps/unix/sysv/linux/semtimedop.c
+++ b/sysdeps/unix/sysv/linux/semtimedop.c
@@ -16,12 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <sys/sem.h>
#include <ipc_priv.h>
-
#include <sysdep.h>
-#include <sys/syscall.h>
+#include <errno.h>
/* Perform user-defined atomical operation of array of semaphores. */
@@ -29,7 +27,10 @@ int
semtimedop (int semid, struct sembuf *sops, size_t nsops,
const struct timespec *timeout)
{
- return INLINE_SYSCALL (ipc, 6, IPCOP_semtimedop,
- semid, (int) nsops, 0, sops,
- timeout);
+#ifdef __NR_semtimedop
+ return INLINE_SYSCALL_CALL (semtimedop, semid, nsops, sops, timeout);
+#else
+ return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, nsops, 0, sops,
+ timeout);
+#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 15/15] Add SYSV shared memory test Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 14/15] Use shmget syscall for linux implementation Adhemerval Zanella
2016-11-01 14:25 ` Adhemerval Zanella [this message]
2016-11-01 14:25 ` [PATCH 01/15] Consolidate Linux msgctl implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 05/15] Add SYSV message queue test 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 12/15] Consolidate Linux shmctl implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 11/15] Use shmat syscall for Linux implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 02/15] Consolidate Linux msgrcv implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 03/15] Use msgsnd syscall for Linux implementation Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 07/15] Use semget " 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 10/15] Add SYSV semaphore test Adhemerval Zanella
2016-11-01 14:25 ` [PATCH 13/15] Use shmdt 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=1478010323-13076-10-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).