aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-20 05:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

utils: add a global tmpctx.

Browse Source 
I did a brief audit of tmpctx uses, and we do leak them in various
corner cases.  Fortunely, all our daemons are based on some kind of
I/O loop, so it's fairly easy to clean a global tmpctx at that point.

This makes things a bit neater, and slightly more efficient, but also
clearer: I avoided creating a tmpctx in a few places because I didn't
want to add another allocation.  With that penalty removed, I can use
it more freely and hopefully write clearer code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-03-15 15:00:37 +10:30
parent 41ef42ee94
commit ef2a063169
10 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/io_debug.c
View File

@@ -11,9 +11,7 @@ int debug_poll(struct pollfd *fds, nfds_t nfds, int timeout)
if (t)
errx(1, "Outstanding taken pointers: %s", t);
t = tmpctx_any();
if (t)
errx(1, "Outstanding tmpctx: %s", t);
clean_tmpctx();
return poll(fds, nfds, timeout);
}

2
common/subdaemon.c
View File

@@ -73,6 +73,8 @@ void subdaemon_setup(int argc, char *argv[])
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY
| SECP256K1_CONTEXT_SIGN);
setup_tmpctx();
for (int i = 1; i < argc; i++) {
if (streq(argv[i], "--log-io"))
logging_io = true;

37
common/utils.c
View File

@@ -4,6 +4,7 @@
#include <ccan/tal/str/str.h>
secp256k1_context *secp256k1_ctx;
const tal_t *tmpctx;
char *tal_hexstr(const tal_t *ctx, const void *data, size_t len)
{
@@ -25,36 +26,20 @@ u8 *tal_hexdata(const tal_t *ctx, const void *str, size_t len)
return data;
}
struct tmpctx {
struct list_node list;
const char *file;
unsigned int line;
};
/* Global temporary convenience context: freed in io loop core. */
static struct list_head tmpctxs = LIST_HEAD_INIT(tmpctxs);
static void destroy_tmpctx(struct tmpctx *t)
/* Initial creation of tmpctx. */
void setup_tmpctx(void)
{
list_del_from(&tmpctxs, &t->list);
tmpctx = tal(NULL, char);
}
tal_t *tal_tmpctx_(const tal_t *ctx, const char *file, unsigned int line)
/* Free any children of tmpctx. */
void clean_tmpctx(void)
{
struct tmpctx *t = tal(ctx, struct tmpctx);
t->file = file;
t->line = line;
list_add_tail(&tmpctxs, &t->list);
tal_add_destructor(t, destroy_tmpctx);
return t;
}
const char *tmpctx_any(void)
{
struct tmpctx *t = list_top(&tmpctxs, struct tmpctx, list);
if (t) {
assert(t->file != NULL);
return tal_fmt(t, "%s:%u", t->file, t->line);
/* Minor optimization: don't do anything if tmpctx unused. */
if (tal_first(tmpctx)) {
tal_free(tmpctx);
tmpctx = tal(NULL, char);
}
return NULL;
}

16
common/utils.h
View File

@@ -16,12 +16,16 @@ char *tal_hex(const tal_t *ctx, const tal_t *data);
/* Allocate and fill a buffer with the data of this hex string. */
u8 *tal_hexdata(const tal_t *ctx, const void *str, size_t len);
/* Get a temporary context for this function scope (tal_free at end) */
tal_t *tal_tmpctx_(const tal_t *ctx, const char *file, unsigned int line);
#define tal_tmpctx(ctx) \
tal_tmpctx_((ctx), __FILE__, __LINE__)
/* FIXME: Remove in favor of global */
#define tal_tmpctx(ctx) tal((ctx), char)
/* Return non-NULL if any tmpctx still allocated. */
const char *tmpctx_any(void);
/* Global temporary convenience context: freed in io loop core. */
extern const tal_t *tmpctx;
/* Initial creation of tmpctx. */
void setup_tmpctx(void);
/* Free any children of tmpctx. */
void clean_tmpctx(void);
#endif /* LIGHTNING_COMMON_UTILS_H */