mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08:00
0b65a8fbaf
This patch provides new __mq_timedreceive_time64 explicit 64 bit function for receiving messages with absolute timeout. Moreover, a 32 bit version - __mq_timedreceive has been refactored to internally use __mq_timedreceive_time64. The __mq_timedreceive is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary conversion to 64 bit struct __timespec64 from struct timespec. The new mq_timedsend_time64 syscall available from Linux 5.1+ has been used, when applicable. As this wrapper function is also used internally in the glibc, to e.g. provide mq_receive implementation, an explicit check for abs_timeout being NULL has been added due to conversions between struct timespec and struct __timespec64. Before this change the Linux kernel handled this NULL pointer. Build tests: - ./src/scripts/build-many-glibcs.py glibcs Run-time tests: - Run specific tests on ARM/x86 32bit systems (qemu): https://github.com/lmajewski/meta-y2038 and run tests: https://github.com/lmajewski/y2038-tests/commits/master Linux kernel, headers and minimal kernel version for glibc build test matrix: - Linux v5.1 (with mq_timedreceive_time64) and glibc built with v5.1 as minimal kernel version (--enable-kernel="5.1.0") The __ASSUME_TIME64_SYSCALLS flag defined. - Linux v5.1 and default minimal kernel version The __ASSUME_TIME64_SYSCALLS not defined, but kernel supports mq_timedreceive_time64 syscall. - Linux v4.19 (no mq_timedreceive_time64 support) with default minimal kernel version for contemporary glibc (3.2.0) This kernel doesn't support mq_timedreceive_time64 syscall, so the fallback to mq_timedreceive is tested. Above tests were performed with Y2038 redirection applied as well as without (so the __TIMESIZE != 64 execution path is checked as well). Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
31 lines
1.2 KiB
C
31 lines
1.2 KiB
C
#include <rt/mqueue.h>
|
|
|
|
#ifndef _ISOMAC
|
|
# if IS_IN (librt)
|
|
hidden_proto (mq_timedsend)
|
|
extern __typeof (mq_timedsend) __mq_timedsend __nonnull ((2, 5));
|
|
hidden_proto (__mq_timedsend)
|
|
hidden_proto (mq_timedreceive)
|
|
extern __typeof (mq_timedreceive) __mq_timedreceive __nonnull ((2, 5));
|
|
hidden_proto (__mq_timedreceive)
|
|
hidden_proto (mq_setattr)
|
|
# endif
|
|
#include <struct___timespec64.h>
|
|
#if __TIMESIZE == 64
|
|
# define __mq_timedsend_time64 __mq_timedsend
|
|
# define __mq_timedreceive_time64 __mq_timedreceive
|
|
#else
|
|
extern int __mq_timedsend_time64 (mqd_t mqdes, const char *msg_ptr,
|
|
size_t msg_len, unsigned int msg_prio,
|
|
const struct __timespec64 *abs_timeout);
|
|
librt_hidden_proto (__mq_timedsend_time64)
|
|
extern ssize_t __mq_timedreceive_time64 (mqd_t mqdes,
|
|
char *__restrict msg_ptr,
|
|
size_t msg_len,
|
|
unsigned int *__restrict msg_prio,
|
|
const struct __timespec64 *__restrict
|
|
abs_timeout);
|
|
librt_hidden_proto (__mq_timedreceive_time64)
|
|
#endif
|
|
#endif
|