X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=352afe33e87638ed638729f7e56f91f37ea1db71;hp=8d43922351d51ba131e4c087b600bbdc013993c0;hb=3a7b8a8a8081ebbb6457527de376dec6264bc381;hpb=d0458a433876acc01b48f74c1c3b966bbc29de57

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 8d439223..352afe33 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)
@@ -39,10 +78,7 @@ void io_close_listener(struct io_listener *l)
 	free(l);
 }
 
-struct io_conn *io_new_conn_(int fd,
-			     struct io_plan plan,
-			     void (*finish)(struct io_conn *, void *),
-			     void *arg)
+struct io_conn *io_new_conn_(int fd, struct io_plan plan)
 {
 	struct io_conn *conn = malloc(sizeof(*conn));
 
@@ -52,8 +88,8 @@ struct io_conn *io_new_conn_(int fd,
 	conn->fd.listener = false;
 	conn->fd.fd = fd;
 	conn->plan = plan;
-	conn->finish = finish;
-	conn->finish_arg = arg;
+	conn->finish = NULL;
+	conn->finish_arg = NULL;
 	conn->duplex = NULL;
 	conn->timeout = NULL;
 	if (!add_conn(conn)) {
@@ -63,10 +99,15 @@ struct io_conn *io_new_conn_(int fd,
 	return conn;
 }
 
-struct io_conn *io_duplex_(struct io_conn *old,
-			   struct io_plan plan,
-			   void (*finish)(struct io_conn *, void *),
-			   void *arg)
+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_conn *io_duplex_(struct io_conn *old, struct io_plan plan)
 {
 	struct io_conn *conn;
 
@@ -80,8 +121,8 @@ struct io_conn *io_duplex_(struct io_conn *old,
 	conn->fd.fd = old->fd.fd;
 	conn->plan = plan;
 	conn->duplex = old;
-	conn->finish = finish;
-	conn->finish_arg = arg;
+	conn->finish = NULL;
+	conn->finish_arg = NULL;
 	conn->timeout = NULL;
 	if (!add_duplex(conn)) {
 		free(conn);
@@ -110,14 +151,11 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
 }
 
 /* Returns true if we're finished. */
-static bool do_write(int fd, struct io_plan *plan)
+static int 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;
-	}
+	if (ret < 0)
+		return -1;
 
 	plan->u.write.buf += ret;
 	plan->u.write.len -= ret;
@@ -138,17 +176,16 @@ struct io_plan io_write_(const void *data, size_t len,
 	plan.next = cb;
 	plan.next_arg = arg;
 	plan.pollflag = POLLOUT;
+
+	io_plan_debug(&plan);
 	return plan;
 }
 
-static bool do_read(int fd, struct io_plan *plan)
+static int do_read(int fd, struct io_plan *plan)
 {
 	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;
-	}
+	if (ret <= 0)
+		return -1;
 
 	plan->u.read.buf += ret;
 	plan->u.read.len -= ret;
@@ -169,20 +206,19 @@ struct io_plan io_read_(void *data, size_t len,
 	plan.next = cb;
 	plan.next_arg = arg;
 	plan.pollflag = POLLIN;
+
+	io_plan_debug(&plan);
 	return plan;
 }
 
-static bool do_read_partial(int fd, struct io_plan *plan)
+static int 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;
-	}
+	if (ret <= 0)
+		return -1;
 
 	*plan->u.readpart.lenp = ret;
-	return true;
+	return 1;
 }
 
 /* Queue a partial request to read into a buffer. */
@@ -200,20 +236,18 @@ struct io_plan io_read_partial_(void *data, size_t *len,
 	plan.next_arg = arg;
 	plan.pollflag = POLLIN;
 
+	io_plan_debug(&plan);
 	return plan;
 }
 
-static bool do_write_partial(int fd, struct io_plan *plan)
+static int 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;
-	}
+	if (ret < 0)
+		return -1;
 
 	*plan->u.writepart.lenp = ret;
-	return true;
+	return 1;
 }
 
 /* Queue a partial write request. */
@@ -231,6 +265,7 @@ struct io_plan io_write_partial_(const void *data, size_t *len,
 	plan.next_arg = arg;
 	plan.pollflag = POLLOUT;
 
+	io_plan_debug(&plan);
 	return plan;
 }
 
@@ -240,13 +275,14 @@ struct io_plan io_idle(void)
 
 	plan.pollflag = 0;
 	plan.io = NULL;
-	/* Never called (overridded by io_wake), but NULL means closing */
-	plan.next = io_close;
+	/* Never called (overridden by io_wake), but NULL means closing */
+	plan.next = (void *)io_idle;
 
+	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 be closing, but we haven't called its finish() yet. */
@@ -256,21 +292,33 @@ void io_wake(struct io_conn *conn, struct io_plan plan)
 	assert(!conn->plan.io);
 	conn->plan = plan;
 	backend_plan_changed(conn);
+
+	debug_io_wake(conn);
 }
 
 void io_ready(struct io_conn *conn)
 {
-	if (conn->plan.io(conn->fd.fd, &conn->plan)) {
+	switch (conn->plan.io(conn->fd.fd, &conn->plan)) {
+	case -1: /* Failure means a new plan: close up. */
+		set_current(conn);
+		conn->plan = io_close();
+		backend_plan_changed(conn);
+		set_current(NULL);
+		break;
+	case 0: /* Keep going with plan. */
+		break;
+	case 1: /* Done: get next 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);
 	}
 }
 
-/* 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(void)
 {
 	struct io_plan plan;
 
@@ -278,11 +326,17 @@ struct io_plan io_close(struct io_conn *conn, void *arg)
 	/* This means we're closing. */
 	plan.next = NULL;
 
+	io_plan_debug(&plan);
 	return plan;
 }
 
+struct io_plan io_close_cb(struct io_conn *conn, void *arg)
+{
+	return io_close();
+}
+
 /* 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;