diff options
| -rw-r--r-- | rt/tst-mqueue10.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mq_timedsend.c | 35 |
2 files changed, 29 insertions, 16 deletions
diff --git a/rt/tst-mqueue10.c b/rt/tst-mqueue10.c index 7fb53a1cae..18795808e0 100644 --- a/rt/tst-mqueue10.c +++ b/rt/tst-mqueue10.c @@ -54,6 +54,16 @@ do_test (void) support_delete_timer (timer); } + { + timer_t timer = support_create_timer (0, 100000000, false, NULL); + /* Fill the internal buffer first. */ + TEST_COMPARE (mq_timedsend (q, msg, sizeof (msg), 0, + &(struct timespec) { 0, 0 }), 0); + TEST_COMPARE (mq_timedsend (q, msg, sizeof (msg), 0, &ts), -1); + TEST_VERIFY (errno == EINTR || errno == EOVERFLOW); + support_delete_timer (timer); + } + mq_unlink (name); return 0; diff --git a/sysdeps/unix/sysv/linux/mq_timedsend.c b/sysdeps/unix/sysv/linux/mq_timedsend.c index 5f14ecb0bf..d0835f005c 100644 --- a/sysdeps/unix/sysv/linux/mq_timedsend.c +++ b/sysdeps/unix/sysv/linux/mq_timedsend.c @@ -29,30 +29,33 @@ __mq_timedsend_time64 (mqd_t mqdes, const char *msg_ptr, size_t msg_len, # ifndef __NR_mq_timedsend_time64 # define __NR_mq_timedsend_time64 __NR_mq_timedsend # endif - int ret = SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len, - msg_prio, abs_timeout); -#ifndef __ASSUME_TIME64_SYSCALLS - if (ret == 0 || errno != ENOSYS) - return ret; +#ifdef __ASSUME_TIME64_SYSCALLS + return SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len, + msg_prio, abs_timeout); +#else + bool need_time64 = abs_timeout != NULL + && !in_time_t_range (abs_timeout->tv_sec); + if (need_time64) + { + int r = SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len, + msg_prio, abs_timeout); + if (r == 0 || errno != ENOSYS) + return r; + __set_errno (EOVERFLOW); + return -1; + } - struct timespec ts32; + struct timespec ts32, *pts32 = NULL; 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); + pts32 = &ts32; } - ret = SYSCALL_CANCEL (mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio, - abs_timeout != NULL ? &ts32 : NULL); + return SYSCALL_CANCEL (mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio, + pts32); #endif - - return ret; } #if __TIMESIZE != 64 |