mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

test/test_state_coverage: don't run both peers once they're independent.

Browse Source 
Once both are longer listening to their packets, we don't need to
simulate all variants of what each are doing.

(With -O3 -flto, gcc 5.1) 
Before:
	real	11m40.032s
After:
	real	0m50.083s

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2015-09-25 11:51:19 +09:30
parent 3e9680659e
commit 97e10e0a18
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/test_state_coverage.c
View File

@ -77,7 +77,8 @@ struct core_state {
uint8_t capped_live_htlcs_to_them; uint8_t capped_live_htlcs_to_them;
uint8_t capped_live_htlcs_to_us; uint8_t capped_live_htlcs_to_us;
uint8_t pad[6]; bool valid;
uint8_t pad[5];
}; };
struct state_data { struct state_data {
@ -164,6 +165,7 @@ static bool situation_eq(const struct situation *a, const struct situation *b)
+ sizeof(a->a.s.capped_htlc_spends_to_them) + sizeof(a->a.s.capped_htlc_spends_to_them)
+ sizeof(a->a.s.capped_live_htlcs_to_us) + sizeof(a->a.s.capped_live_htlcs_to_us)
+ sizeof(a->a.s.capped_live_htlcs_to_them) + sizeof(a->a.s.capped_live_htlcs_to_them)
+ sizeof(a->a.s.valid)
+ sizeof(a->a.s.pad))); + sizeof(a->a.s.pad)));
return structeq(&a->a.s, &b->a.s) && structeq(&a->b.s, &b->b.s); return structeq(&a->a.s, &b->a.s) && structeq(&a->b.s, &b->b.s);
} }
@ -965,6 +967,7 @@ static void update_core(struct core_state *core, const struct state_data *sdata)
core->capped_live_htlcs_to_them = cap(sdata->num_live_htlcs_to_them); core->capped_live_htlcs_to_them = cap(sdata->num_live_htlcs_to_them);
core->capped_htlc_spends_to_us = cap(sdata->num_htlc_spends_to_us); core->capped_htlc_spends_to_us = cap(sdata->num_htlc_spends_to_us);
core->capped_htlc_spends_to_them = cap(sdata->num_htlc_spends_to_them); core->capped_htlc_spends_to_them = cap(sdata->num_htlc_spends_to_them);
core->valid = true;
} }
/* Returns false if we've been here before. */ /* Returns false if we've been here before. */
@ -975,14 +978,22 @@ static bool sithash_update(struct sithash *sithash,
if (streq(sdata->name, "A")) { if (streq(sdata->name, "A")) {
sit.a.s = sdata->core; sit.a.s = sdata->core;
sit.b.s = sdata->peer->core;
update_core(&sit.a.s, sdata); update_core(&sit.a.s, sdata);
update_core(&sit.b.s, sdata->peer); /* If we're still talking to peer, their state matters. */
if (sdata->core.pkt_inputs || sdata->peer->core.pkt_inputs) {
sit.b.s = sdata->peer->core;
update_core(&sit.b.s, sdata->peer);
} else
memset(&sit.b.s, 0, sizeof(sit.b.s));
} else { } else {
sit.b.s = sdata->core; sit.b.s = sdata->core;
sit.a.s = sdata->peer->core;
update_core(&sit.b.s, sdata); update_core(&sit.b.s, sdata);
update_core(&sit.a.s, sdata->peer); /* If we're still talking to peer, their state matters. */
if (sdata->core.pkt_inputs || sdata->peer->core.pkt_inputs) {
sit.a.s = sdata->peer->core;
update_core(&sit.a.s, sdata->peer);
} else
memset(&sit.a.s, 0, sizeof(sit.a.s));
} }
if (sithash_get(sithash, &sit)) if (sithash_get(sithash, &sit))
@ -1659,7 +1670,9 @@ static struct trail *try_input(const struct state_data *sdata,
/* Try inputs from here down. */ /* Try inputs from here down. */
t = run_peer(&copy, normalpath, errorpath, depth+1, hist); t = run_peer(&copy, normalpath, errorpath, depth+1, hist);
if (!t)
/* Don't bother running other peer we can't communicate. */
if (!t && (copy.core.pkt_inputs || peer.core.pkt_inputs))
t = run_peer(&peer, normalpath, errorpath, depth+1, hist); t = run_peer(&peer, normalpath, errorpath, depth+1, hist);
if (!t) { if (!t) {
tal_free(effect); tal_free(effect);
@ -1988,10 +2001,10 @@ static bool visited_state(const struct sithash *sithash,
for (h = sithash_first(sithash, &i); h; h = sithash_next(sithash, &i)) { for (h = sithash_first(sithash, &i); h; h = sithash_next(sithash, &i)) {
num++; num++;
if (b) { if (b) {
if (h->b.s.state == state) if (h->a.s.valid && h->b.s.state == state)
return true; return true;
} else { } else {
if (h->a.s.state == state) if (h->a.s.valid && h->a.s.state == state)
return true; return true;
} }
} }