X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=2832c513466f646cdca3c8d8ad7857f5175bb791;hp=6efc68ee732c15ab99d00104e2f6adb6ef0b5f71;hb=6109a0a6140acbbfe5e998f7d7ea1215f035cb90;hpb=a2dffefa5ef8d0cf71d99755c4640a8004679b1d

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 6efc68ee..2832c513 100644
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -1,4 +1,4 @@
-/* Licensed under BSD-MIT - see LICENSE file for details */
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #include "io.h"
 #include "backend.h"
 #include <sys/types.h>
@@ -8,29 +8,27 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 void *io_loop_return;
 
-struct io_listener *io_new_listener_(int fd,
-				     struct io_op *(*start)(struct io_conn *,
-							    void *arg),
-				     void (*finish)(struct io_conn *, void *),
+struct io_listener *io_new_listener_(const tal_t *ctx, int fd,
+				     struct io_plan *(*init)(struct io_conn *,
+							     void *),
 				     void *arg)
 {
-	struct io_listener *l = malloc(sizeof(*l));
-
+	struct io_listener *l = tal(ctx, struct io_listener);
 	if (!l)
 		return NULL;
 
 	l->fd.listener = true;
 	l->fd.fd = fd;
-	l->fd.next = start;
-	l->fd.finish = finish;
-	l->fd.finish_arg = l->fd.next_arg = arg;
-	if (!add_listener(l)) {
-		free(l);
-		return NULL;
-	}
+	l->init = init;
+	l->arg = arg;
+	l->ctx = ctx;
+	if (!add_listener(l))
+		return tal_free(l);
 	return l;
 }
 
@@ -38,205 +36,404 @@ void io_close_listener(struct io_listener *l)
 {
 	close(l->fd.fd);
 	del_listener(l);
-	free(l);
+	tal_free(l);
 }
 
-struct io_conn *io_new_conn_(int fd,
-			     struct io_op *(*start)(struct io_conn *, void *),
-			     void (*finish)(struct io_conn *, void *),
-			     void *arg)
+static struct io_plan *io_never_called(struct io_conn *conn, void *arg)
 {
-	struct io_conn *conn = malloc(sizeof(*conn));
+	abort();
+}
 
-	if (!conn)
-		return NULL;
+static void next_plan(struct io_conn *conn, struct io_plan *plan)
+{
+	struct io_plan *(*next)(struct io_conn *, void *arg);
 
-	conn->fd.listener = false;
-	conn->fd.fd = fd;
-	conn->fd.next = start;
-	conn->fd.finish = finish;
-	conn->fd.finish_arg = conn->fd.next_arg = arg;
-	conn->state = NEXT;
-	conn->duplex = NULL;
-	if (!add_conn(conn)) {
-		free(conn);
-		return NULL;
-	}
-	return conn;
+	next = plan->next;
+
+	plan->status = IO_UNSET;
+	plan->io = NULL;
+	plan->next = io_never_called;
+
+	plan = next(conn, plan->next_arg);
+
+	/* It should have set a plan inside this conn. */
+	assert(plan == &conn->plan[IO_IN]
+	       || plan == &conn->plan[IO_OUT]);
+	assert(conn->plan[IO_IN].status != IO_UNSET
+	       || conn->plan[IO_OUT].status != IO_UNSET);
+
+	backend_new_plan(conn);
 }
 
-struct io_conn *io_duplex_(struct io_conn *old,
-			     struct io_op *(*start)(struct io_conn *, void *),
-			     void (*finish)(struct io_conn *, void *),
+struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
+			     struct io_plan *(*init)(struct io_conn *, void *),
 			     void *arg)
 {
-	struct io_conn *conn;
+	struct io_conn *conn = tal(ctx, struct io_conn);
 
-	assert(!old->duplex);
-
-	conn = malloc(sizeof(*conn));
 	if (!conn)
 		return NULL;
 
 	conn->fd.listener = false;
-	conn->fd.fd = old->fd.fd;
-	conn->fd.next = start;
-	conn->fd.finish = finish;
-	conn->fd.finish_arg = conn->fd.next_arg = arg;
-	conn->state = NEXT;
-	conn->duplex = old;
-	if (!add_duplex(conn)) {
-		free(conn);
-		return NULL;
-	}
-	old->duplex = conn;
+	conn->fd.fd = fd;
+	conn->finish = NULL;
+	conn->finish_arg = NULL;
+	conn->list = NULL;
+
+	if (!add_conn(conn))
+		return tal_free(conn);
+
+	/* We start with out doing nothing, and in doing our init. */
+	conn->plan[IO_OUT].status = IO_UNSET;
+
+	conn->plan[IO_IN].next = init;
+	conn->plan[IO_IN].next_arg = arg;
+	next_plan(conn, &conn->plan[IO_IN]);
+
 	return conn;
 }
 
-/* Convenient token which only we can produce. */
-static inline struct io_next *to_ionext(struct io_conn *conn)
+void io_set_finish_(struct io_conn *conn,
+		    void (*finish)(struct io_conn *, void *),
+		    void *arg)
+{
+	conn->finish = finish;
+	conn->finish_arg = arg;
+}
+
+struct io_plan *io_get_plan(struct io_conn *conn, enum io_direction dir)
 {
-	return (struct io_next *)conn;
+	assert(conn->plan[dir].status == IO_UNSET);
+
+	conn->plan[dir].status = IO_POLLING;
+	return &conn->plan[dir];
 }
 
-static inline struct io_op *to_ioop(enum io_state state)
+static struct io_plan *set_always(struct io_conn *conn,
+				  struct io_plan *plan,
+				  struct io_plan *(*next)(struct io_conn *,
+							  void *),
+				  void *arg)
 {
-	return (struct io_op *)(long)state;
+	plan->next = next;
+	plan->next_arg = arg;
+	plan->status = IO_ALWAYS;
+
+	backend_new_always(conn);
+	return plan;
 }
 
-static inline struct io_conn *from_ionext(struct io_next *next)
+struct io_plan *io_always_(struct io_conn *conn,
+			   struct io_plan *(*next)(struct io_conn *, void *),
+			   void *arg)
 {
-	return (struct io_conn *)next;
+	struct io_plan *plan;
+
+	/* If we're duplex, we want this on the current plan.  Otherwise,
+	 * doesn't matter. */
+	if (conn->plan[IO_IN].status == IO_UNSET)
+		plan = io_get_plan(conn, IO_IN);
+	else
+		plan = io_get_plan(conn, IO_OUT);
+
+	assert(next);
+	set_always(conn, plan, next, arg);
+
+	return plan;
 }
 
-struct io_next *io_next_(struct io_conn *conn,
-			 struct io_op *(*next)(struct io_conn *, void *),
-			 void *arg)
+static int do_write(int fd, struct io_plan *plan)
 {
-	conn->fd.next = next;
-	conn->fd.next_arg = arg;
+	ssize_t ret = write(fd, plan->u1.cp, plan->u2.s);
+	if (ret < 0)
+		return -1;
 
-	return to_ionext(conn);
+	plan->u1.cp += ret;
+	plan->u2.s -= ret;
+	return plan->u2.s == 0;
 }
 
 /* Queue some data to be written. */
-struct io_op *io_write(const void *data, size_t len, struct io_next *next)
+struct io_plan *io_write_(struct io_conn *conn, const void *data, size_t len,
+			  struct io_plan *(*next)(struct io_conn *, void *),
+			  void *arg)
+{
+	struct io_plan *plan = io_get_plan(conn, IO_OUT);
+
+	assert(next);
+
+	if (len == 0)
+		return set_always(conn, plan, next, arg);
+
+	plan->u1.const_vp = data;
+	plan->u2.s = len;
+	plan->io = do_write;
+	plan->next = next;
+	plan->next_arg = arg;
+
+	return plan;
+}
+
+static int do_read(int fd, struct io_plan *plan)
 {
-	struct io_conn *conn = from_ionext(next);
-	conn->u.write.buf = data;
-	conn->u.write.len = len;
-	return to_ioop(WRITE);
+	ssize_t ret = read(fd, plan->u1.cp, plan->u2.s);
+	if (ret <= 0)
+		return -1;
+
+	plan->u1.cp += ret;
+	plan->u2.s -= ret;
+	return plan->u2.s == 0;
 }
 
 /* Queue a request to read into a buffer. */
-struct io_op *io_read(void *data, size_t len, struct io_next *next)
+struct io_plan *io_read_(struct io_conn *conn,
+			 void *data, size_t len,
+			 struct io_plan *(*next)(struct io_conn *, void *),
+			 void *arg)
 {
-	struct io_conn *conn = from_ionext(next);
-	conn->u.read.buf = data;
-	conn->u.read.len = len;
-	return to_ioop(READ);
+	struct io_plan *plan = io_get_plan(conn, IO_IN);
+
+	assert(next);
+
+	if (len == 0)
+		return set_always(conn, plan, next, arg);
+
+	plan->u1.cp = data;
+	plan->u2.s = len;
+	plan->io = do_read;
+	plan->next = next;
+	plan->next_arg = arg;
+
+	return plan;
+}
+
+static int do_read_partial(int fd, struct io_plan *plan)
+{
+	ssize_t ret = read(fd, plan->u1.cp, *(size_t *)plan->u2.vp);
+	if (ret <= 0)
+		return -1;
+
+	*(size_t *)plan->u2.vp = ret;
+	return 1;
 }
 
 /* Queue a partial request to read into a buffer. */
-struct io_op *io_read_partial(void *data, size_t *len, struct io_next *next)
+struct io_plan *io_read_partial_(struct io_conn *conn,
+				 void *data, size_t maxlen, size_t *len,
+				 struct io_plan *(*next)(struct io_conn *,
+							 void *),
+				 void *arg)
 {
-	struct io_conn *conn = from_ionext(next);
-	conn->u.readpart.buf = data;
-	conn->u.readpart.lenp = len;
-	return to_ioop(READPART);
+	struct io_plan *plan = io_get_plan(conn, IO_IN);
+
+	assert(next);
+
+	if (maxlen == 0)
+		return set_always(conn, plan, next, arg);
+
+	plan->u1.cp = data;
+	/* We store the max len in here temporarily. */
+	*len = maxlen;
+	plan->u2.vp = len;
+	plan->io = do_read_partial;
+	plan->next = next;
+	plan->next_arg = arg;
+
+	return plan;
+}
+
+static int do_write_partial(int fd, struct io_plan *plan)
+{
+	ssize_t ret = write(fd, plan->u1.cp, *(size_t *)plan->u2.vp);
+	if (ret < 0)
+		return -1;
+
+	*(size_t *)plan->u2.vp = ret;
+	return 1;
 }
 
 /* Queue a partial write request. */
-struct io_op *io_write_partial(const void *data, size_t *len, struct io_next *next)
+struct io_plan *io_write_partial_(struct io_conn *conn,
+				  const void *data, size_t maxlen, size_t *len,
+				  struct io_plan *(*next)(struct io_conn *,
+							  void*),
+				  void *arg)
 {
-	struct io_conn *conn = from_ionext(next);
-	conn->u.writepart.buf = data;
-	conn->u.writepart.lenp = len;
-	return to_ioop(WRITEPART);
+	struct io_plan *plan = io_get_plan(conn, IO_OUT);
+
+	assert(next);
+
+	if (maxlen == 0)
+		return set_always(conn, plan, next, arg);
+
+	plan->u1.const_vp = data;
+	/* We store the max len in here temporarily. */
+	*len = maxlen;
+	plan->u2.vp = len;
+	plan->io = do_write_partial;
+	plan->next = next;
+	plan->next_arg = arg;
+
+	return plan;
 }
 
-struct io_op *io_idle(struct io_conn *conn)
+static int do_connect(int fd, struct io_plan *plan)
 {
-	return to_ioop(IDLE);
+	int err, ret;
+	socklen_t len = sizeof(err);
+
+	/* Has async connect finished? */
+	ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len);
+	if (ret < 0)
+		return -1;
+
+	if (err == 0) {
+		/* Restore blocking if it was initially. */
+		fcntl(fd, F_SETFL, plan->u1.s);
+		return 1;
+	} else if (err == EINPROGRESS)
+		return 0;
+
+	errno = err;
+	return -1;
 }
 
