X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=83104f86b43ddfceed6d5bf7938a60d28ac159f2;hb=dded32f2b03fca526271e35671fa36d299880429;hp=34b7cb0ce7ca6e739246a33b3a457aafb3e5a5b8;hpb=5a7e32bdb9b9c2273ef4cce8b35e23f177c504df;p=ccan

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 34b7cb0c..83104f86 100644
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -14,6 +14,10 @@
 
 void *io_loop_return;
 
+struct io_alloc io_alloc = {
+	malloc, realloc, free
+};
+
 #ifdef DEBUG
 /* Set to skip the next plan. */
 bool io_plan_nodebug;
@@ -42,6 +46,12 @@ struct io_plan io_debug(struct io_plan plan)
 	current->plan = plan;
 	backend_plan_changed(current);
 
+	/* If it closed, close duplex. */
+	if (!current->plan.next && current->duplex) {
+		current->duplex->plan = io_close_();
+		backend_plan_changed(current->duplex);
+	}
+
 	/* Call back into the loop immediately. */
 	io_loop_return = do_io_loop(&ready);
 
@@ -90,6 +100,10 @@ int io_debug_io(int ret)
 	case 1: /* Done: get next plan. */
 		if (timeout_active(conn))
 			backend_del_timeout(conn);
+		/* In case they call io_duplex, clear our poll flags so
+		 * both sides don't seem to be both doing read or write
+		 * (See	assert(!mask || pfd->events != mask) in poll.c) */
+		conn->plan.pollflag = 0;
 		conn->plan.next(conn, conn->plan.next_arg);
 		break;
 	default:
@@ -125,7 +139,7 @@ struct io_listener *io_new_listener_(int fd,
 				     void (*init)(int fd, void *arg),
 				     void *arg)
 {
-	struct io_listener *l = malloc(sizeof(*l));
+	struct io_listener *l = io_alloc.alloc(sizeof(*l));
 
 	if (!l)
 		return NULL;
@@ -135,7 +149,7 @@ struct io_listener *io_new_listener_(int fd,
 	l->init = init;
 	l->arg = arg;
 	if (!add_listener(l)) {
-		free(l);
+		io_alloc.free(l);
 		return NULL;
 	}
 	return l;
@@ -145,12 +159,12 @@ void io_close_listener(struct io_listener *l)
 {
 	close(l->fd.fd);
 	del_listener(l);
-	free(l);
+	io_alloc.free(l);
 }
 
 struct io_conn *io_new_conn_(int fd, struct io_plan plan)
 {
-	struct io_conn *conn = malloc(sizeof(*conn));
+	struct io_conn *conn = io_alloc.alloc(sizeof(*conn));
 
 	io_plan_debug_again();
 
@@ -165,7 +179,7 @@ struct io_conn *io_new_conn_(int fd, struct io_plan plan)
 	conn->duplex = NULL;
 	conn->timeout = NULL;
 	if (!add_conn(conn)) {
-		free(conn);
+		io_alloc.free(conn);
 		return NULL;
 	}
 	return conn;
@@ -187,7 +201,7 @@ struct io_conn *io_duplex_(struct io_conn *old, struct io_plan plan)
 
 	assert(!old->duplex);
 
-	conn = malloc(sizeof(*conn));
+	conn = io_alloc.alloc(sizeof(*conn));
 	if (!conn)
 		return NULL;
 
@@ -199,7 +213,7 @@ struct io_conn *io_duplex_(struct io_conn *old, struct io_plan plan)
 	conn->finish_arg = NULL;
 	conn->timeout = NULL;
 	if (!add_duplex(conn)) {
-		free(conn);
+		io_alloc.free(conn);
 		return NULL;
 	}
 	old->duplex = conn;
@@ -212,7 +226,7 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
 	assert(cb);
 
 	if (!conn->timeout) {
-		conn->timeout = malloc(sizeof(*conn->timeout));
+		conn->timeout = io_alloc.alloc(sizeof(*conn->timeout));
 		if (!conn->timeout)
 			return false;
 	} else
@@ -433,10 +447,22 @@ void io_ready(struct io_conn *conn)
 	case 1: /* Done: get next plan. */
 		if (timeout_active(conn))
 			backend_del_timeout(conn);
+		/* In case they call io_duplex, clear our poll flags so
+		 * both sides don't seem to be both doing read or write
+		 * (See	assert(!mask || pfd->events != mask) in poll.c) */
+		conn->plan.pollflag = 0;
 		conn->plan = conn->plan.next(conn, conn->plan.next_arg);
 		backend_plan_changed(conn);
 	}
 	set_current(NULL);
+
+	/* If it closed, close duplex if not already */
+	if (!conn->plan.next && conn->duplex && conn->duplex->plan.next) {
+		set_current(conn->duplex);
+		conn->duplex->plan = io_close();
+		backend_plan_changed(conn->duplex);
+		set_current(NULL);
+	}
 }
 
 /* Close the connection, we're done. */
@@ -467,3 +493,17 @@ struct io_plan io_break_(void *ret, struct io_plan plan)
 
 	return plan;
 }
+
+int io_conn_fd(const struct io_conn *conn)
+{
+	return conn->fd.fd;
+}
+
+void io_set_alloc(void *(*allocfn)(size_t size),
+		  void *(*reallocfn)(void *ptr, size_t size),
+		  void (*freefn)(void *ptr))
+{
+	io_alloc.alloc = allocfn;
+	io_alloc.realloc = reallocfn;
+	io_alloc.free = freefn;
+}