aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-23 15:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

onchaind: wire up dev_memleak.

Browse Source 
For onchaind we need to remove globals from memleak consideration;
we also change the htlc pointer to an htlc copy, which simplifies
things as well.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-11-22 12:47:29 +10:30
parent d3ea9bf8bf
commit 55306fc3eb
7 changed files with 145 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lightningd/peer_control.c
View File

@@ -1399,23 +1399,41 @@ AUTODATA(json_command, &dev_forget_channel_command);
/* Mutual recursion */
static void peer_memleak_req_next(struct command *cmd, struct channel *prev);
static void peer_memleak_req_done(struct subd *subd, bool found_leak,
struct command *cmd)
{
struct channel *c = subd->channel;
if (found_leak)
peer_memleak_done(cmd, subd);
else
peer_memleak_req_next(cmd, c);
}
static void channeld_memleak_req_done(struct subd *channeld,
const u8 *msg, const int *fds UNUSED,
struct command *cmd)
{
struct channel *c = channeld->channel;
bool found_leak;
if (!fromwire_channel_dev_memleak_reply(msg, &found_leak)) {
command_fail(cmd, LIGHTNINGD, "Bad channel_dev_memleak");
return;
}
peer_memleak_req_done(channeld, found_leak, cmd);
}
if (found_leak) {
peer_memleak_done(cmd, channeld);
static void onchaind_memleak_req_done(struct subd *onchaind,
const u8 *msg, const int *fds UNUSED,
struct command *cmd)
{
bool found_leak;
if (!fromwire_onchain_dev_memleak_reply(msg, &found_leak)) {
command_fail(cmd, LIGHTNINGD, "Bad onchain_dev_memleak");
return;
}
peer_memleak_req_next(cmd, c);
peer_memleak_req_done(onchaind, found_leak, cmd);
}
static void peer_memleak_req_next(struct command *cmd, struct channel *prev)
@@ -1437,7 +1455,6 @@ static void peer_memleak_req_next(struct command *cmd, struct channel *prev)
if (prev != NULL)
continue;
/* FIXME: handle onchaind here */
/* FIXME: handle closingd here */
if (streq(c->owner->name, "lightning_channeld")) {
subd_req(c, c->owner,
@@ -1445,6 +1462,12 @@ static void peer_memleak_req_next(struct command *cmd, struct channel *prev)
-1, 0, channeld_memleak_req_done, cmd);
return;
}
if (streq(c->owner->name, "lightning_onchaind")) {
subd_req(c, c->owner,
take(towire_onchain_dev_memleak(NULL)),
-1, 0, onchaind_memleak_req_done, cmd);
return;
}
}
}
peer_memleak_done(cmd, NULL);