diff mbox

[[PATCH,RFC,2] 41/63] Y2038: add function __mq_timedreceived64

Message ID 20180418201819.15952-42-albert.aribaud@3adev.fr
State New
Headers show

Commit Message

Albert ARIBAUD April 18, 2018, 8:17 p.m. UTC
---
 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 mbox

Patch

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
+   <http://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <mqueue.h>
+
+/* 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