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

memleak,df: patchup memleak code for v2 channels

Browse Source 
Takes 'unsaved' channels into account for memleak cleanups, instead of
solely relying on `uncommitted_channels`
This commit is contained in:
niftynei 2021-02-23 20:34:30 -06:00 committed by neil saitug
parent 6407ad334f
commit 474233f1b7
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lightningd/opening_common.c
View File

@ -169,7 +169,12 @@ static void opening_memleak_req_done(struct subd *open_daemon,
struct command *cmd)
{
bool found_leak;
struct uncommitted_channel *uc = open_daemon->channel;
struct peer *p;
if (streq(open_daemon->name, "dualopend"))
p = ((struct channel *)open_daemon->channel)->peer;
else
p = ((struct uncommitted_channel *)open_daemon->channel)->peer;
tal_del_destructor2(open_daemon, opening_died_forget_memleak, cmd);
if (!fromwire_openingd_dev_memleak_reply(msg, &found_leak) &&
@ -184,19 +189,23 @@ static void opening_memleak_req_done(struct subd *open_daemon,
opening_memleak_done(cmd, open_daemon);
return;
}
opening_memleak_req_next(cmd, uc->peer);
opening_memleak_req_next(cmd, p);
}
static void opening_memleak_req_next(struct command *cmd, struct peer *prev)
{
struct peer *p;
struct channel *c;
u8 *msg;
list_for_each(&cmd->ld->peers, p, list) {
struct subd *open_daemon;
c = NULL;
if (!p->uncommitted_channel)
if (!p->uncommitted_channel
&& !(c = peer_unsaved_channel(p)))
continue;
if (p == prev) {
prev = NULL;
continue;
@ -204,7 +213,10 @@ static void opening_memleak_req_next(struct command *cmd, struct peer *prev)
if (prev != NULL)
continue;
open_daemon = p->uncommitted_channel->open_daemon;
if (c)
open_daemon = c->owner;
else
open_daemon = p->uncommitted_channel->open_daemon;
if (!open_daemon)
continue;
@ -217,7 +229,7 @@ static void opening_memleak_req_next(struct command *cmd, struct peer *prev)
subd_req(p, open_daemon, take(msg), -1, 0,
opening_memleak_req_done, cmd);
/* Just in case it dies before replying! */
tal_add_destructor2(p->uncommitted_channel->open_daemon,
tal_add_destructor2(open_daemon,
opening_died_forget_memleak, cmd);
return;
}

6
lightningd/peer_control.c
View File

@ -2446,7 +2446,11 @@ static void peer_memleak_req_next(struct command *cmd, struct channel *prev)
if (prev != NULL)
continue;
/* Note: closingd does its own checking automatically */
/* Note: closingd and dualopend do their own
* checking automatically */
if (channel_unsaved(c))
continue;
if (streq(c->owner->name, "channeld")) {
subd_req(c, c->owner,
take(towire_channeld_dev_memleak(NULL)),