ccan/io: make enum io_state namespace-safe.

[ccan] / ccan / io / poll.c

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index 94536728d91f48956902b74ab52fa66185e0d57f..918e9f270e677e1dcfe83698232422e947172294 100644 (file)
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -90,8 +90,8 @@ bool add_duplex(struct io_conn *c)
 
 static void del_conn(struct io_conn *conn)
 {
-       if (conn->fd.finish)
-               conn->fd.finish(conn, conn->fd.finish_arg);
+       if (conn->finish)
+               conn->finish(conn, conn->finish_arg);
        if (timeout_active(conn))
                backend_del_timeout(conn);
        free(conn->timeout);
@@ -101,9 +101,9 @@ static void del_conn(struct io_conn *conn)
                conn->duplex->duplex = NULL;
        } else
                del_fd(&conn->fd);
-       if (conn->state == FINISHED)
+       if (conn->state == IO_FINISHED)
                num_finished--;
-       else if (conn->state == NEXT)
+       else if (conn->state == IO_NEXT)
                num_next--;
 }
 
@@ -112,31 +112,17 @@ void del_listener(struct io_listener *l)
        del_fd(&l->fd);
 }
 
-static int pollmask(enum io_state state)
+void backend_set_state(struct io_conn *conn, struct io_plan *plan)
 {
-       switch (state) {
-       case READ:
-       case READPART:
-               return POLLIN;
-       case WRITE:
-       case WRITEPART:
-               return POLLOUT;
-       default:
-               return 0;
-       }
-}
-
-void backend_set_state(struct io_conn *conn, struct io_op *op)
-{
-       enum io_state state = from_ioop(op);
+       enum io_state state = from_ioplan(plan);
        struct pollfd *pfd = &pollfds[conn->fd.backend_info];
 
        if (pfd->events)
                num_waiting--;
 
-       pfd->events = pollmask(state);
+       pfd->events = conn->pollflag;
        if (conn->duplex) {
-               int mask = pollmask(conn->duplex->state);
+               int mask = conn->duplex->pollflag;
                /* You can't *both* read/write. */
                assert(!mask || pfd->events != mask);
                pfd->events |= mask;
@@ -144,9 +130,9 @@ void backend_set_state(struct io_conn *conn, struct io_op *op)
        if (pfd->events)
                num_waiting++;
 
-       if (state == NEXT)
+       if (state == IO_NEXT)
                num_next++;
-       else if (state == FINISHED)
+       else if (state == IO_FINISHED)
                num_finished++;
 
        conn->state = state;
@@ -160,7 +146,7 @@ static void accept_conn(struct io_listener *l)
        /* FIXME: What to do here? */
        if (fd < 0)
                return;
-       c = io_new_conn(fd, l->fd.next, l->fd.finish, l->fd.next_arg);
+       c = io_new_conn(fd, l->next, l->finish, l->conn_arg);
        if (!c) {
                close(fd);
                return;
@@ -183,14 +169,12 @@ static void finish_and_next(bool finished_only)
                        continue;
                c = (void *)fds[i];
                for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
-                       if (c->state == FINISHED) {
+                       if (c->state == IO_FINISHED) {
                                del_conn(c);
                                free(c);
                                i--;
-                       } else if (!finished_only && c->state == NEXT) {
-                               backend_set_state(c,
-                                                 c->fd.next(c,
-                                                            c->fd.next_arg));
+                       } else if (!finished_only && c->state == IO_NEXT) {
+                               backend_set_state(c, c->next(c, c->next_arg));
                                num_next--;
                        }
                }
@@ -282,7 +266,7 @@ void *io_loop(void)
                        } else if (events & (POLLIN|POLLOUT)) {
                                r--;
                                if (c->duplex) {
-                                       int mask = pollmask(c->duplex->state);
+                                       int mask = c->duplex->pollflag;
                                        if (events & mask) {
                                                ready(c->duplex);
                                                events &= ~mask;