From ea91a51ebe8897772e3d1b45e4405c8f9e2fedb0 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 13 Jul 2017 14:28:30 +0200 Subject: select: Add new osmo_fd_close() function This is a convenience helper that will both close a fd, mark it as closed and unregister it from the event loop abstraction. In most cases, you probably actually want to use it instead of manually closing and calling osmo_fd_unregister(). Change-Id: Icd0933eed6a24edde7cdcb378e138897ecc5332c --- src/select.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/select.c') diff --git a/src/select.c b/src/select.c index f7ee424c..0ba8bc60 100644 --- a/src/select.c +++ b/src/select.c @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -117,6 +118,22 @@ void osmo_fd_unregister(struct osmo_fd *fd) llist_del(&fd->list); } +/*! Close a file descriptor, mark it as closed + unregister from select loop abstraction + * \param[in] fd osmocom file descriptor to be unregistered + closed + * + * If \a fd is registered, we unregister it from the select() loop + * abstraction. We then close the fd and set it to -1, as well as + * unsetting any 'when' flags */ +void osmo_fd_close(struct osmo_fd *fd) +{ + if (osmo_fd_is_registered(fd)) + osmo_fd_unregister(fd); + if (fd->fd != -1) + close(fd->fd); + fd->fd = -1; + fd->when = 0; +} + /*! Populate the fd_sets and return the highest fd number * \param[in] _rset The readfds to populate * \param[in] _wset The wrtiefds to populate -- cgit v1.2.3