diff options
| -rw-r--r-- | include/mqueue.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mq_timedreceive.c | 51 |
2 files changed, 55 insertions, 4 deletions
diff --git a/include/mqueue.h b/include/mqueue.h index 32e6570529..98e4596c22 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -13,10 +13,18 @@ hidden_proto (mq_setattr) #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 diff --git a/sysdeps/unix/sysv/linux/mq_timedreceive.c b/sysdeps/unix/sysv/linux/mq_timedreceive.c index 73a1d63e41..728a63d1ec 100644 --- a/sysdeps/unix/sysv/linux/mq_timedreceive.c +++ b/sysdeps/unix/sysv/linux/mq_timedreceive.c @@ -22,13 +22,56 @@ /* Receive the oldest from highest priority messages in message queue MQDES, stop waiting if ABS_TIMEOUT expires. */ ssize_t -__mq_timedreceive (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len, - unsigned int *__restrict msg_prio, - const struct timespec *__restrict abs_timeout) +__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) { +#ifdef __ASSUME_TIME64_SYSCALLS +# ifndef __NR_mq_timedreceive_time64 +# define __NR_mq_timedreceive_time64 __NR_mq_timedreceive +# endif + return SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len, + msg_prio, abs_timeout); +#else + int ret = SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len, + msg_prio, abs_timeout); + if (ret == 0 || errno != ENOSYS) + return ret; + + struct timespec ts32; + if (abs_timeout != NULL) + { + if (! in_time_t_range (abs_timeout->tv_sec)) + { + __set_errno (EOVERFLOW); + return -1; + } + + ts32 = valid_timespec64_to_timespec (*abs_timeout); + } + return SYSCALL_CANCEL (mq_timedreceive, mqdes, msg_ptr, msg_len, msg_prio, - abs_timeout); + abs_timeout != NULL ? &ts32 : NULL); +#endif +} + +#if __TIMESIZE != 64 +librt_hidden_def (__mq_timedreceive_time64) + +ssize_t +__mq_timedreceive (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len, + unsigned int *__restrict msg_prio, + const struct timespec *__restrict abs_timeout) +{ + struct __timespec64 ts64; + if (abs_timeout != NULL) + ts64 = valid_timespec_to_timespec64 (*abs_timeout); + + return __mq_timedreceive_time64 (mqdes, msg_ptr, msg_len, msg_prio, + abs_timeout != NULL ? &ts64 : NULL); } +#endif + hidden_def (__mq_timedreceive) weak_alias (__mq_timedreceive, mq_timedreceive) hidden_weak (mq_timedreceive) |