Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rustyrussell/pettycoin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: caf75a8b8d4c
Choose a base ref
...
head repository: rustyrussell/pettycoin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a4c143c7946
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Aug 8, 2014

  1. gettransaction: fix tests.

    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    rustyrussell committed Aug 8, 2014
    Copy the full SHA
    ae6afdf View commit details
  2. ccan: update (non-blocking I/O working)

    This was reported by Nelson Castillo on IRC; dumbwallet was hanging.
    He tracked it to this around the same time I saw similar things; pettycoin
    would block on large writes (which it does during the sync phase).
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    rustyrussell committed Aug 8, 2014
    Copy the full SHA
    5a4c143 View commit details
Showing with 44 additions and 17 deletions.
  1. +1 −1 ccan/README
  2. +1 −1 ccan/ccan/io/backend.h
  3. +31 −12 ccan/ccan/io/io.c
  4. +8 −2 ccan/ccan/io/poll.c
  5. +1 −1 gettransaction.c
  6. +2 −0 test/run-01-jsonrpc.c
2 changes: 1 addition & 1 deletion ccan/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net.

CCAN version: init-1898-g0fbc790
CCAN version: init-1901-g8976261
2 changes: 1 addition & 1 deletion ccan/ccan/io/backend.h
Original file line number Diff line number Diff line change
@@ -88,6 +88,6 @@ void backend_del_conn(struct io_conn *conn);

void io_ready(struct io_conn *conn, int pollflags);
void io_do_always(struct io_conn *conn);
void io_do_wakeup(struct io_conn *conn, struct io_plan *plan);
void io_do_wakeup(struct io_conn *conn, enum io_direction dir);
void *do_io_loop(struct io_conn **ready);
#endif /* CCAN_IO_BACKEND_H */
43 changes: 31 additions & 12 deletions ccan/ccan/io/io.c
Original file line number Diff line number Diff line change
@@ -67,6 +67,18 @@ static void next_plan(struct io_conn *conn, struct io_plan *plan)
backend_new_plan(conn);
}

static void set_blocking(int fd, bool block)
{
int flags = fcntl(fd, F_GETFL);

if (block)
flags &= ~O_NONBLOCK;
else
flags |= O_NONBLOCK;

fcntl(fd, F_SETFL, flags);
}

struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
struct io_plan *(*init)(struct io_conn *, void *),
void *arg)
@@ -86,6 +98,9 @@ struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
if (!add_conn(conn))
return tal_free(conn);

/* Keep our I/O async. */
set_blocking(fd, false);

/* We start with out doing nothing, and in doing our init. */
conn->plan[IO_OUT].status = IO_UNSET;

@@ -275,8 +290,6 @@ static int do_connect(int fd, struct io_plan_arg *arg)
return -1;

if (err == 0) {
/* Restore blocking if it was initially. */
fcntl(fd, F_SETFL, arg->u1.s);
return 1;
} else if (err == EINPROGRESS)
return 0;
@@ -289,21 +302,21 @@ struct io_plan *io_connect_(struct io_conn *conn, const struct addrinfo *addr,
struct io_plan *(*next)(struct io_conn *, void *),
void *next_arg)
{
struct io_plan_arg *arg = io_plan_arg(conn, IO_IN);
int fd = io_conn_fd(conn);

/* Save old flags, set nonblock if not already. */
arg->u1.s = fcntl(fd, F_GETFL);
fcntl(fd, F_SETFL, arg->u1.s | O_NONBLOCK);
/* We don't actually need the arg, but we need it polling. */
io_plan_arg(conn, IO_OUT);

/* Note that io_new_conn() will make fd O_NONBLOCK */

/* Immediate connect can happen. */
if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0)
return set_always(conn, IO_IN, next, next_arg);
return set_always(conn, IO_OUT, next, next_arg);

if (errno != EINPROGRESS)
return io_close(conn);

return io_set_plan(conn, IO_IN, do_connect, next, next_arg);
return io_set_plan(conn, IO_OUT, do_connect, next, next_arg);
}

static struct io_plan *io_wait_dir(struct io_conn *conn,
@@ -384,10 +397,13 @@ void io_do_always(struct io_conn *conn)
next_plan(conn, &conn->plan[IO_OUT]);
}

void io_do_wakeup(struct io_conn *conn, struct io_plan *plan)
void io_do_wakeup(struct io_conn *conn, enum io_direction dir)
{
struct io_plan *plan = &conn->plan[dir];

assert(plan->status == IO_WAITING);
next_plan(conn, plan);

set_always(conn, dir, plan->next, plan->next_arg);
}

/* Close the connection, we're done. */
@@ -434,7 +450,7 @@ void io_duplex_prepare(struct io_conn *conn)
/* We can't sync debug until we've set both: io_wait() and io_always
* can't handle it. */
conn->debug_saved = conn->debug;
conn->debug = false;
io_set_debug(conn, false);
}

struct io_plan *io_duplex_(struct io_plan *in_plan, struct io_plan *out_plan)
@@ -446,7 +462,7 @@ struct io_plan *io_duplex_(struct io_plan *in_plan, struct io_plan *out_plan)

/* Restore debug. */
conn = container_of(in_plan, struct io_conn, plan[IO_IN]);
conn->debug = conn->debug_saved;
io_set_debug(conn, conn->debug_saved);

/* Now set the plans again, to invoke sync debug. */
io_set_plan(conn, IO_OUT,
@@ -519,6 +535,9 @@ struct io_plan *io_set_plan(struct io_conn *conn, enum io_direction dir,
void io_set_debug(struct io_conn *conn, bool debug)
{
conn->debug = debug;

/* Debugging means fds must block. */
set_blocking(io_conn_fd(conn), debug);
}

void io_debug_complete(struct io_conn *conn)
10 changes: 8 additions & 2 deletions ccan/ccan/io/poll.c
Original file line number Diff line number Diff line change
@@ -78,6 +78,12 @@ static void del_fd(struct fd *fd)
}
num_fds--;
fd->backend_info = -1;

/* Closing a local socket doesn't wake poll() because other end
* has them open. See 2.6. When should I use shutdown()?
* in http://www.faqs.org/faqs/unix-faq/socket/ */
shutdown(fd->fd, SHUT_RDWR);

close(fd->fd);
}

@@ -152,11 +158,11 @@ void backend_wake(const void *wait)
c = (void *)fds[i];
if (c->plan[IO_IN].status == IO_WAITING
&& c->plan[IO_IN].arg.u1.const_vp == wait)
io_do_wakeup(c, &c->plan[IO_IN]);
io_do_wakeup(c, IO_IN);

if (c->plan[IO_OUT].status == IO_WAITING
&& c->plan[IO_OUT].arg.u1.const_vp == wait)
io_do_wakeup(c, &c->plan[IO_OUT]);
io_do_wakeup(c, IO_OUT);
}
}

2 changes: 1 addition & 1 deletion gettransaction.c
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
#include "hex.h"
#include "json_add_tx.h"
#include "jsonrpc.h"
#include "txhash.h"
#include "state.h"
#include "txhash.h"
#include <ccan/tal/str/str.h>

static char *json_gettransaction(struct json_connection *jcon,
2 changes: 2 additions & 0 deletions test/run-01-jsonrpc.c
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ const struct json_command getblock_command;
const struct json_command getblockhash_command;
/* Generated stub for getinfo_command */
const struct json_command getinfo_command;
/* Generated stub for gettransaction_command */
const struct json_command gettransaction_command;
/* Generated stub for listtodo_command */
const struct json_command listtodo_command;
/* Generated stub for listtransactions_command */