aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

daemon: add pending input queue.

Browse Source 
You can't re-enter the state machine from a callback, so this allows you
to queue an input for when it returns.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-05-03 11:02:20 +09:30
parent c94c495257
commit 33a477d65d
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
daemon/peer.c
View File

@@ -50,6 +50,12 @@ struct pending_cmd {
void *arg; void *arg;
}; };
struct pending_input {
struct list_node list;
enum state_input input;
union input idata;
};
static struct peer *find_peer(struct lightningd_state *dstate, static struct peer *find_peer(struct lightningd_state *dstate,
const char *buffer, const char *buffer,
jsmntok_t *peeridtok) jsmntok_t *peeridtok)
@@ -210,6 +216,18 @@ static void queue_cmd_(struct peer *peer,
try_command(peer); try_command(peer);
}; };
static void UNNEEDED queue_input(struct peer *peer,
enum state_input input,
const union input *idata)
{
struct pending_input *pend = tal(peer, struct pending_input);
pend->input = input;
if (idata)
pend->idata = *idata;
list_add_tail(&peer->pending_input, &pend->list);
}
/* All unrevoked commit txs must have no HTLCs in them. */ /* All unrevoked commit txs must have no HTLCs in them. */
bool committed_to_htlcs(const struct peer *peer) bool committed_to_htlcs(const struct peer *peer)
{ {
@@ -244,6 +262,8 @@ static void state_event(struct peer *peer,
const enum state_input input, const enum state_input input,
const union input *idata) const union input *idata)
{ {
struct pending_input *pend;
state_single(peer, input, idata); state_single(peer, input, idata);
if (peer->cleared != INPUT_NONE && !committed_to_htlcs(peer)) { if (peer->cleared != INPUT_NONE && !committed_to_htlcs(peer)) {
@@ -252,6 +272,12 @@ static void state_event(struct peer *peer,
state_single(peer, all_done, NULL); state_single(peer, all_done, NULL);
} }
pend = list_pop(&peer->pending_input, struct pending_input, list);
if (pend) {
state_event(peer, pend->input, &pend->idata);
tal_free(pend);
}
try_command(peer); try_command(peer);
} }
@@ -394,6 +420,7 @@ static struct peer *new_peer(struct lightningd_state *dstate,
peer->outpkt = tal_arr(peer, struct out_pkt, 0); peer->outpkt = tal_arr(peer, struct out_pkt, 0);
peer->curr_cmd.cmd = INPUT_NONE; peer->curr_cmd.cmd = INPUT_NONE;
list_head_init(&peer->pending_cmd); list_head_init(&peer->pending_cmd);
list_head_init(&peer->pending_input);
peer->commit_tx_counter = 0; peer->commit_tx_counter = 0;
peer->close_watch_timeout = NULL; peer->close_watch_timeout = NULL;
peer->anchor.watches = NULL; peer->anchor.watches = NULL;

3
daemon/peer.h
View File

@@ -119,6 +119,9 @@ struct peer {
struct command *jsoncmd; struct command *jsoncmd;
} curr_cmd; } curr_cmd;
/* Pending inputs. */
struct list_head pending_input;
/* Pending commands. */ /* Pending commands. */
struct list_head pending_cmd; struct list_head pending_cmd;