This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 2/3] sysvipc: Implement semop based on semtimedop
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: libc-alpha at sourceware dot org
- Cc: "Paul A . Clarke" <pc at us dot ibm dot com>
- Date: Fri, 11 Oct 2019 16:15:53 -0300
- Subject: [PATCH 2/3] sysvipc: Implement semop based on semtimedop
- References: <20191011191554.10870-1-adhemerval.zanella@linaro.org>
Besides semop being a subset of semtimedop, new 32-bit architectures
on Linux are not expected to provide the syscall (only the 64-bit time
semtimedop).
Also, Linux 5.1 only wired-up semtimedop for the 64-bit architectures
that missed it (powerpc, s390, and sparc). This simplifies the code
to support it.
Checked on x86_64-linux-gnu and i686-linux-gnu.
* include/sys/sem.h: New file.
* sysdeps/unix/sysv/linux/semop.c (semop): Call internal semtimedop.
* sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Add internal
alias.
* sysvipc/semtimedop.c (semtimedop): Likewise.
---
include/sys/sem.h | 11 ++++++++++-
sysdeps/unix/sysv/linux/semop.c | 6 +-----
sysdeps/unix/sysv/linux/semtimedop.c | 6 ++++--
sysvipc/semtimedop.c | 6 ++++--
4 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/include/sys/sem.h b/include/sys/sem.h
index b0fb201bd0..bab548c3f7 100644
--- a/include/sys/sem.h
+++ b/include/sys/sem.h
@@ -1 +1,10 @@
-#include <sysvipc/sys/sem.h>
+#ifndef _SYS_SEM_H
+# include <sysvipc/sys/sem.h>
+
+# ifndef _ISOMAC
+
+__typeof__ (semtimedop) __semtimedop attribute_hidden;
+libc_hidden_proto (__semtimedop)
+
+# endif
+#endif
diff --git a/sysdeps/unix/sysv/linux/semop.c b/sysdeps/unix/sysv/linux/semop.c
index 687fdcb805..e111b9aa3d 100644
--- a/sysdeps/unix/sysv/linux/semop.c
+++ b/sysdeps/unix/sysv/linux/semop.c
@@ -26,9 +26,5 @@
int
semop (int semid, struct sembuf *sops, size_t nsops)
{
-#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
- return INLINE_SYSCALL_CALL (semop, semid, sops, nsops);
-#else
- return INLINE_SYSCALL_CALL (ipc, IPCOP_semop, semid, nsops, 0, sops);
-#endif
+ return __semtimedop (semid, sops, nsops, NULL);
}
diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c
index f34a7fb920..5f1b205c2b 100644
--- a/sysdeps/unix/sysv/linux/semtimedop.c
+++ b/sysdeps/unix/sysv/linux/semtimedop.c
@@ -24,8 +24,8 @@
/* Perform user-defined atomical operation of array of semaphores. */
int
-semtimedop (int semid, struct sembuf *sops, size_t nsops,
- const struct timespec *timeout)
+__semtimedop (int semid, struct sembuf *sops, size_t nsops,
+ const struct timespec *timeout)
{
#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout);
@@ -34,3 +34,5 @@ semtimedop (int semid, struct sembuf *sops, size_t nsops,
SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout));
#endif
}
+weak_alias (__semtimedop, semtimedop)
+libc_hidden_def (__semtimedop)
diff --git a/sysvipc/semtimedop.c b/sysvipc/semtimedop.c
index 5ca4d47ee3..68707d6ade 100644
--- a/sysvipc/semtimedop.c
+++ b/sysvipc/semtimedop.c
@@ -22,11 +22,13 @@
/* Perform user-defined atomical operation of array of semaphores. */
int
-semtimedop (int semid, struct sembuf *sops, size_t nsops,
- const struct timespec *timeout)
+__semtimedop (int semid, struct sembuf *sops, size_t nsops,
+ const struct timespec *timeout)
{
__set_errno (ENOSYS);
return -1;
}
+weak_alias (__semtimedop, semtimedop)
+libc_hidden_def (__semtimedop)
stub_warning (semtimedop)
--
2.17.1