-void io_wake_(struct io_conn *conn,
-	      struct io_op *(*next)(struct io_conn *, void *), void *arg)
+struct io_plan *io_connect_(struct io_conn *conn, const struct addrinfo *addr,
+			    struct io_plan *(*next)(struct io_conn *, void *),
+			    void *arg)
+{
+	struct io_plan *plan = io_get_plan(conn, IO_IN);
+	int fd = io_conn_fd(conn);
+
+	assert(next);
+
+	/* Save old flags, set nonblock if not already. */
+	plan->u1.s = fcntl(fd, F_GETFL);
+	fcntl(fd, F_SETFL, plan->u1.s | O_NONBLOCK);
+
+	/* Immediate connect can happen. */
+	if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0)
+		return set_always(conn, plan, next, arg);
+
+	if (errno != EINPROGRESS)
+		return io_close(conn);
+
+	plan->next = next;
+	plan->next_arg = arg;
+	plan->io = do_connect;
 
+	return plan;
+}
+
+struct io_plan *io_wait_(struct io_conn *conn,
+			 const void *wait,
+			 struct io_plan *(*next)(struct io_conn *, void *),
+			 void *arg)
 {
-	/* It might have finished, but we haven't called its finish() yet. */
-	if (conn->state == FINISHED)
-		return;
-	assert(conn->state == IDLE);
-	conn->fd.next = next;
-	conn->fd.next_arg = arg;
-	backend_set_state(conn, to_ioop(NEXT));
+	struct io_plan *plan;
+
+	/* If we're duplex, we want this on the current plan.  Otherwise,
+	 * doesn't matter. */
+	if (conn->plan[IO_IN].status == IO_UNSET)
+		plan = io_get_plan(conn, IO_IN);
+	else
+		plan = io_get_plan(conn, IO_OUT);
+
+	assert(next);
+
+	plan->next = next;
+	plan->next_arg = arg;
+	plan->u1.const_vp = wait;
+	plan->status = IO_WAITING;
+
+	return plan;
 }
 
