#include <errno.h>
#include <stdlib.h>
#include <assert.h>
-#include <poll.h>
#include <unistd.h>
#include <fcntl.h>
struct io_conn *current;
/* 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;
struct io_plan io_debug(struct io_plan plan)
{
return plan;
}
- if (!current || !doing_debug_on(current)) {
- if (!io_debug_wakeup)
- return plan;
- }
+ if (!current || !doing_debug_on(current))
+ return plan;
- io_debug_wakeup = false;
current->plan = plan;
backend_plan_changed(current);
/* Return a do-nothing plan, so backend_plan_changed in
* io_ready doesn't do anything (it's already been called). */
- return io_idle_();
+ return io_wait_(NULL, (void *)1, NULL);
}
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:
return 2;
}
-static void debug_io_wake(struct io_conn *conn)
-{
- /* We want linear if we wake a debugged connection, too. */
- 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)
{
}
return conn;
}
-bool io_timeout_(struct io_conn *conn, struct timespec ts,
+bool io_timeout_(struct io_conn *conn, struct timerel t,
struct io_plan (*cb)(struct io_conn *, void *), void *arg)
{
assert(cb);
conn->timeout->next = cb;
conn->timeout->next_arg = arg;
- backend_add_timeout(conn, ts);
+ backend_add_timeout(conn, t);
return true;
}
+/* Always done: call the next thing. */
+static int do_always(int fd, struct io_plan *plan)
+{
+ return 1;
+}
+
+struct io_plan io_always_(struct io_plan (*cb)(struct io_conn *, void *),
+ void *arg)
+{
+ struct io_plan plan;
+
+ assert(cb);
+ plan.io = do_always;
+ plan.next = cb;
+ plan.next_arg = arg;
+ plan.pollflag = POLLALWAYS;
+
+ return plan;
+}
+
/* Returns true if we're finished. */
static int do_write(int fd, struct io_plan *plan)
{
struct io_plan plan;
assert(cb);
+
+ if (len == 0)
+ return io_always_(cb, arg);
+
plan.u1.const_vp = data;
plan.u2.s = len;
plan.io = do_write;
struct io_plan plan;
assert(cb);
+
+ if (len == 0)
+ return io_always_(cb, arg);
+
plan.u1.cp = data;
plan.u2.s = len;
plan.io = do_read;
plan.next = cb;
plan.next_arg = arg;
+
plan.pollflag = POLLIN;
return plan;
struct io_plan plan;
assert(cb);
+
+ if (*len == 0)
+ return io_always_(cb, arg);
+
plan.u1.cp = data;
plan.u2.vp = len;
plan.io = do_read_partial;
struct io_plan plan;
assert(cb);
+
+ if (*len == 0)
+ return io_always_(cb, arg);
+
plan.u1.const_vp = data;
plan.u2.vp = len;
plan.io = do_write_partial;
if (err == 0) {
/* Restore blocking if it was initially. */
- fcntl(fd, F_SETFD, plan->u1.s);
+ fcntl(fd, F_SETFL, plan->u1.s);
return 1;
- }
- return 0;
+ } else if (err == EINPROGRESS)
+ return 0;
+
+ errno = err;
+ return -1;
}
struct io_plan io_connect_(int fd, const struct addrinfo *addr,
plan.next_arg = arg;
/* Save old flags, set nonblock if not already. */
- plan.u1.s = fcntl(fd, F_GETFD);
- fcntl(fd, F_SETFD, plan.u1.s | O_NONBLOCK);
+ plan.u1.s = fcntl(fd, F_GETFL);
+ fcntl(fd, F_SETFL, plan.u1.s | O_NONBLOCK);
/* Immediate connect can happen. */
if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0) {
return plan;
}
-struct io_plan io_idle_(void)
+struct io_plan io_wait_(const void *wait,
+ struct io_plan (*cb)(struct io_conn *, void*),
+ void *arg)
{
struct io_plan plan;
+ assert(cb);
plan.pollflag = 0;
plan.io = NULL;
- /* Never called (overridden by io_wake), but NULL means closing */
- plan.next = (void *)io_idle_;
+ plan.next = cb;
+ plan.next_arg = arg;
+
+ plan.u1.const_vp = wait;
return plan;
}
-void io_wake_(struct io_conn *conn, struct io_plan plan)
-
+void io_wake(const void *wait)
{
- io_plan_debug_again();
-
- /* It might be closing, but we haven't called its finish() yet. */
- if (!conn->plan.next)
- return;
- /* It was idle, right? */
- assert(!conn->plan.io);
- conn->plan = plan;
- backend_plan_changed(conn);
-
- debug_io_wake(conn);
+ backend_wait_changed(wait);
}
void io_ready(struct io_conn *conn)
{
+ /* Beware io_close_other! */
+ if (!conn->plan.next)
+ return;
+
set_current(conn);
switch (conn->plan.io(conn->fd.fd, &conn->plan)) {
case -1: /* Failure means a new plan: close up. */
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);
}
return io_close();
}
+void io_close_other(struct io_conn *conn)
+{
+ /* Don't close if already closing! */
+ if (conn->plan.next) {
+ conn->plan = io_close_();
+ backend_plan_changed(conn);
+ }
+}
+
/* Exit the loop, returning this (non-NULL) arg. */
struct io_plan io_break_(void *ret, struct io_plan plan)
{
return plan;
}
+static struct io_plan io_never_called(struct io_conn *conn, void *arg)
+{
+ abort();
+}
+
+struct io_plan io_never(void)
+{
+ return io_always_(io_never_called, NULL);
+}
+
int io_conn_fd(const struct io_conn *conn)
{
return conn->fd.fd;
projects / ccan / blobdiff