From: Greg Depoire--Ferrer <greg@gregdf.com>
To: ell@lists.linux.dev
Cc: Greg Depoire--Ferrer <greg@gregdf.com>
Subject: [PATCH 1/3] main: Accept FD 0 as epoll_fd
Date: Sun, 8 May 2022 01:54:32 +0200 [thread overview]
Message-ID: <20220507235434.11693-2-greg@gregdf.com> (raw)
In-Reply-To: <20220507235434.11693-1-greg@gregdf.com>
When create_epoll was called and the file descriptor 0 was not open, the
kernel would return it as the epoll FD, but ell would consider it as an
error because it used the value 0 in epoll_fd to signify failure.
Use -1 instead of 0 to signify error to fix the issue.
---
ell/main.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/ell/main.c b/ell/main.c
index 1a6cd60..6f9a074 100644
--- a/ell/main.c
+++ b/ell/main.c
@@ -61,7 +61,7 @@
#define WATCHDOG_TRIGGER_FREQ 2
-static int epoll_fd;
+static int epoll_fd = -1;
static bool epoll_running;
static bool epoll_terminate;
static int idle_id;
@@ -99,10 +99,8 @@ static inline bool __attribute__ ((always_inline)) create_epoll(void)
unsigned int i;
epoll_fd = epoll_create1(EPOLL_CLOEXEC);
- if (epoll_fd < 0) {
- epoll_fd = 0;
+ if (epoll_fd < 0)
return false;
- }
watch_list = malloc(DEFAULT_WATCH_ENTRIES * sizeof(void *));
if (!watch_list)
@@ -121,7 +119,7 @@ static inline bool __attribute__ ((always_inline)) create_epoll(void)
close_epoll:
close(epoll_fd);
- epoll_fd = 0;
+ epoll_fd = -1;
return false;
}
@@ -136,7 +134,7 @@ int watch_add(int fd, uint32_t events, watch_event_cb_t callback,
if (unlikely(fd < 0 || !callback))
return -EINVAL;
- if (!epoll_fd)
+ if (epoll_fd < 0)
return -EIO;
if ((unsigned int) fd > watch_entries - 1)
@@ -284,7 +282,7 @@ int idle_add(idle_event_cb_t callback, void *user_data, uint32_t flags,
if (unlikely(!callback))
return -EINVAL;
- if (!epoll_fd)
+ if (epoll_fd < 0)
return -EIO;
data = l_new(struct idle_data, 1);
@@ -509,7 +507,7 @@ LIB_EXPORT int l_main_run(void)
int timeout;
/* Has l_main_init() been called? */
- if (unlikely(!epoll_fd))
+ if (unlikely(epoll_fd < 0))
return EXIT_FAILURE;
if (unlikely(epoll_running))
@@ -577,7 +575,7 @@ LIB_EXPORT bool l_main_exit(void)
idle_list = NULL;
close(epoll_fd);
- epoll_fd = 0;
+ epoll_fd = -1;
return true;
}
--
2.35.1
next prev parent reply other threads:[~2022-05-08 0:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-07 23:54 Fix bug when stdin is closed Greg Depoire--Ferrer
2022-05-07 23:54 ` Greg Depoire--Ferrer [this message]
2022-05-07 23:54 ` [PATCH 2/3] dhcp6-transport: Remove udp_fd field Greg Depoire--Ferrer
2022-05-07 23:54 ` [PATCH 3/3] dhcp-transport: Initialize the " Greg Depoire--Ferrer
2022-06-06 18:17 ` Denis Kenzior
2022-06-06 18:18 ` Fix bug when stdin is closed Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220507235434.11693-2-greg@gregdf.com \
--to=greg@gregdf.com \
--cc=ell@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).