mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

peer: don't spin when we want to commit and are not connected.

Browse Source 
Instead, stop timer loop, and restart when we connect again.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2016-10-07 14:00:17 +10:30
parent 25b3dc0038
commit e2090f015d
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
daemon/peer.c
View File

@ -2047,6 +2047,31 @@ static void retransmit_pkts(struct peer *peer, s64 ack)
retry_all_routing(peer);
}
static u64 desired_commit_feerate(struct lightningd_state *dstate)
{
return get_feerate(dstate) * dstate->config.commitment_fee_percent / 100;
}
static bool want_feechange(const struct peer *peer)
{
if (!state_is_normal(peer->state) && !state_is_shutdown(peer->state))
return false;
return peer->local.staging_cstate->fee_rate
!= desired_commit_feerate(peer->dstate);
}
static void peer_has_connected(struct peer *peer)
{
assert(!peer->connected);
peer->connected = true;
/* Do we want to send something? */
if (peer_uncommitted_changes(peer) || want_feechange(peer)) {
log_debug(peer->log, "connected: changes pending");
remote_changes_pending(peer);
}
}
/* Crypto is on, we are live. */
static struct io_plan *peer_crypto_on(struct io_conn *conn, struct peer *peer)
{
@ -2063,8 +2088,7 @@ static struct io_plan *peer_crypto_on(struct io_conn *conn, struct peer *peer)
state_event(peer, peer->local.offer_anchor, NULL);
assert(!peer->connected);
peer->connected = true;
peer_has_connected(peer);
return io_duplex(conn,
peer_read_packet(conn, peer, pkt_in),
pkt_out(conn, peer));
@ -2109,11 +2133,6 @@ static void peer_disconnect(struct io_conn *conn, struct peer *peer)
}
}
static u64 desired_commit_feerate(struct lightningd_state *dstate)
{
return get_feerate(dstate) * dstate->config.commitment_fee_percent / 100;
}
static void maybe_propose_new_feerate(struct peer *peer)
{
u64 rate, max_rate;
@ -2249,12 +2268,17 @@ database_error:
peer_fail(peer, __func__);
}
/* FIXME: don't spin on this timer if we're not connected! */
static void try_commit(struct peer *peer)
{
peer->commit_timer = NULL;
if (state_can_commit(peer->state) && peer->connected)
if (!peer->connected) {
log_debug(peer->log, "try_commit: state=%s, not connected",
state_name(peer->state));
return;
}
if (state_can_commit(peer->state))
do_commit(peer, NULL);
else {
/* FIXME: try again when we receive revocation /
@ -2524,15 +2548,8 @@ static struct io_plan *reconnect_pkt_in(struct io_conn *conn, struct peer *peer)
return pkt_out(conn, peer);
}
/* We could have commitments pending from before. */
if (peer_uncommitted_changes(peer)) {
log_debug(peer->log, "reconnect_pkt_in: changes pending.");
remote_changes_pending(peer);
}
/* Back into normal mode. */
assert(!peer->connected);
peer->connected = true;
peer_has_connected(peer);
return io_duplex(conn,
peer_read_packet(conn, peer, pkt_in),
pkt_out(conn, peer));
@ -2993,9 +3010,7 @@ static enum watch_result anchor_depthchange(struct peer *peer,
check_htlc_expiry(peer);
/* If fee rate has changed, fire off update to change it. */
if ((state_is_normal(peer->state) || state_is_shutdown(peer->state))
&& peer->local.staging_cstate->fee_rate
!= desired_commit_feerate(peer->dstate)) {
if (want_feechange(peer)) {
log_debug(peer->log, "fee rate changed to %"PRIu64,
desired_commit_feerate(peer->dstate));
/* FIXME: If fee changes back before update, we screw