X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=76f1f441740476fc52dbf5dc1fc378bc16e16be1;hp=b6ae56acf027a7c0a46b3a2c9027d07d7bd9617b;hb=641b511049e5c03d45ada0c3fd829691b173e5d1;hpb=7bfb7a1cf4f7c5eaf4081ef7128b7fc7d1cf926e

diff --git a/ccan/io/io.c b/ccan/io/io.c
index b6ae56ac..76f1f441 100644
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -9,46 +9,116 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <poll.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 void *io_loop_return;
 
 #ifdef DEBUG
-bool io_plan_for_other;
+/* Set to skip the next plan. */
+bool io_plan_nodebug;
+/* The current connection to apply plan to. */
 struct io_conn *current;
-bool (*io_debug)(struct io_conn *conn);
+/* User-defined function to select which connection(s) to debug. */
+bool (*io_debug_conn)(struct io_conn *conn);
+/* Set when we wake up an connection we are debugging. */
 bool io_debug_wakeup;
 
-void io_plan_debug(struct io_plan *plan)
+struct io_plan io_debug(struct io_plan plan)
 {
-	if (io_plan_for_other) {
-		io_plan_for_other = false;
-		return;
-	}
+	struct io_conn *ready = NULL;
 
-	if (!io_debug || !current)
-		return;
+	if (io_plan_nodebug) {
+		io_plan_nodebug = false;
+		return plan;
+	}
 
-	if (!io_debug(current) && !io_debug_wakeup)
-		return;
+	if (!current || !doing_debug_on(current)) {
+		if (!io_debug_wakeup)
+			return plan;
+	}
 
 	io_debug_wakeup = false;
-	current->plan = *plan;
+	current->plan = plan;
 	backend_plan_changed(current);
 
 	/* Call back into the loop immediately. */
-	io_loop_return = io_loop();
+	io_loop_return = do_io_loop(&ready);
+
+	if (ready) {
+		set_current(ready);
+		if (!ready->plan.next) {
+			/* Call finish function immediately. */
+			if (ready->finish) {
+				errno = ready->plan.u.close.saved_errno;
+				ready->finish(ready, ready->finish_arg);
+				ready->finish = NULL;
+			}
+			backend_del_conn(ready);
+		} else {
+			/* Calls back in itself, via io_debug_io(). */
+			if (ready->plan.io(ready->fd.fd, &ready->plan) != 2)
+				abort();
+		}
+		set_current(NULL);
+	}
+
+	/* Return a do-nothing plan, so backend_plan_changed in
+	 * io_ready doesn't do anything (it's already been called). */
+	return io_idle_();
+}
+
+int io_debug_io(int ret)
+{
+	/* Cache it for debugging; current changes. */
+	struct io_conn *conn = current;
+	int saved_errno = errno;
+
+	if (!doing_debug_on(conn))
+		return ret;
+
+	/* These will all go linearly through the io_debug() path above. */
+	switch (ret) {
+	case -1:
+		/* This will call io_debug above. */
+		errno = saved_errno;
+		io_close();
+		break;
+	case 0: /* Keep going with plan. */
+		io_debug(conn->plan);
+		break;
+	case 1: /* Done: get next plan. */
+		if (timeout_active(conn))
+			backend_del_timeout(conn);
+		conn->plan.next(conn, conn->plan.next_arg);
+		break;
+	default:
+		abort();
+	}
+
+	/* Normally-invalid value, used for sanity check. */
+	return 2;
 }
 
 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))
+	if (io_debug_conn && io_debug_conn(conn))
 		io_debug_wakeup = true;
 }
+
+/* Counterpart to io_plan_no_debug(), called in macros in io.h */
+static void io_plan_debug_again(void)
+{
+	io_plan_nodebug = false;
+}
 #else
 static void debug_io_wake(struct io_conn *conn)
 {
 }
+static void io_plan_debug_again(void)
+{
+}
 #endif
 
 struct io_listener *io_new_listener_(int fd,
@@ -82,6 +152,8 @@ struct io_conn *io_new_conn_(int fd, struct io_plan plan)
 {
 	struct io_conn *conn = malloc(sizeof(*conn));
 
+	io_plan_debug_again();
+
 	if (!conn)
 		return NULL;
 
@@ -111,6 +183,8 @@ struct io_conn *io_duplex_(struct io_conn *old, struct io_plan plan)
 {
 	struct io_conn *conn;
 
+	io_plan_debug_again();
+
 	assert(!old->duplex);
 
 	conn = malloc(sizeof(*conn));
@@ -155,11 +229,11 @@ 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)
-		return -1;
+		return io_debug_io(-1);
 
 	plan->u.write.buf += ret;
 	plan->u.write.len -= ret;
-	return (plan->u.write.len == 0);
+	return io_debug_io(plan->u.write.len == 0);
 }
 
 /* Queue some data to be written. */
@@ -177,7 +251,6 @@ struct io_plan io_write_(const void *data, size_t len,
 	plan.next_arg = arg;
 	plan.pollflag = POLLOUT;
 
-	io_plan_debug(&plan);
 	return plan;
 }
 
@@ -185,11 +258,11 @@ 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)
-		return -1;
+		return io_debug_io(-1);
 
 	plan->u.read.buf += ret;
 	plan->u.read.len -= ret;
