Use a -1 for error codes. This makes it easier to write your own io funcs.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
}
/* Returns true if we're finished. */
}
/* 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);
{
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;
plan->u.write.buf += ret;
plan->u.write.len -= ret;
-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);
{
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;
plan->u.read.buf += ret;
plan->u.read.len -= ret;
-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);
{
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;
*plan->u.readpart.lenp = ret;
}
/* Queue a partial request to read into a buffer. */
}
/* Queue a partial request to read into a buffer. */
-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);
{
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;
*plan->u.writepart.lenp = ret;
}
/* Queue a partial write request. */
}
/* Queue a partial write request. */
void io_ready(struct io_conn *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(NULL, NULL);
+ 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);
set_current(conn);
if (timeout_active(conn))
backend_del_timeout(conn);
struct io_plan {
int pollflag;
/* Only NULL if idle. */
struct io_plan {
int pollflag;
/* Only NULL if idle. */
- bool (*io)(int fd, struct io_plan *plan);
+ int (*io)(int fd, struct io_plan *plan);
/* Only NULL if closing. */
struct io_plan (*next)(struct io_conn *, void *arg);
void *next_arg;
/* Only NULL if closing. */
struct io_plan (*next)(struct io_conn *, void *arg);
void *next_arg;
io_break(pkt, io_idle());
}
io_break(pkt, io_idle());
}
-static bool do_read_packet(int fd, struct io_plan *plan)
+static int do_read_packet(int fd, struct io_plan *plan)
{
struct packet *pkt = plan->u.ptr_len.p;
char *dest;
{
struct packet *pkt = plan->u.ptr_len.p;
char *dest;
ok1(pkt->state == 2);
pkt->state++;
if (pkt->len == 0)
ok1(pkt->state == 2);
pkt->state++;
if (pkt->len == 0)
if (!pkt->contents && !(pkt->contents = malloc(pkt->len)))
goto fail;
else {
if (!pkt->contents && !(pkt->contents = malloc(pkt->len)))
goto fail;
else {
fail:
free(pkt->contents);
fail:
free(pkt->contents);
- /* Override next function to close us. */
- plan->next = io_close;
- return true;
}
static struct io_plan io_read_packet(struct packet *pkt,
}
static struct io_plan io_read_packet(struct packet *pkt,