X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=b3c4c760eb445f4ed6c188de08dd7bbad4cd2b22;hp=bd45630a8c9168406a7088f1f12bcfed7f524f54;hb=e2ce04eac30ec613c858bd4cd2ca12e1c464edb8;hpb=57d9d1be33905691ec756b14b066181ca6850ced

diff --git a/ccan/io/io.c b/ccan/io/io.c
index bd45630a..b3c4c760 100644
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -12,6 +12,45 @@
 
 void *io_loop_return;
 
+#ifdef DEBUG
+bool io_plan_for_other;
+struct io_conn *current;
+bool (*io_debug)(struct io_conn *conn);
+bool io_debug_wakeup;
+
+void io_plan_debug(struct io_plan *plan)
+{
+	if (io_plan_for_other) {
+		io_plan_for_other = false;
+		return;
+	}
+
+	if (!io_debug || !current)
+		return;
+
+	if (!io_debug(current) && !io_debug_wakeup)
+		return;
+
+	io_debug_wakeup = false;
+	current->plan = *plan;
+	backend_plan_changed(current);
+
+	/* Call back into the loop immediately. */
+	io_loop_return = io_loop();
+}
+
+static void debug_io_wake(struct io_conn *conn)
+{
+	/* We want linear if we wake a debugged connection, too. */
+	if (io_debug && io_debug(conn))
+		io_debug_wakeup = true;
+}
+#else
+static void debug_io_wake(struct io_conn *conn)
+{
+}
+#endif
+
 struct io_listener *io_new_listener_(int fd,
 				     void (*init)(int fd, void *arg),
 				     void *arg)
@@ -94,6 +133,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)
@@ -107,18 +148,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. */
@@ -128,28 +170,30 @@ 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;
+
+	io_plan_debug(&plan);
 	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. */
@@ -159,24 +203,29 @@ 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;
+
+	io_plan_debug(&plan);
 	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. */
@@ -186,25 +235,29 @@ 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;
 
+	io_plan_debug(&plan);
 	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. */
@@ -214,14 +267,15 @@ 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;
 
+	io_plan_debug(&plan);
 	return plan;
 }
 
@@ -230,41 +284,37 @@ 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;
 
+	io_plan_debug(&plan);
 	return plan;
 }
 
-void io_wake(struct io_conn *conn, struct io_plan plan)
+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);
+	/* It was idle, right? */
+	assert(!conn->plan.io);
 	conn->plan = plan;
-	backend_wakeup(conn);
-}
+	backend_plan_changed(conn);
 
-static struct io_plan do_next(struct io_conn *conn)
-{
-	if (timeout_active(conn))
-		backend_del_timeout(conn);
-	return conn->plan.next(conn, conn->plan.next_arg);
+	debug_io_wake(conn);
 }
 
-struct io_plan do_ready(struct io_conn *conn)
+void io_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:
-		return do_next(conn);
-	case RESULT_AGAIN:
-		return conn->plan;
-	default:
-		abort();
+	if (conn->plan.io(conn->fd.fd, &conn->plan)) {
+		set_current(conn);
+		if (timeout_active(conn))
+			backend_del_timeout(conn);
+		conn->plan = conn->plan.next(conn, conn->plan.next_arg);
+		backend_plan_changed(conn);
+		set_current(NULL);
 	}
 }
 
@@ -274,15 +324,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;
 
+	io_plan_debug(&plan);
 	return plan;
 }
 
 /* Exit the loop, returning this (non-NULL) arg. */
-struct io_plan io_break(void *ret, struct io_plan plan)
+struct io_plan io_break_(void *ret, struct io_plan plan)
 {
+	assert(ret);
 	io_loop_return = ret;
 
 	return plan;