X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=c19b25efe8d12acbe6c5ecc669d01ff54c4801c2;hp=150f7269a4428b9890319481dfb93532971304ba;hb=cef578da77d657701616161f3c3bf826186a024e;hpb=174fe59fdce127808420986f56987205ecab2858

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 150f7269..c19b25ef 100644
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -13,9 +13,7 @@
 void *io_loop_return;
 
 struct io_listener *io_new_listener_(int fd,
-				     struct io_plan *(*start)(struct io_conn *,
-							      void *arg),
-				     void (*finish)(struct io_conn *, void *),
+				     void (*init)(int fd, void *arg),
 				     void *arg)
 {
 	struct io_listener *l = malloc(sizeof(*l));
@@ -25,9 +23,8 @@ struct io_listener *io_new_listener_(int fd,
 
 	l->fd.listener = true;
 	l->fd.fd = fd;
-	l->next = start;
-	l->finish = finish;
-	l->conn_arg = arg;
+	l->init = init;
+	l->arg = arg;
 	if (!add_listener(l)) {
 		free(l);
 		return NULL;
@@ -43,7 +40,7 @@ void io_close_listener(struct io_listener *l)
 }
 
 struct io_conn *io_new_conn_(int fd,
-			     struct io_plan *(*start)(struct io_conn *, void *),
+			     struct io_plan plan,
 			     void (*finish)(struct io_conn *, void *),
 			     void *arg)
 {
@@ -54,11 +51,9 @@ struct io_conn *io_new_conn_(int fd,
 
 	conn->fd.listener = false;
 	conn->fd.fd = fd;
-	conn->next = start;
+	conn->plan = plan;
 	conn->finish = finish;
-	conn->finish_arg = conn->next_arg = arg;
-	conn->pollflag = 0;
-	conn->state = NEXT;
+	conn->finish_arg = arg;
 	conn->duplex = NULL;
 	conn->timeout = NULL;
 	if (!add_conn(conn)) {
@@ -69,9 +64,9 @@ struct io_conn *io_new_conn_(int fd,
 }
 
 struct io_conn *io_duplex_(struct io_conn *old,
-			     struct io_plan *(*start)(struct io_conn *, void *),
-			     void (*finish)(struct io_conn *, void *),
-			     void *arg)
+			   struct io_plan plan,
+			   void (*finish)(struct io_conn *, void *),
+			   void *arg)
 {
 	struct io_conn *conn;
 
@@ -83,12 +78,10 @@ struct io_conn *io_duplex_(struct io_conn *old,
 
 	conn->fd.listener = false;
 	conn->fd.fd = old->fd.fd;
-	conn->next = start;
-	conn->finish = finish;
-	conn->finish_arg = conn->next_arg = arg;
-	conn->pollflag = 0;
-	conn->state = NEXT;
+	conn->plan = plan;
 	conn->duplex = old;
+	conn->finish = finish;
+	conn->finish_arg = arg;
 	conn->timeout = NULL;
 	if (!add_duplex(conn)) {
 		free(conn);
@@ -98,14 +91,11 @@ struct io_conn *io_duplex_(struct io_conn *old,
 	return conn;
 }
 
-static inline struct io_plan *to_ioplan(enum io_state state)
-{
-	return (struct io_plan *)(long)state;
-}
-
 bool io_timeout_(struct io_conn *conn, struct timespec ts,
-		 struct io_plan *(*cb)(struct io_conn *, void *), void *arg)
+		 struct io_plan (*cb)(struct io_conn *, void *), void *arg)
 {
+	assert(cb);
+
 	if (!conn->timeout) {
 		conn->timeout = malloc(sizeof(*conn->timeout));
 		if (!conn->timeout)
@@ -119,148 +109,188 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
 	return true;
 }
 
+/* Returns true if we're finished. */
+static bool do_write(int fd, struct io_plan *plan)
+{
+	ssize_t ret = write(fd, plan->u.write.buf, plan->u.write.len);
+	if (ret < 0) {
+		/* Override next function to close us. */
+		plan->next = io_close;
+		return true;
+	}
+
+	plan->u.write.buf += ret;
+	plan->u.write.len -= ret;
+	return (plan->u.write.len == 0);
+}
+
 /* Queue some data to be written. */
-struct io_plan *io_write_(struct io_conn *conn, const void *data, size_t len,
-			  struct io_plan *(*cb)(struct io_conn *, void *),
-			  void *arg)
+struct io_plan io_write_(const void *data, size_t len,
+			 struct io_plan (*cb)(struct io_conn *, void *),
+			 void *arg)
+{
+	struct io_plan plan;
+
+	assert(cb);
+	plan.u.write.buf = data;
+	plan.u.write.len = len;
+	plan.io = do_write;
+	plan.next = cb;
+	plan.next_arg = arg;
+	plan.pollflag = POLLOUT;
+	return plan;
+}
+
+static bool do_read(int fd, struct io_plan *plan)
 {
-	conn->u.write.buf = data;
-	conn->u.write.len = len;
-	conn->next = cb;
-	conn->next_arg = arg;
-	conn->pollflag = POLLOUT;
-	return to_ioplan(WRITE);
+	ssize_t ret = read(fd, plan->u.read.buf, plan->u.read.len);
+	if (ret <= 0) {
+		/* Override next function to close us. */
+		plan->next = io_close;
+		return true;
+	}
+
+	plan->u.read.buf += ret;
+	plan->u.read.len -= ret;
+	return (plan->u.read.len == 0);
 }
 
 /* Queue a request to read into a buffer. */
-struct io_plan *io_read_(struct io_conn *conn, void *data, size_t len,
-			 struct io_plan *(*cb)(struct io_conn *, void *),
-			 void *arg)
+struct io_plan io_read_(void *data, size_t len,
+			struct io_plan (*cb)(struct io_conn *, void *),
+			void *arg)
 {
-	conn->u.read.buf = data;
-	conn->u.read.len = len;
-	conn->next = cb;
-	conn->next_arg = arg;
-	conn->pollflag = POLLIN;
-	return to_ioplan(READ);
+	struct io_plan plan;
+
+	assert(cb);
+	plan.u.read.buf = data;
+	plan.u.read.len = len;
+	plan.io = do_read;
+	plan.next = cb;
+	plan.next_arg = arg;
+	plan.pollflag = POLLIN;
+	return plan;
+}
+
+static bool do_read_partial(int fd, struct io_plan *plan)
+{
+	ssize_t ret = read(fd, plan->u.readpart.buf, *plan->u.readpart.lenp);
+	if (ret <= 0) {
+		/* Override next function to close us. */
+		plan->next = io_close;
+		return true;
+	}
+
+	*plan->u.readpart.lenp = ret;
+	return true;
 }
 
 /* Queue a partial request to read into a buffer. */
-struct io_plan *io_read_partial_(struct io_conn *conn, void *data, size_t *len,
-				 struct io_plan *(*cb)(struct io_conn *, void *),
-				 void *arg)
+struct io_plan io_read_partial_(void *data, size_t *len,
+				struct io_plan (*cb)(struct io_conn *, void *),
+				void *arg)
 {
-	conn->u.readpart.buf = data;
-	conn->u.readpart.lenp = len;
-	conn->next = cb;
-	conn->next_arg = arg;
-	conn->pollflag = POLLIN;
-	return to_ioplan(READPART);
+	struct io_plan plan;
+
+	assert(cb);
+	plan.u.readpart.buf = data;
+	plan.u.readpart.lenp = len;
+	plan.io = do_read_partial;
+	plan.next = cb;
+	plan.next_arg = arg;
+	plan.pollflag = POLLIN;
+
+	return plan;
+}
+
+static bool do_write_partial(int fd, struct io_plan *plan)
+{
+	ssize_t ret = write(fd, plan->u.writepart.buf, *plan->u.writepart.lenp);
+	if (ret < 0) {
+		/* Override next function to close us. */
+		plan->next = io_close;
+		return true;
+	}
+
+	*plan->u.writepart.lenp = ret;
+	return true;
 }
 
 /* Queue a partial write request. */
-struct io_plan *io_write_partial_(struct io_conn *conn,
-				  const void *data, size_t *len,
-				  struct io_plan *(*cb)(struct io_conn*, void *),
-				  void *arg)
+struct io_plan io_write_partial_(const void *data, size_t *len,
+				 struct io_plan (*cb)(struct io_conn*, void *),
+				 void *arg)
 {
-	conn->u.writepart.buf = data;
-	conn->u.writepart.lenp = len;
-	conn->next = cb;
-	conn->next_arg = arg;
-	conn->pollflag = POLLOUT;
-	return to_ioplan(WRITEPART);
+	struct io_plan plan;
+
+	assert(cb);
+	plan.u.writepart.buf = data;
+	plan.u.writepart.lenp = len;
+	plan.io = do_write_partial;
+	plan.next = cb;
+	plan.next_arg = arg;
+	plan.pollflag = POLLOUT;
+
+	return plan;
 }
 
-struct io_plan *io_idle(struct io_conn *conn)
+struct io_plan io_idle(void)
 {
-	conn->pollflag = 0;
-	return to_ioplan(IDLE);
+	struct io_plan plan;
+
+	plan.pollflag = 0;
+	plan.io = NULL;
+	/* Never called (overridded by io_wake), but NULL means closing */
+	plan.next = io_close;
+
+	return plan;
 }
 
-void io_wake_(struct io_conn *conn,
-	      struct io_plan *(*fn)(struct io_conn *, void *), void *arg)
+void io_wake(struct io_conn *conn, struct io_plan plan)
 
 {
-	/* It might have finished, but we haven't called its finish() yet. */
-	if (conn->state == FINISHED)
+	/* It might be closing, but we haven't called its finish() yet. */
+	if (!conn->plan.next)
 		return;
-	assert(conn->state == IDLE);
-	conn->next = fn;
-	conn->next_arg = arg;
-	backend_set_state(conn, to_ioplan(NEXT));
+	/* It was idle, right? */
+	assert(!conn->plan.io);
+	conn->plan = plan;
+	backend_wakeup(conn);
 }
 
-static struct io_plan *do_next(struct io_conn *conn)
+static struct io_plan do_next(struct io_conn *conn)
 {
 	if (timeout_active(conn))
 		backend_del_timeout(conn);
-	return conn->next(conn, conn->next_arg);
+	return conn->plan.next(conn, conn->plan.next_arg);
 }
 
-struct io_plan *do_ready(struct io_conn *conn)
+struct io_plan do_ready(struct io_conn *conn)
 {
-	ssize_t ret;
-	bool finished;
-
-	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;
-		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);
-		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;
-		break;
-	default:
-		/* Shouldn't happen. */
-		abort();
-	}
-
-	if (finished)
+	if (conn->plan.io(conn->fd.fd, &conn->plan))
 		return do_next(conn);
-	return to_ioplan(conn->state);
+
+	return conn->plan;
 }
 
 /* Useful next functions. */
 /* Close the connection, we're done. */
-struct io_plan *io_close(struct io_conn *conn, void *arg)
+struct io_plan io_close(struct io_conn *conn, void *arg)
 {
-	return to_ioplan(FINISHED);
+	struct io_plan plan;
+
+	plan.pollflag = 0;
+	/* This means we're closing. */
+	plan.next = NULL;
+
+	return plan;
 }
 
 /* Exit the loop, returning this (non-NULL) arg. */
-struct io_plan *io_break_(struct io_conn *conn, void *ret,
-			  struct io_plan *(*fn)(struct io_conn *, void *),
-			  void *arg)
+struct io_plan io_break(void *ret, struct io_plan plan)
 {
+	assert(ret);
 	io_loop_return = ret;
-	conn->next = fn;
-	conn->next_arg = arg;
 
-	return to_ioplan(NEXT);
+	return plan;
 }