[07/23] linux: Simplify ppoll

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

Commit Message

Will Deacon via Libc-alpha July 13, 2020, 5:10 p.m.
With arch-syscall.h it can now assumes the existance of either
__NR_ppoll or __NR_ppoll_time64.  The 32-bit time_t support is now
only build for !__ASSUME_TIME64_SYSCALLS.

Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).
---
 sysdeps/unix/sysv/linux/ppoll.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

-- 
2.25.1

Comments

Joseph Myers July 13, 2020, 9:21 p.m. | #1
On Mon, 13 Jul 2020, Adhemerval Zanella via Libc-alpha wrote:

> With arch-syscall.h it can now assumes the existance of either

> __NR_ppoll or __NR_ppoll_time64.  The 32-bit time_t support is now

> only build for !__ASSUME_TIME64_SYSCALLS.


> +#ifdef __ASSUME_TIME64_SYSCALLS

>    if (ret >= 0 || errno != ENOSYS)

>      return ret;


Should this be #ifndef?  It looks like it's building the fallback code in 
exactly the case where it's not needed.

-- 
Joseph S. Myers
joseph@codesourcery.com
Lukasz Majewski July 14, 2020, 8:07 a.m. | #2
On Mon, 13 Jul 2020 14:10:09 -0300
Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> wrote:

> With arch-syscall.h it can now assumes the existance of either

> __NR_ppoll or __NR_ppoll_time64.  The 32-bit time_t support is now

> only build for !__ASSUME_TIME64_SYSCALLS.

> 

> Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15

> kernel).

> ---

>  sysdeps/unix/sysv/linux/ppoll.c | 23 +++++++++++------------

>  1 file changed, 11 insertions(+), 12 deletions(-)

> 

> diff --git a/sysdeps/unix/sysv/linux/ppoll.c

> b/sysdeps/unix/sysv/linux/ppoll.c index 0f15636cce..079d56b5eb 100644

> --- a/sysdeps/unix/sysv/linux/ppoll.c

> +++ b/sysdeps/unix/sysv/linux/ppoll.c

> @@ -37,19 +37,16 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const

> struct __timespec64 *timeout, timeout = &tval;

>      }

>  

> -#ifdef __ASSUME_TIME64_SYSCALLS

> -# ifndef __NR_ppoll_time64

> -#  define __NR_ppoll_time64 __NR_ppoll

> -# endif

> -  return SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,

> -			 __NSIG_BYTES);

> -#else

> -# ifdef __NR_ppoll_time64

> +#ifndef __NR_ppoll_time64

> +# define __NR_ppoll_time64 __NR_ppoll

> +#endif

>    int ret = SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout,

> sigmask,

> -                            __NSIG_BYTES);

> +			    __NSIG_BYTES);

> +

> +#ifdef __ASSUME_TIME64_SYSCALLS

>    if (ret >= 0 || errno != ENOSYS)

>      return ret;

> -# endif

> +

>    struct timespec ts32;

>    if (timeout)

>      {

> @@ -62,9 +59,11 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const

> struct __timespec64 *timeout, ts32 = valid_timespec64_to_timespec

> (*timeout); }

>  

> -  return SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL,

> sigmask,

> -                         __NSIG_BYTES);

> +  ret = SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL,

> sigmask,

> +			__NSIG_BYTES);

>  #endif

> +

> +  return ret;

>  }

>  

>  #if __TIMESIZE != 64


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
Will Deacon via Libc-alpha July 14, 2020, 1:26 p.m. | #3
On 13/07/2020 18:21, Joseph Myers wrote:
> On Mon, 13 Jul 2020, Adhemerval Zanella via Libc-alpha wrote:

> 

>> With arch-syscall.h it can now assumes the existance of either

>> __NR_ppoll or __NR_ppoll_time64.  The 32-bit time_t support is now

>> only build for !__ASSUME_TIME64_SYSCALLS.

> 

>> +#ifdef __ASSUME_TIME64_SYSCALLS

>>    if (ret >= 0 || errno != ENOSYS)

>>      return ret;

> 

> Should this be #ifndef?  It looks like it's building the fallback code in 

> exactly the case where it's not needed.

> 


It should, I have change it on a subsequent patch in the same set I didn't
catch in in the end.  I changed it locally.

Patch

diff --git a/sysdeps/unix/sysv/linux/ppoll.c b/sysdeps/unix/sysv/linux/ppoll.c
index 0f15636cce..079d56b5eb 100644
--- a/sysdeps/unix/sysv/linux/ppoll.c
+++ b/sysdeps/unix/sysv/linux/ppoll.c
@@ -37,19 +37,16 @@  __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout,
       timeout = &tval;
     }
 
-#ifdef __ASSUME_TIME64_SYSCALLS
-# ifndef __NR_ppoll_time64
-#  define __NR_ppoll_time64 __NR_ppoll
-# endif
-  return SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,
-			 __NSIG_BYTES);
-#else
-# ifdef __NR_ppoll_time64
+#ifndef __NR_ppoll_time64
+# define __NR_ppoll_time64 __NR_ppoll
+#endif
   int ret = SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,
-                            __NSIG_BYTES);
+			    __NSIG_BYTES);
+
+#ifdef __ASSUME_TIME64_SYSCALLS
   if (ret >= 0 || errno != ENOSYS)
     return ret;
-# endif
+
   struct timespec ts32;
   if (timeout)
     {
@@ -62,9 +59,11 @@  __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout,
       ts32 = valid_timespec64_to_timespec (*timeout);
     }
 
-  return SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL, sigmask,
-                         __NSIG_BYTES);
+  ret = SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL, sigmask,
+			__NSIG_BYTES);
 #endif
+
+  return ret;
 }
 
 #if __TIMESIZE != 64