fds[num_fds] = fd;
fd->backend_info = num_fds;
num_fds++;
+ if (events)
+ num_waiting++;
+
return true;
}
assert(n != -1);
assert(n < num_fds);
+ if (pollfds[n].events)
+ num_waiting--;
if (n != num_fds - 1) {
/* Move last one over us. */
pollfds[n] = pollfds[num_fds-1];
{
if (!add_fd(&l->fd, POLLIN))
return false;
- num_waiting++;
return true;
}
+static void adjust_counts(enum io_state state)
+{
+ if (state == IO_NEXT)
+ num_next++;
+ else if (state == IO_FINISHED)
+ num_finished++;
+}
+
+static void update_pollevents(struct io_conn *conn)
+{
+ struct pollfd *pfd = &pollfds[conn->fd.backend_info];
+
+ if (pfd->events)
+ num_waiting--;
+
+ pfd->events = conn->plan.pollflag;
+ if (conn->duplex) {
+ int mask = conn->duplex->plan.pollflag;
+ /* You can't *both* read/write. */
+ assert(!mask || pfd->events != mask);
+ pfd->events |= mask;
+ }
+ if (pfd->events)
+ num_waiting++;
+
+ adjust_counts(conn->plan.state);
+}
+
bool add_conn(struct io_conn *c)
{
- if (!add_fd(&c->fd, 0))
+ if (!add_fd(&c->fd, c->plan.pollflag))
return false;
- num_next++;
+ adjust_counts(c->plan.state);
return true;
}
bool add_duplex(struct io_conn *c)
{
c->fd.backend_info = c->duplex->fd.backend_info;
- num_next++;
+ update_pollevents(c);
return true;
}
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);
conn->duplex->duplex = NULL;
} else
del_fd(&conn->fd);
- if (conn->state == FINISHED)
+ if (conn->plan.state == IO_FINISHED)
num_finished--;
- else if (conn->state == NEXT)
+ else if (conn->plan.state == IO_NEXT)
num_next--;
}
del_fd(&l->fd);
}
-static int pollmask(enum io_state state)
+static 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;
- }
+ conn->plan = plan;
+ update_pollevents(conn);
}
-void backend_set_state(struct io_conn *conn, struct io_op *op)
+void backend_wakeup(struct io_conn *conn)
{
- 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);
- /* You can't *both* read/write. */
- assert(!mask || pfd->events != mask);
- pfd->events |= mask;
- }
- if (pfd->events)
- num_waiting++;
-
- if (state == NEXT)
- num_next++;
- else if (state == FINISHED)
- num_finished++;
-
- conn->state = state;
+ update_pollevents(conn);
}
static void accept_conn(struct io_listener *l)
{
- struct io_conn *c;
int fd = accept(l->fd.fd, NULL, NULL);
/* FIXME: What to do here? */
if (fd < 0)
return;
- c = io_new_conn(fd, l->fd.next, l->fd.finish, l->fd.next_arg);
- if (!c) {
- close(fd);
- return;
- }
+ l->init(fd, l->arg);
}
/* It's OK to miss some, as long as we make progress. */
continue;
c = (void *)fds[i];
for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
- if (c->state == FINISHED) {
+ if (c->plan.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->plan.state == IO_NEXT) {
+ backend_set_state(c, c->plan.next(c, c->plan.next_arg));
num_next--;
}
}
} else if (events & (POLLIN|POLLOUT)) {
r--;
if (c->duplex) {
- int mask = pollmask(c->duplex->state);
+ int mask = c->duplex->plan.pollflag;
if (events & mask) {
ready(c->duplex);
events &= ~mask;