public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Simplify mq_timedsend Date: Thu, 30 Jul 2020 13:24:56 +0000 (GMT) [thread overview] Message-ID: <20200730132456.AF3823851C2B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cb4b1e09b21d5ae1cadff621a5f0fd552ee9b2b2 commit cb4b1e09b21d5ae1cadff621a5f0fd552ee9b2b2 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Fri Jul 10 11:15:42 2020 -0300 linux: Simplify mq_timedsend With arch-syscall.h it can now assumes the existance of either __NR_mq_timedsend or __NR_mq_timedsend_time64. The 32-bit time_t support is now only build for !__ASSUME_TIME64_SYSCALLS. The internal 64-bit time_t names is also adjusted to use the other y2038 symbol names. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Diff: --- include/mqueue.h | 10 +++++----- sysdeps/unix/sysv/linux/mq_timedsend.c | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/mqueue.h b/include/mqueue.h index b3ee8b7462..e0e30dc890 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -12,13 +12,13 @@ hidden_proto (mq_setattr) # endif #include <struct___timespec64.h> #if __TIMESIZE == 64 -# define __mq_timedsend_time64 __mq_timedsend +# define __mq_timedsend64 __mq_timedsend # define __mq_timedreceive64 __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 int __mq_timedsend64 (mqd_t mqdes, const char *msg_ptr, + size_t msg_len, unsigned int msg_prio, + const struct __timespec64 *abs_timeout); +librt_hidden_proto (__mq_timedsend64) extern ssize_t __mq_timedreceive64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len, diff --git a/sysdeps/unix/sysv/linux/mq_timedsend.c b/sysdeps/unix/sysv/linux/mq_timedsend.c index f2a43df300..6011db7112 100644 --- a/sysdeps/unix/sysv/linux/mq_timedsend.c +++ b/sysdeps/unix/sysv/linux/mq_timedsend.c @@ -22,19 +22,17 @@ /* Add message pointed by MSG_PTR to message queue MQDES, stop blocking on full message queue if ABS_TIMEOUT expires. */ int -__mq_timedsend_time64 (mqd_t mqdes, const char *msg_ptr, size_t msg_len, - unsigned int msg_prio, - const struct __timespec64 *abs_timeout) +__mq_timedsend64 (mqd_t mqdes, const char *msg_ptr, size_t msg_len, + unsigned int msg_prio, + const struct __timespec64 *abs_timeout) { -#ifdef __ASSUME_TIME64_SYSCALLS # ifndef __NR_mq_timedsend_time64 # define __NR_mq_timedsend_time64 __NR_mq_timedsend # endif - return SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len, - msg_prio, abs_timeout); -#else int ret = SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len, - msg_prio, abs_timeout); + msg_prio, abs_timeout); + +#ifndef __ASSUME_TIME64_SYSCALLS if (ret == 0 || errno != ENOSYS) return ret; @@ -50,13 +48,15 @@ __mq_timedsend_time64 (mqd_t mqdes, const char *msg_ptr, size_t msg_len, ts32 = valid_timespec64_to_timespec (*abs_timeout); } - return SYSCALL_CANCEL (mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio, - abs_timeout != NULL ? &ts32 : NULL); + ret = SYSCALL_CANCEL (mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio, + abs_timeout != NULL ? &ts32 : NULL); #endif + + return ret; } #if __TIMESIZE != 64 -librt_hidden_def (__mq_timedsend_time64) +librt_hidden_def (__mq_timedsend64) int __mq_timedsend (mqd_t mqdes, const char *msg_ptr, size_t msg_len, @@ -66,8 +66,8 @@ __mq_timedsend (mqd_t mqdes, const char *msg_ptr, size_t msg_len, if (abs_timeout != NULL) ts64 = valid_timespec_to_timespec64 (*abs_timeout); - return __mq_timedsend_time64 (mqdes, msg_ptr, msg_len, msg_prio, - abs_timeout != NULL ? &ts64 : NULL); + return __mq_timedsend64 (mqdes, msg_ptr, msg_len, msg_prio, + abs_timeout != NULL ? &ts64 : NULL); } #endif
reply other threads:[~2020-07-30 13:24 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200730132456.AF3823851C2B@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).