davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

log: don't leak log prefixes.

Browse Source 
Do proper refcounting on log prefixes; previously we kept them around,
which is fine, but the extra notleak() and backtrace in developer mode
could get quite heavy (I ended up with 1G of backtraces!).  This is
mainly due to creating one on every JSONRPC command, and running
clboss.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: lightningd: remove slow memory leak in DEVELOPER builds.
This commit is contained in:
Rusty Russell
2021-11-25 06:29:18 +10:30
parent 86e49e0273
commit 0b45d862fe
4 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lightningd/log.c
View File

@@ -55,12 +55,34 @@ struct log_book {
struct log {
struct log_book *lr;
const struct node_id *default_node_id;
const char *prefix;
struct log_prefix *prefix;
/* Non-NULL once it's been initialized */
enum log_level *print_level;
};
static struct log_prefix *log_prefix_new(const tal_t *ctx,
const char *prefix TAKES)
{
struct log_prefix *lp = tal(ctx, struct log_prefix);
lp->refcnt = 1;
lp->prefix = tal_strdup(lp, prefix);
return lp;
}
static void log_prefix_drop(struct log_prefix *lp)
{
if (--lp->refcnt == 0)
tal_free(lp);
}
static struct log_prefix *log_prefix_get(struct log_prefix *lp)
{
assert(lp->refcnt);
lp->refcnt++;
return lp;
}
/* Avoids duplicate node_id entries. */
struct node_id_cache {
size_t count;
@@ -184,6 +206,7 @@ static size_t delete_entry(struct log_book *log, struct log_entry *i)
if (i->nc && --i->nc->count == 0)
tal_free(i->nc);
free(i->log);
log_prefix_drop(i->prefix);
tal_free(i->io);
return 1 + i->skipped;
@@ -254,13 +277,14 @@ struct log_book *new_log_book(struct lightningd *ld, size_t max_mem)
return lr;
}
static enum log_level filter_level(struct log_book *lr, const char *prefix)
static enum log_level filter_level(struct log_book *lr,
const struct log_prefix *lp)
{
struct print_filter *i;
assert(lr->default_print_level != NULL);
list_for_each(&lr->print_filters, i, list) {
if (strstr(prefix, i->prefix))
if (strstr(lp->prefix, i->prefix))
return i->level;
}
return *lr->default_print_level;
@@ -277,9 +301,9 @@ new_log(const tal_t *ctx, struct log_book *record,
log->lr = tal_link(log, record);
va_start(ap, fmt);
/* log->lr owns this, since its entries keep a pointer to it. */
/* FIXME: Refcount this! */
log->prefix = notleak(tal_vfmt(log->lr, fmt, ap));
/* Owned by the log book itself, since it can be referenced
* by log entries, too */
log->prefix = log_prefix_new(log->lr, take(tal_vfmt(NULL, fmt, ap)));
va_end(ap);
if (default_node_id)
log->default_node_id = tal_dup(log, struct node_id,
@@ -294,7 +318,7 @@ new_log(const tal_t *ctx, struct log_book *record,
const char *log_prefix(const struct log *log)
{
return log->prefix;
return log->prefix->prefix;
}
enum log_level log_print_level(struct log *log)
@@ -343,7 +367,7 @@ static struct log_entry *new_log_entry(struct log *log, enum log_level level,
l->time = time_now();
l->level = level;
l->skipped = 0;
l->prefix = log->prefix;
l->prefix = log_prefix_get(log->prefix);
l->io = NULL;
if (!node_id)
node_id = log->default_node_id;
@@ -367,7 +391,7 @@ static struct log_entry *new_log_entry(struct log *log, enum log_level level,
static void maybe_print(struct log *log, const struct log_entry *l)
{
if (l->level >= log_print_level(log))
log_to_file(log->prefix, l->level,
log_to_file(log->prefix->prefix, l->level,
l->nc ? &l->nc->node_id : NULL,
&l->time, l->log,
l->io, tal_bytelen(l->io),
@@ -417,7 +441,7 @@ void log_io(struct log *log, enum log_level dir,
/* Print first, in case we need to truncate. */
if (l->level >= log_print_level(log))
log_to_file(log->prefix, l->level,
log_to_file(log->prefix->prefix, l->level,
l->nc ? &l->nc->node_id : NULL,
&l->time, str,
data, len,
@@ -482,7 +506,7 @@ static void log_each_line_(const struct log_book *lr,
func(l->skipped, time_between(l->time, lr->init_time),
l->level, l->nc ? &l->nc->node_id : NULL,
l->prefix, l->log, l->io, arg);
l->prefix->prefix, l->log, l->io, arg);
}
}
@@ -585,13 +609,14 @@ static void show_log_level(char buf[OPT_SHOW_LEN], const struct log *log)
static char *arg_log_prefix(const char *arg, struct log *log)
{
/* log->lr owns this, since it keeps a pointer to it. */
log->prefix = tal_strdup(log->lr, arg);
tal_free(log->prefix);
log->prefix = log_prefix_new(log->lr, arg);
return NULL;
}
static void show_log_prefix(char buf[OPT_SHOW_LEN], const struct log *log)
{
strncpy(buf, log->prefix, OPT_SHOW_LEN);
strncpy(buf, log->prefix->prefix, OPT_SHOW_LEN);
}
static int signalfds[2];
@@ -712,7 +737,7 @@ void logging_options_parsed(struct log_book *lr)
const struct log_entry *l = &lr->log[i];
if (l->level >= filter_level(lr, l->prefix))
log_to_file(l->prefix, l->level,
log_to_file(l->prefix->prefix, l->level,
l->nc ? &l->nc->node_id : NULL,
&l->time, l->log,
l->io, tal_bytelen(l->io),

9
lightningd/log.h
View File

@@ -69,12 +69,19 @@ struct command_result *param_loglevel(struct command *cmd,
const jsmntok_t *tok,
enum log_level **level);
/* Reference counted log_prefix. Log entries keep a pointer, and they
* can outlast the log entry point which created them. */
struct log_prefix {
size_t refcnt;
const char *prefix;
};
struct log_entry {
struct timeabs time;
enum log_level level;
unsigned int skipped;
struct node_id_cache *nc;
const char *prefix;
struct log_prefix *prefix;
char *log;
/* Iff LOG_IO */
const u8 *io;

2
lightningd/notification.c
View File

@@ -108,7 +108,7 @@ static void warning_notification_serialize(struct json_stream *stream,
* the absolute time, like when channels failed. */
json_add_time(stream, "time", l->time.ts);
json_add_timeiso(stream, "timestamp", &l->time);
json_add_string(stream, "source", l->prefix);
json_add_string(stream, "source", l->prefix->prefix);
json_add_string(stream, "log", l->log);
json_object_end(stream); /* .warning */
}

3
lightningd/test/run-log-pruning.c
View File

@@ -110,7 +110,8 @@ int main(int argc, char *argv[])
assert(lb->log[i].level == LOG_DBG);
assert(lb->log[i].skipped == 0);
assert(lb->log[i].nc == NULL);
assert(streq(lb->log[i].prefix, "test prefix"));
assert(lb->log[i].prefix->refcnt == 101);
assert(streq(lb->log[i].prefix->prefix, "test prefix"));
assert(streq(lb->log[i].log, tal_fmt(lb, "test %06zi", i)));
assert(lb->log[i].io == NULL);
}