From d1d23b134244d59c4d6ef2295df5ec97b81ddb0a Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Wed, 19 Oct 2022 19:14:09 -0300 Subject: Lninux: consolidate epoll_create implementation Use epoll_create syscall if defined, otherwise use epoll_create1. Reviewed-by: Florian Weimer Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/epoll_create.c | 39 ++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/generic/epoll_create.c | 34 ---------------------- 2 files changed, 39 insertions(+), 34 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/epoll_create.c delete mode 100644 sysdeps/unix/sysv/linux/generic/epoll_create.c diff --git a/sysdeps/unix/sysv/linux/epoll_create.c b/sysdeps/unix/sysv/linux/epoll_create.c new file mode 100644 index 0000000000..afb1921637 --- /dev/null +++ b/sysdeps/unix/sysv/linux/epoll_create.c @@ -0,0 +1,39 @@ +/* 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 + 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 + +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_CALL (epoll_create1, 0); +#endif +} +libc_hidden_def (epoll_create) diff --git a/sysdeps/unix/sysv/linux/generic/epoll_create.c b/sysdeps/unix/sysv/linux/generic/epoll_create.c deleted file mode 100644 index fa28694929..0000000000 --- a/sysdeps/unix/sysv/linux/generic/epoll_create.c +++ /dev/null @@ -1,34 +0,0 @@ -/* 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 - 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 - -libc_hidden_proto (epoll_create) - -int -epoll_create (int size) -{ - if (size <= 0) - { - __set_errno (EINVAL); - return -1; - } - - return INLINE_SYSCALL (epoll_create1, 1, 0); -} -libc_hidden_def (epoll_create) -- cgit 1.4.1