#include <sys/types.h>
#include <sys/socket.h>
-static size_t num_fds = 0, max_fds = 0, num_next = 0, num_finished = 0;
+static size_t num_fds = 0, max_fds = 0, num_next = 0, num_finished = 0, num_waiting = 0;
static struct pollfd *pollfds = NULL;
static struct fd **fds = NULL;
bool add_listener(struct io_listener *l)
{
- return add_fd(&l->fd, POLLIN);
+ if (!add_fd(&l->fd, POLLIN))
+ return false;
+ num_waiting++;
+ return true;
}
bool add_conn(struct io_conn *c)
enum io_state state = from_ioop(op);
struct pollfd *pfd = &pollfds[conn->fd.backend_info];
+ if (pfd->events)
+ num_waiting--;
+
pfd->events = pollmask(state);
if (conn->duplex) {
int mask = pollmask(conn->duplex->state);
assert(!mask || pfd->events != mask);
pfd->events |= mask;
}
+ if (pfd->events)
+ num_waiting++;
if (state == NEXT)
num_next++;
if (num_fds == 0)
break;
+ /* You can't tell them all to go to sleep! */
+ assert(num_waiting);
+
r = poll(pollfds, num_fds, -1);
if (r < 0)
break;
--- /dev/null
+#include <ccan/io/io.h>
+/* Include the C files directly. */
+#include <ccan/io/poll.c>
+#include <ccan/io/io.c>
+#include <ccan/tap/tap.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <signal.h>
+
+static struct io_op *start(struct io_conn *conn, void *unused)
+{
+ return io_idle(conn);
+}
+
+int main(void)
+{
+ int status;
+
+ plan_tests(3);
+
+ if (fork() == 0) {
+ int fds[2];
+
+ ok1(pipe(fds) == 0);
+ io_new_conn(fds[0], start, NULL, NULL);
+ io_loop();
+ exit(1);
+ }
+
+ ok1(wait(&status) != -1);
+ ok1(WIFSIGNALED(status));
+ ok1(WTERMSIG(status) == SIGABRT);
+
+ /* This exits depending on whether all tests passed */
+ return exit_status();
+}