aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-06 07:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

gossipd: use iterator helpers for iterating node channels.

Browse Source 
Makes the next step easier.

MCP results from 5 runs, min-max(mean +/- stddev):
	store_load_msec:45791-46917(46330.4+/-3.6e+02)
	vsz_kb:2641316
	store_rewrite_sec:47.040000-48.720000(47.684+/-0.57)
	listnodes_sec:1.140000-1.340000(1.2+/-0.072)
	listchannels_sec:50.970000-54.250000(52.698+/-1.3)
	routing_sec:29.950000-31.010000(30.332+/-0.37)
	peer_write_all_sec:51.570000-52.970000(52.1+/-0.54)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-04-08 14:12:43 +09:30
committed by neil saitug
parent db2ed9e168
commit 417e1bab7d
5 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gossipd/routing.c
View File

@@ -79,6 +79,16 @@ static struct node_map *empty_node_map(const tal_t *ctx)
return map;
}
struct chan *first_chan(const struct node *node, struct chan_map_iter *i)
{
return chan_map_first(&node->chans, i);
}
struct chan *next_chan(const struct node *node, struct chan_map_iter *i)
{
return chan_map_next(&node->chans, i);
}
struct routing_state *new_routing_state(const tal_t *ctx,
const struct chainparams *chainparams,
const struct pubkey *local_id,
@@ -137,7 +147,7 @@ static void destroy_node(struct node *node, struct routing_state *rstate)
node_map_del(rstate->nodes, node);
/* These remove themselves from the map. */
while ((c = chan_map_first(&node->chans, &i)) != NULL)
while ((c = first_chan(node, &i)) != NULL)
tal_free(c);
chan_map_clear(&node->chans);
}
@@ -174,9 +184,7 @@ static bool node_has_public_channels(struct node *node)
struct chan_map_iter i;
struct chan *c;
for (c = chan_map_first(&node->chans, &i);
c;
c = chan_map_next(&node->chans, &i)) {
for (c = first_chan(node, &i); c; c = next_chan(node, &i)) {
if (is_chan_public(c))
return true;
}
@@ -190,9 +198,7 @@ static bool node_has_broadcastable_channels(struct node *node)
struct chan_map_iter i;
struct chan *c;
for (c = chan_map_first(&node->chans, &i);
c;
c = chan_map_next(&node->chans, &i)) {
for (c = first_chan(node, &i); c; c = next_chan(node, &i)) {
if (!is_chan_public(c))
continue;
if (is_halfchan_defined(&c->half[0])
@@ -207,9 +213,7 @@ static bool node_announce_predates_channels(const struct node *node)
struct chan_map_iter i;
struct chan *c;
for (c = chan_map_first(&node->chans, &i);
c;
c = chan_map_next(&node->chans, &i)) {
for (c = first_chan(node, &i); c; c = next_chan(node, &i)) {
if (!is_chan_announced(c))
continue;
@@ -538,9 +542,9 @@ find_route(const tal_t *ctx, struct routing_state *rstate,
struct chan_map_iter i;
struct chan *chan;
for (chan = chan_map_first(&n->chans, &i);
for (chan = first_chan(n, &i);
chan;
chan = chan_map_next(&n->chans, &i)) {
chan = next_chan(n, &i)) {
int idx = half_chan_to(n, chan);
SUPERVERBOSE("Node %s edge %s",
@@ -1710,9 +1714,7 @@ void routing_failure(struct routing_state *rstate,
type_to_string(tmpctx,
struct pubkey,
&node->id));
for (c = chan_map_first(&node->chans, &i);
c;
c = chan_map_next(&node->chans, &i)) {
for (c = first_chan(node, &i); c; c = next_chan(node, &i)) {
/* Set it up to be pruned. */
tal_steal(tmpctx, c);
}