-static struct io_op *do_next(struct io_conn *conn)
+void io_wake(const void *wait)
 {
-	return conn->fd.next(conn, conn->fd.next_arg);
+	backend_wake(wait);
 }
 
-struct io_op *do_ready(struct io_conn *conn)
+static void do_plan(struct io_conn *conn, struct io_plan *plan)
 {
-	ssize_t ret;
-	bool finished;
+	/* Someone else might have called io_close() on us. */
+	if (plan->status == IO_CLOSING)
+		return;
 
-	switch (conn->state) {
-	case WRITE:
-		ret = write(conn->fd.fd, conn->u.write.buf, conn->u.write.len);
-		if (ret < 0)
-			return io_close(conn, NULL);
-		conn->u.write.buf += ret;
-		conn->u.write.len -= ret;
-		finished = (conn->u.write.len == 0);
-		break;
-	case WRITEPART:
-		ret = write(conn->fd.fd, conn->u.writepart.buf,
-			    *conn->u.writepart.lenp);
-		if (ret < 0)
-			return io_close(conn, NULL);
-		*conn->u.writepart.lenp = ret;
-		finished = true;
+	/* We shouldn't have polled for this event if this wasn't true! */
+	assert(plan->status == IO_POLLING);
+
+	switch (plan->io(conn->fd.fd, plan)) {
+	case -1:
+		io_close(conn);
 		break;
-	case READ:
-		ret = read(conn->fd.fd, conn->u.read.buf, conn->u.read.len);
-		if (ret <= 0)
-			return io_close(conn, NULL);
-		conn->u.read.buf += ret;
-		conn->u.read.len -= ret;
-		finished = (conn->u.read.len == 0);
+	case 0:
 		break;
-	case READPART:
-		ret = read(conn->fd.fd, conn->u.readpart.buf,
-			    *conn->u.readpart.lenp);
-		if (ret <= 0)
-			return io_close(conn, NULL);
-		*conn->u.readpart.lenp = ret;
-		finished = true;
+	case 1:
+		next_plan(conn, plan);
 		break;
 	default:
-		/* Shouldn't happen. */
+		/* IO should only return -1, 0 or 1 */
 		abort();
 	}
+}
 
-	if (finished)
-		return do_next(conn);
-	return to_ioop(conn->state);
+void io_ready(struct io_conn *conn, int pollflags)
+{
+	if (pollflags & POLLIN)
+		do_plan(conn, &conn->plan[IO_IN]);
+
+	if (pollflags & POLLOUT)
+		do_plan(conn, &conn->plan[IO_OUT]);
+}
+
+void io_do_always(struct io_conn *conn)
+{
+	if (conn->plan[IO_IN].status == IO_ALWAYS)
+		next_plan(conn, &conn->plan[IO_IN]);
+
+	if (conn->plan[IO_OUT].status == IO_ALWAYS)
+		next_plan(conn, &conn->plan[IO_OUT]);
+}
+
+void io_do_wakeup(struct io_conn *conn, struct io_plan *plan)
+{
+	assert(plan->status == IO_WAITING);
+	next_plan(conn, plan);
 }
 
-/* Useful next functions. */
 /* Close the connection, we're done. */
-struct io_op *io_close(struct io_conn *conn, void *arg)
+struct io_plan *io_close(struct io_conn *conn)
+{
+	/* Already closing?  Don't close twice. */
+	if (conn->plan[IO_IN].status == IO_CLOSING)
+		return &conn->plan[IO_IN];
+
+	conn->plan[IO_IN].status = conn->plan[IO_OUT].status = IO_CLOSING;
+	conn->plan[IO_IN].u1.s = errno;
+	backend_new_closing(conn);
+
+	return &conn->plan[IO_IN];
+}
+
+struct io_plan *io_close_cb(struct io_conn *conn, void *arg)
 {
-	return to_ioop(FINISHED);
+	return io_close(conn);
 }
 
 /* Exit the loop, returning this (non-NULL) arg. */
-struct io_op *io_break(void *arg, struct io_next *next)
+void io_break(const void *ret)
+{
+	assert(ret);
+	io_loop_return = (void *)ret;
+}
+
+struct io_plan *io_never(struct io_conn *conn)
 {
-	io_loop_return = arg;
+	return io_always(conn, io_never_called, NULL);
+}
 
-	return to_ioop(NEXT);
+int io_conn_fd(const struct io_conn *conn)
+{
+	return conn->fd.fd;
 }