-	return (plan->u.read.len == 0);
+	return io_debug_io(plan->u.read.len == 0);
 }
 
 /* Queue a request to read into a buffer. */
@@ -207,7 +280,6 @@ struct io_plan io_read_(void *data, size_t len,
 	plan.next_arg = arg;
 	plan.pollflag = POLLIN;
 
-	io_plan_debug(&plan);
 	return plan;
 }
 
@@ -215,10 +287,10 @@ 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)
-		return -1;
+		return io_debug_io(-1);
 
 	*plan->u.readpart.lenp = ret;
-	return 1;
+	return io_debug_io(1);
 }
 
 /* Queue a partial request to read into a buffer. */
@@ -236,7 +308,6 @@ struct io_plan io_read_partial_(void *data, size_t *len,
 	plan.next_arg = arg;
 	plan.pollflag = POLLIN;
 
-	io_plan_debug(&plan);
 	return plan;
 }
 
@@ -244,10 +315,10 @@ 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)
-		return -1;
+		return io_debug_io(-1);
 
 	*plan->u.writepart.lenp = ret;
-	return 1;
+	return io_debug_io(1);
 }
 
 /* Queue a partial write request. */
@@ -265,26 +336,79 @@ 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;
 }
 
-struct io_plan io_idle(void)
+static int already_connected(int fd, struct io_plan *plan)
+{
+	return io_debug_io(1);
+}
+
+static int do_connect(int fd, struct io_plan *plan)
+{
+	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_SETFD, plan->u.len_len.len1);
+		return 1;
+	}
+	return 0;
+}
+
+struct io_plan io_connect_(int fd, const struct addrinfo *addr,
+			   struct io_plan (*cb)(struct io_conn*, void *),
+			   void *arg)
+{
+	struct io_plan plan;
+
+	assert(cb);
+
+	plan.next = cb;
+	plan.next_arg = arg;
+
+	/* Save old flags, set nonblock if not already. */
+	plan.u.len_len.len1 = fcntl(fd, F_GETFD);
+	fcntl(fd, F_SETFD, plan.u.len_len.len1 | O_NONBLOCK);
+
+	/* Immediate connect can happen. */
+	if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0) {
+		/* Dummy will be called immediately. */
+		plan.pollflag = POLLOUT;
+		plan.io = already_connected;
+	} else {
+		if (errno != EINPROGRESS)
+			return io_close_();
+
+		plan.pollflag = POLLIN;
+		plan.io = do_connect;
+	}
+	return plan;
+}
+
+struct io_plan io_idle_(void)
 {
 	struct io_plan plan;
 
 	plan.pollflag = 0;
 	plan.io = NULL;
 	/* Never called (overridden by io_wake), but NULL means closing */
-	plan.next = (void *)io_idle;
+	plan.next = (void *)io_idle_;
 
-	io_plan_debug(&plan);
 	return plan;
 }
 
 void io_wake_(struct io_conn *conn, struct io_plan plan)
 
 {
+	io_plan_debug_again();
+
 	/* It might be closing, but we haven't called its finish() yet. */
 	if (!conn->plan.next)
 		return;
@@ -298,27 +422,25 @@ void io_wake_(struct io_conn *conn, struct io_plan plan)
 
 void io_ready(struct io_conn *conn)
 {
+	set_current(conn);
 	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);
 	}
+	set_current(NULL);
 }
 
 /* Close the connection, we're done. */
-struct io_plan io_close(void)
+struct io_plan io_close_(void)
 {
 	struct io_plan plan;
 
@@ -327,7 +449,6 @@ struct io_plan io_close(void)
 	plan.next = NULL;
 	plan.u.close.saved_errno = errno;
 
-	io_plan_debug(&plan);
 	return plan;
 }
 
@@ -339,6 +460,8 @@ struct io_plan io_close_cb(struct io_conn *conn, void *arg)
 /* Exit the loop, returning this (non-NULL) arg. */
 struct io_plan io_break_(void *ret, struct io_plan plan)
 {
+	io_plan_debug_again();
+
 	assert(ret);
 	io_loop_return = ret;