niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

linux: Add time64 semtimedop support

Browse source 
Either the __NR_semtimedop_time64 (for 32-bit) or the __NR_semtimedop
(for 64-bit) syscall is used as default.  The 32-bit fallback is used
iff __ASSUME_TIME64_SYSCALLS is not defined, which assumes the kernel
ABI provides either __NR_ipc or __NR_semtimeop (for 32-bit time_t).

Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Adhemerval Zanella 2020-07-06 17:40:34 -03:00
parent 60a2e28b34
commit 7c437d3778
2 changed files with 55 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sysdeps/unix/sysv/linux/include/sys/sem.h
View file

@ -7,9 +7,15 @@ __typeof__ (semtimedop) __semtimedop attribute_hidden;
#if __TIMESIZE == 64 #if __TIMESIZE == 64
# define __semctl64 __semctl # define __semctl64 __semctl
# define __semtimedop64 __semtimedop
#else #else
# include <struct___timespec64.h>
extern int __semctl64 (int semid, int semnum, int cmd, ...); extern int __semctl64 (int semid, int semnum, int cmd, ...);
libc_hidden_proto (__semctl64); libc_hidden_proto (__semctl64);
extern int __semtimedop64 (int semid, struct sembuf *sops, size_t nsops,
const struct __timespec64 *tmo);
libc_hidden_proto (__semtimedop64);
#endif #endif
# endif # endif

57
sysdeps/unix/sysv/linux/semtimedop.c
View file

@ -22,18 +22,59 @@
#include <errno.h> #include <errno.h>
/* Perform user-defined atomical operation of array of semaphores. */ /* Perform user-defined atomical operation of array of semaphores. */
int
__semtimedop64 (int semid, struct sembuf *sops, size_t nsops,
const struct __timespec64 *timeout)
{
#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS
# ifndef __NR_semtimedop_time64
# define __NR_semtimedop_time64 __NR_semtimedop
# endif
int r = INLINE_SYSCALL_CALL (semtimedop_time64, semid, sops, nsops,
timeout);
#else
int r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout));
#endif
#ifndef __ASSUME_TIME64_SYSCALLS
if (r == 0 || errno != ENOSYS)
return r;
struct timespec ts32, *pts32 = NULL;
if (timeout != NULL)
{
if (! in_time_t_range (timeout->tv_sec))
{
__set_errno (EINVAL);
return -1;
}
ts32 = valid_timespec64_to_timespec (*timeout);
pts32 = &ts32;
}
# if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS
r = INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, pts32);
# else
r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
SEMTIMEDOP_IPC_ARGS (nsops, sops, pts32));
# endif
#endif /* __ASSUME_TIME64_SYSCALLS */
return r;
}
#if __TIMESIZE != 64
libc_hidden_def (__semtimedop64)
int int
__semtimedop (int semid, struct sembuf *sops, size_t nsops, __semtimedop (int semid, struct sembuf *sops, size_t nsops,
const struct timespec *timeout) const struct timespec *timeout)
{ {
/* semtimedop wire-up syscall is not exported for 32-bit ABIs (they have struct __timespec64 ts64, *pts64 = NULL;
semtimedop_time64 instead with uses a 64-bit time_t). */ if (timeout != NULL)
#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS && defined __NR_semtimedop {
return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout); ts64 = valid_timespec_to_timespec64 (*timeout);
#else pts64 = &ts64;
return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, }
SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout)); return __semtimedop64 (semid, sops, nsops, pts64);
#endif
} }
#endif
weak_alias (__semtimedop, semtimedop) weak_alias (__semtimedop, semtimedop)