X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=c19b25efe8d12acbe6c5ecc669d01ff54c4801c2;hp=5ea90ea7b03437cd7a7a5e69210a6fc85a8a1363;hb=cef578da77d657701616161f3c3bf826186a024e;hpb=737705f0c2ec60ea5b51ca55299488d86db37b5d

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 5ea90ea7..c19b25ef 100644
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -40,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)
 {
@@ -51,11 +51,9 @@ struct io_conn *io_new_conn_(int fd,
 
 	conn->fd.listener = false;
 	conn->fd.fd = fd;
-	conn->plan.next = start;
+	conn->plan = plan;
 	conn->finish = finish;
-	conn->finish_arg = conn->plan.next_arg = arg;
-	conn->plan.pollflag = 0;
-	conn->plan.state = IO_NEXT;
+	conn->finish_arg = arg;
 	conn->duplex = NULL;
 	conn->timeout = NULL;
 	if (!add_conn(conn)) {
@@ -66,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;
 
@@ -80,12 +78,10 @@ struct io_conn *io_duplex_(struct io_conn *old,
 
 	conn->fd.listener = false;
 	conn->fd.fd = old->fd.fd;
-	conn->plan.next = start;
-	conn->finish = finish;
-	conn->finish_arg = conn->plan.next_arg = arg;
-	conn->plan.pollflag = 0;
-	conn->plan.state = IO_NEXT;
+	conn->plan = plan;
 	conn->duplex = old;
+	conn->finish = finish;
+	conn->finish_arg = arg;
 	conn->timeout = NULL;
 	if (!add_duplex(conn)) {
 		free(conn);
@@ -98,6 +94,8 @@ struct io_conn *io_duplex_(struct io_conn *old,
 bool io_timeout_(struct io_conn *conn, struct timespec ts,
 		 struct io_plan (*cb)(struct io_conn *, void *), void *arg)
 {
+	assert(cb);
+
 	if (!conn->timeout) {
 		conn->timeout = malloc(sizeof(*conn->timeout));
 		if (!conn->timeout)
@@ -111,18 +109,19 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
 	return true;
 }
 
-static enum io_result do_write(struct io_conn *conn)
+/* Returns true if we're finished. */
+static bool do_write(int fd, struct io_plan *plan)
 {
-	ssize_t ret = write(conn->fd.fd, conn->plan.u.write.buf, conn->plan.u.write.len);
-	if (ret < 0)
-		return RESULT_CLOSE;
-
-	conn->plan.u.write.buf += ret;
-	conn->plan.u.write.len -= ret;
-	if (conn->plan.u.write.len == 0)
-		return RESULT_FINISHED;
-	else
-		return RESULT_AGAIN;
+	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. */
@@ -132,28 +131,28 @@ struct io_plan io_write_(const void *data, size_t len,
 {
 	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;
-	plan.state = IO_IO;
 	return plan;
 }
 
-static enum io_result do_read(struct io_conn *conn)
+static bool do_read(int fd, struct io_plan *plan)
 {
-	ssize_t ret = read(conn->fd.fd, conn->plan.u.read.buf,
-			   conn->plan.u.read.len);
-	if (ret <= 0)
-		return RESULT_CLOSE;
-	conn->plan.u.read.buf += ret;
-	conn->plan.u.read.len -= ret;
-	if (conn->plan.u.read.len == 0)
-		return RESULT_FINISHED;
-	else
-		return RESULT_AGAIN;
+	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. */
@@ -163,24 +162,27 @@ struct io_plan io_read_(void *data, size_t len,
 {
 	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;
-	plan.state = IO_IO;
 	return plan;
 }
 
-static enum io_result do_read_partial(struct io_conn *conn)
+static bool do_read_partial(int fd, struct io_plan *plan)
 {
-	ssize_t ret = read(conn->fd.fd, conn->plan.u.readpart.buf,
-			   *conn->plan.u.readpart.lenp);
-	if (ret <= 0)
-		return RESULT_CLOSE;
-	*conn->plan.u.readpart.lenp = ret;
-	return RESULT_FINISHED;
+	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. */
@@ -190,25 +192,28 @@ struct io_plan io_read_partial_(void *data, size_t *len,
 {
 	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;
-	plan.state = IO_IO;
 
 	return plan;
 }
 
-static enum io_result do_write_partial(struct io_conn *conn)
+static bool do_write_partial(int fd, struct io_plan *plan)
 {
-	ssize_t ret = write(conn->fd.fd, conn->plan.u.writepart.buf,
-			    *conn->plan.u.writepart.lenp);
-	if (ret < 0)
-		return RESULT_CLOSE;
-	*conn->plan.u.writepart.lenp = ret;
-	return RESULT_FINISHED;
+	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. */
@@ -218,13 +223,13 @@ struct io_plan io_write_partial_(const void *data, size_t *len,
 {
 	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;
-	plan.state = IO_IO;
 
 	return plan;
 }
@@ -234,23 +239,22 @@ struct io_plan io_idle(void)
 	struct io_plan plan;
 
 	plan.pollflag = 0;
-	plan.state = IO_IDLE;
+	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->plan.state == IO_FINISHED)
+	/* It might be closing, but we haven't called its finish() yet. */
+	if (!conn->plan.next)
 		return;
-	assert(conn->plan.state == IO_IDLE);
-	conn->plan.next = fn;
-	conn->plan.next_arg = arg;
-	conn->plan.pollflag = 0;
-	conn->plan.state = IO_NEXT;
+	/* It was idle, right? */
+	assert(!conn->plan.io);
+	conn->plan = plan;
 	backend_wakeup(conn);
 }
 
@@ -263,17 +267,10 @@ static struct io_plan do_next(struct io_conn *conn)
 
 struct io_plan do_ready(struct io_conn *conn)
 {
-	assert(conn->plan.state == IO_IO);
-	switch (conn->plan.io(conn)) {
-	case RESULT_CLOSE:
-		return io_close(conn, NULL);
-	case RESULT_FINISHED:
+	if (conn->plan.io(conn->fd.fd, &conn->plan))
 		return do_next(conn);
-	case RESULT_AGAIN:
-		return conn->plan;
-	default:
-		abort();
-	}
+
+	return conn->plan;
 }
 
 /* Useful next functions. */
@@ -282,25 +279,18 @@ struct io_plan io_close(struct io_conn *conn, void *arg)
 {
 	struct io_plan plan;
 
-	plan.state = IO_FINISHED;
 	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_(void *ret,
-			 struct io_plan (*fn)(struct io_conn *, void *),
-			 void *arg)
+struct io_plan io_break(void *ret, struct io_plan plan)
 {
-	struct io_plan plan;
-
+	assert(ret);
 	io_loop_return = ret;
 
-	plan.state = IO_NEXT;
-	plan.pollflag = 0;
-	plan.next = fn;
-	plan.next_arg = arg;
-
 	return plan;
 }