diff mbox series

[06/30] Lninux: consolidate epoll_create implementation

Message ID 20221019221433.1082017-7-adhemerval.zanella@linaro.org
State Committed
Commit d1d23b134244d59c4d6ef2295df5ec97b81ddb0a
Headers
Series Remove Linux generic sysdep |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Adhemerval Zanella Netto Oct. 19, 2022, 10:14 p.m. UTC 
  Use epoll_create syscall if defined, otherwise use epoll_create1.
---
 sysdeps/unix/sysv/linux/{generic => }/epoll_create.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => }/epoll_create.c (79%)

Comments

Florian Weimer Oct. 21, 2022, 8:57 a.m. UTC | #1 
* Adhemerval Zanella via Libc-alpha:

> Use epoll_create syscall if defined, otherwise use epoll_create1.

Warning: Typo in commit subject.  Patch looks okay.

Reviewed-by: Florian Weimer <fweimer@redhat.com>

Thanks,
Florian
Carlos O'Donell Dec. 5, 2022, 4:40 p.m. UTC | #2 
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:

As noted by Florian s/Lninux/Linux/g so first line has  typo.

This needs a v2.

> Use epoll_create syscall if defined, otherwise use epoll_create1.

Tested-by: Carlos O'Donell <carlos@redhat.com>

> ---
>  sysdeps/unix/sysv/linux/{generic => }/epoll_create.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => }/epoll_create.c (79%)
> 
> diff --git a/sysdeps/unix/sysv/linux/generic/epoll_create.c b/sysdeps/unix/sysv/linux/epoll_create.c
> similarity index 79%
> rename from sysdeps/unix/sysv/linux/generic/epoll_create.c
> rename to sysdeps/unix/sysv/linux/epoll_create.c
> index fa28694929..afb1921637 100644
> --- a/sysdeps/unix/sysv/linux/generic/epoll_create.c
> +++ b/sysdeps/unix/sysv/linux/epoll_create.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* Open an epoll file descriptor.  Linux version.
> +   Copyright (C) 2011-2022 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
> @@ -23,12 +24,16 @@ libc_hidden_proto (epoll_create)
>  int
>  epoll_create (int size)
>  {
> +#ifdef __NR_epoll_create
> +  return INLINE_SYSCALL_CALL (epoll_create);

OK.

> +#else
>    if (size <= 0)
>      {
>        __set_errno (EINVAL);
>        return -1;
>      }
>  
> -  return INLINE_SYSCALL (epoll_create1, 1, 0);
> +  return INLINE_SYSCALL_CALL (epoll_create1, 0);

OK.

> +#endif
>  }
>  libc_hidden_def (epoll_create)
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/generic/epoll_create.c b/sysdeps/unix/sysv/linux/epoll_create.c
similarity index 79%
rename from sysdeps/unix/sysv/linux/generic/epoll_create.c
rename to sysdeps/unix/sysv/linux/epoll_create.c
index fa28694929..afb1921637 100644
--- a/sysdeps/unix/sysv/linux/generic/epoll_create.c
+++ b/sysdeps/unix/sysv/linux/epoll_create.c
@@ -1,4 +1,5 @@ 
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Open an epoll file descriptor.  Linux version.
+   Copyright (C) 2011-2022 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
@@ -23,12 +24,16 @@  libc_hidden_proto (epoll_create)
 int
 epoll_create (int size)
 {
+#ifdef __NR_epoll_create
+  return INLINE_SYSCALL_CALL (epoll_create);
+#else
   if (size <= 0)
     {
       __set_errno (EINVAL);
       return -1;
     }
 
-  return INLINE_SYSCALL (epoll_create1, 1, 0);
+  return INLINE_SYSCALL_CALL (epoll_create1, 0);
+#endif
 }
 libc_hidden_def (epoll_create)