From patchwork Wed Apr 18 20:17:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 26820 Received: (qmail 120621 invoked by alias); 18 Apr 2018 20:21:39 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 120526 invoked by uid 89); 18 Apr 2018 20:21:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_RP_RNBL autolearn=ham version=3.3.2 spammy=expires, Receive X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [[PATCH RFC 2] 41/63] Y2038: add function __mq_timedreceived64 Date: Wed, 18 Apr 2018 22:17:57 +0200 Message-Id: <20180418201819.15952-42-albert.aribaud@3adev.fr> In-Reply-To: <20180418201819.15952-41-albert.aribaud@3adev.fr> References: <20180418201819.15952-1-albert.aribaud@3adev.fr> <20180418201819.15952-2-albert.aribaud@3adev.fr> <20180418201819.15952-3-albert.aribaud@3adev.fr> <20180418201819.15952-4-albert.aribaud@3adev.fr> <20180418201819.15952-5-albert.aribaud@3adev.fr> <20180418201819.15952-6-albert.aribaud@3adev.fr> <20180418201819.15952-7-albert.aribaud@3adev.fr> <20180418201819.15952-8-albert.aribaud@3adev.fr> <20180418201819.15952-9-albert.aribaud@3adev.fr> <20180418201819.15952-10-albert.aribaud@3adev.fr> <20180418201819.15952-11-albert.aribaud@3adev.fr> <20180418201819.15952-12-albert.aribaud@3adev.fr> <20180418201819.15952-13-albert.aribaud@3adev.fr> <20180418201819.15952-14-albert.aribaud@3adev.fr> <20180418201819.15952-15-albert.aribaud@3adev.fr> <20180418201819.15952-16-albert.aribaud@3adev.fr> <20180418201819.15952-17-albert.aribaud@3adev.fr> <20180418201819.15952-18-albert.aribaud@3adev.fr> <20180418201819.15952-19-albert.aribaud@3adev.fr> <20180418201819.15952-20-albert.aribaud@3adev.fr> <20180418201819.15952-21-albert.aribaud@3adev.fr> <20180418201819.15952-22-albert.aribaud@3adev.fr> <20180418201819.15952-23-albert.aribaud@3adev.fr> <20180418201819.15952-24-albert.aribaud@3adev.fr> <20180418201819.15952-25-albert.aribaud@3adev.fr> <20180418201819.15952-26-albert.aribaud@3adev.fr> <20180418201819.15952-27-albert.aribaud@3adev.fr> <20180418201819.15952-28-albert.aribaud@3adev.fr> <20180418201819.15952-29-albert.aribaud@3adev.fr> <20180418201819.15952-30-albert.aribaud@3adev.fr> <20180418201819.15952-31-albert.aribaud@3adev.fr> <20180418201819.15952-32-albert.aribaud@3adev.fr> <20180418201819.15952-33-albert.aribaud@3adev.fr> <20180418201819.15952-34-albert.aribaud@3adev.fr> <20180418201819.15952-35-albert.aribaud@3adev.fr> <20180418201819.15952-36-albert.aribaud@3adev.fr> <20180418201819.15952-37-albert.aribaud@3adev.fr> <20180418201819.15952-38-albert.aribaud@3adev.fr> <20180418201819.15952-39-albert.aribaud@3adev.fr> <20180418201819.15952-40-albert.aribaud@3adev.fr> <20180418201819.15952-41-albert.aribaud@3adev.fr> --- rt/Makefile | 3 +- rt/Versions | 1 + rt/mq_timedreceive64.c | 46 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/arm/librt.abilist | 1 + .../sysv/linux/powerpc/powerpc32/librt.abilist | 1 + 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 rt/mq_timedreceive64.c diff --git a/rt/Makefile b/rt/Makefile index 994891e42d..293918a3c9 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -37,7 +37,8 @@ timer-routines := timer_create timer_delete timer_getoverr \ shm-routines := shm_open shm_unlink mq-routines := mq_open mq_close mq_unlink mq_getattr mq_setattr \ mq_notify mq_send mq_receive mq_timedsend \ - mq_timedreceive + mq_timedreceive \ + mq_timedreceive64 routines = $(clock-routines) diff --git a/rt/Versions b/rt/Versions index 156df9f647..23d759a727 100644 --- a/rt/Versions +++ b/rt/Versions @@ -42,5 +42,6 @@ librt { __timer_settime64; __timerfd_gettime64; __timerfd_settime64; + __mq_timedreceive64; } } diff --git a/rt/mq_timedreceive64.c b/rt/mq_timedreceive64.c new file mode 100644 index 0000000000..e8853864c9 --- /dev/null +++ b/rt/mq_timedreceive64.c @@ -0,0 +1,46 @@ +/* Receive the oldest from highest priority messages in message queue + MQDES, stop waiting if ABS_TIMEOUT expires. + + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +/* 64-bit time version */ + +extern int __y2038_linux_support; + +ssize_t +__mq_timedreceive64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len, + unsigned int *__restrict msg_prio, + const struct __timespec64 *__restrict abs_timeout) +{ + struct timespec ts32, *tsp32 = NULL; + if (__y2038_linux_support) + { + /* TODO: use 64-bit syscall */ + } + + if (abs_timeout) + { + ts32.tv_sec = abs_timeout->tv_sec; + ts32.tv_nsec = abs_timeout->tv_nsec; + tsp32 = &ts32; + } + return mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, tsp32); +} diff --git a/sysdeps/unix/sysv/linux/arm/librt.abilist b/sysdeps/unix/sysv/linux/arm/librt.abilist index 4ca48fc2a6..ff68d1e19d 100644 --- a/sysdeps/unix/sysv/linux/arm/librt.abilist +++ b/sysdeps/unix/sysv/linux/arm/librt.abilist @@ -1,4 +1,5 @@ GLIBC_2.27 GLIBC_2.27 A +GLIBC_2.27 __mq_timedreceive64 F GLIBC_2.27 __timer_gettime64 F GLIBC_2.27 __timer_settime64 F GLIBC_2.27 __timerfd_gettime64 F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist index 1d6dd33e52..5a9d06731e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist @@ -30,6 +30,7 @@ GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.27 GLIBC_2.27 A +GLIBC_2.27 __mq_timedreceive64 F GLIBC_2.27 __timer_gettime64 F GLIBC_2.27 __timer_settime64 F GLIBC_2.27 __timerfd_gettime64 F