static LIST_HEAD(closing);
static LIST_HEAD(always);
static struct timemono (*nowfn)(void) = time_mono;
+static int (*pollfn)(struct pollfd *fds, nfds_t nfds, int timeout) = poll;
struct timemono (*io_time_override(struct timemono (*now)(void)))(void)
{
return old;
}
+int (*io_poll_override(int (*poll)(struct pollfd *fds, nfds_t nfds, int timeout)))(struct pollfd *, nfds_t, int)
+{
+ int (*old)(struct pollfd *fds, nfds_t nfds, int timeout) = pollfn;
+ pollfn = poll;
+ return old;
+}
+
static bool add_fd(struct fd *fd, short events)
{
if (!max_fds) {
num_waiting--;
pfd->events = 0;
- if (conn->plan[IO_IN].status == IO_POLLING)
+ if (conn->plan[IO_IN].status == IO_POLLING_NOTSTARTED
+ || conn->plan[IO_IN].status == IO_POLLING_STARTED)
pfd->events |= POLLIN;
- if (conn->plan[IO_OUT].status == IO_POLLING)
+ if (conn->plan[IO_OUT].status == IO_POLLING_NOTSTARTED
+ || conn->plan[IO_OUT].status == IO_POLLING_STARTED)
pfd->events |= POLLOUT;
if (pfd->events) {
}
}
-static void destroy_conn(struct io_conn *conn)
+static void destroy_conn(struct io_conn *conn, bool close_fd)
{
int saved_errno = errno;
- close(conn->fd.fd);
+ if (close_fd)
+ close(conn->fd.fd);
del_fd(&conn->fd);
/* In case it's on always list, remove it. */
list_del_init(&conn->always);
}
}
+static void destroy_conn_close_fd(struct io_conn *conn)
+{
+ destroy_conn(conn, true);
+}
+
bool add_conn(struct io_conn *c)
{
if (!add_fd(&c->fd, 0))
return false;
- tal_add_destructor(c, destroy_conn);
+ tal_add_destructor(c, destroy_conn_close_fd);
return true;
}
+void cleanup_conn_without_close(struct io_conn *conn)
+{
+ tal_del_destructor(conn, destroy_conn_close_fd);
+ destroy_conn(conn, false);
+}
+
static void accept_conn(struct io_listener *l)
{
int fd = accept(l->fd.fd, NULL, NULL);
}
}
- r = poll(pollfds, num_fds, ms_timeout);
- if (r < 0)
+ r = pollfn(pollfds, num_fds, ms_timeout);
+ if (r < 0) {
+ /* Signals shouldn't break us, unless they set
+ * io_loop_return. */
+ if (errno == EINTR)
+ continue;
break;
+ }
for (i = 0; i < num_fds && !io_loop_return; i++) {
struct io_conn *c = (void *)fds[i];
break;
if (fds[i]->listener) {
+ struct io_listener *l = (void *)fds[i];
if (events & POLLIN) {
- accept_conn((void *)c);
+ accept_conn(l);
+ r--;
+ } else if (events & (POLLHUP|POLLNVAL|POLLERR)) {
r--;
+ errno = EBADF;
+ io_close_listener(l);
}
} else if (events & (POLLIN|POLLOUT)) {
r--;