[06/23] linux: Simplify mq_timedsend

Message ID 20200713171025.3661832-6-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • [01/23] linux: Simplify clock_adjtime
Related show

Commit Message

Alejandro Colomar via Libc-alpha July 13, 2020, 5:10 p.m.
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).
---
 include/mqueue.h                       | 10 +++++-----
 sysdeps/unix/sysv/linux/mq_timedsend.c | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

-- 
2.25.1

Comments

Lukasz Majewski July 14, 2020, 8:06 a.m. | #1
On Mon, 13 Jul 2020 14:10:08 -0300
Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> wrote:

>  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).

> ---

>  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

>  


The same comment as for mq_timedreceive.


Reviewed-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de

Patch

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