Browse Source
The tal overhead of 5 pointers, the linked list node is 2; and we also tal'd the string. That's 96 bytes per entry. Use a simple array instead, though it means more work on deletion since each log_entry is no longer a tal object. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>travis-debug
Rusty Russell
5 years ago
4 changed files with 204 additions and 40 deletions
@ -0,0 +1,128 @@ |
|||
#include "../log.c" |
|||
|
|||
/* AUTOGENERATED MOCKS START */ |
|||
/* Generated stub for bigsize_get */ |
|||
size_t bigsize_get(const u8 *p UNNEEDED, size_t max UNNEEDED, bigsize_t *val UNNEEDED) |
|||
{ fprintf(stderr, "bigsize_get called!\n"); abort(); } |
|||
/* Generated stub for bigsize_put */ |
|||
size_t bigsize_put(u8 buf[BIGSIZE_MAX_LEN] UNNEEDED, bigsize_t v UNNEEDED) |
|||
{ fprintf(stderr, "bigsize_put called!\n"); abort(); } |
|||
/* Generated stub for command_fail */ |
|||
struct command_result *command_fail(struct command *cmd UNNEEDED, int code UNNEEDED, |
|||
const char *fmt UNNEEDED, ...) |
|||
|
|||
{ fprintf(stderr, "command_fail called!\n"); abort(); } |
|||
/* Generated stub for command_param_failed */ |
|||
struct command_result *command_param_failed(void) |
|||
|
|||
{ fprintf(stderr, "command_param_failed called!\n"); abort(); } |
|||
/* Generated stub for command_success */ |
|||
struct command_result *command_success(struct command *cmd UNNEEDED, |
|||
struct json_stream *response) |
|||
|
|||
{ fprintf(stderr, "command_success called!\n"); abort(); } |
|||
/* Generated stub for json_add_hex_talarr */ |
|||
void json_add_hex_talarr(struct json_stream *result UNNEEDED, |
|||
const char *fieldname UNNEEDED, |
|||
const tal_t *data UNNEEDED) |
|||
{ fprintf(stderr, "json_add_hex_talarr called!\n"); abort(); } |
|||
/* Generated stub for json_add_member */ |
|||
void json_add_member(struct json_stream *js UNNEEDED, |
|||
const char *fieldname UNNEEDED, |
|||
bool quote UNNEEDED, |
|||
const char *fmt UNNEEDED, ...) |
|||
{ fprintf(stderr, "json_add_member called!\n"); abort(); } |
|||
/* Generated stub for json_add_node_id */ |
|||
void json_add_node_id(struct json_stream *response UNNEEDED, |
|||
const char *fieldname UNNEEDED, |
|||
const struct node_id *id UNNEEDED) |
|||
{ fprintf(stderr, "json_add_node_id called!\n"); abort(); } |
|||
/* Generated stub for json_add_num */ |
|||
void json_add_num(struct json_stream *result UNNEEDED, const char *fieldname UNNEEDED, |
|||
unsigned int value UNNEEDED) |
|||
{ fprintf(stderr, "json_add_num called!\n"); abort(); } |
|||
/* Generated stub for json_add_string */ |
|||
void json_add_string(struct json_stream *result UNNEEDED, const char *fieldname UNNEEDED, const char *value UNNEEDED) |
|||
{ fprintf(stderr, "json_add_string called!\n"); abort(); } |
|||
/* Generated stub for json_add_time */ |
|||
void json_add_time(struct json_stream *result UNNEEDED, const char *fieldname UNNEEDED, |
|||
struct timespec ts UNNEEDED) |
|||
{ fprintf(stderr, "json_add_time called!\n"); abort(); } |
|||
/* Generated stub for json_array_end */ |
|||
void json_array_end(struct json_stream *js UNNEEDED) |
|||
{ fprintf(stderr, "json_array_end called!\n"); abort(); } |
|||
/* Generated stub for json_array_start */ |
|||
void json_array_start(struct json_stream *js UNNEEDED, const char *fieldname UNNEEDED) |
|||
{ fprintf(stderr, "json_array_start called!\n"); abort(); } |
|||
/* Generated stub for json_object_end */ |
|||
void json_object_end(struct json_stream *js UNNEEDED) |
|||
{ fprintf(stderr, "json_object_end called!\n"); abort(); } |
|||
/* Generated stub for json_object_start */ |
|||
void json_object_start(struct json_stream *ks UNNEEDED, const char *fieldname UNNEEDED) |
|||
{ fprintf(stderr, "json_object_start called!\n"); abort(); } |
|||
/* Generated stub for json_stream_log_suppress_for_cmd */ |
|||
void json_stream_log_suppress_for_cmd(struct json_stream *js UNNEEDED, |
|||
const struct command *cmd UNNEEDED) |
|||
{ fprintf(stderr, "json_stream_log_suppress_for_cmd called!\n"); abort(); } |
|||
/* Generated stub for json_stream_success */ |
|||
struct json_stream *json_stream_success(struct command *cmd UNNEEDED) |
|||
{ fprintf(stderr, "json_stream_success called!\n"); abort(); } |
|||
/* Generated stub for node_id_to_hexstr */ |
|||
char *node_id_to_hexstr(const tal_t *ctx UNNEEDED, const struct node_id *id UNNEEDED) |
|||
{ fprintf(stderr, "node_id_to_hexstr called!\n"); abort(); } |
|||
/* Generated stub for notify_warning */ |
|||
void notify_warning(struct lightningd *ld UNNEEDED, struct log_entry *l UNNEEDED) |
|||
{ fprintf(stderr, "notify_warning called!\n"); abort(); } |
|||
/* Generated stub for param */ |
|||
bool param(struct command *cmd UNNEEDED, const char *buffer UNNEEDED, |
|||
const jsmntok_t params[] UNNEEDED, ...) |
|||
{ fprintf(stderr, "param called!\n"); abort(); } |
|||
/* AUTOGENERATED MOCKS END */ |
|||
|
|||
int main(void) |
|||
{ |
|||
struct log_book *lb; |
|||
struct log *l; |
|||
|
|||
setup_locale(); |
|||
lb = new_log_book(NULL, |
|||
(sizeof(struct log_entry) + sizeof("test XXXXXX")) |
|||
*100); |
|||
l = new_log(lb, lb, NULL, "test %s", "prefix"); |
|||
|
|||
assert(streq(log_prefix(l), "test prefix")); |
|||
|
|||
for (size_t i = 0; i < 100; i++) |
|||
log_debug(l, "test %06zi", i); |
|||
|
|||
assert(lb->num_entries == 100); |
|||
for (size_t i = 0; i < 100; i++) { |
|||
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(streq(lb->log[i].log, tal_fmt(lb, "test %06zi", i))); |
|||
assert(lb->log[i].io == NULL); |
|||
} |
|||
|
|||
log_debug(l, "final test message"); |
|||
assert(lb->num_entries < 100); |
|||
assert(lb->num_entries > 11); |
|||
|
|||
/* last 10% must be preserved exactly (with final and pruning
|
|||
* msg appended) */ |
|||
for (size_t i = 91; i < 100; i++) { |
|||
size_t pos = lb->num_entries - 2 - (100 - i); |
|||
assert(streq(lb->log[pos].log, tal_fmt(lb, "test %06zi", i))); |
|||
} |
|||
assert(streq(lb->log[lb->num_entries - 2].log, "final test message")); |
|||
|
|||
/* Sum should still reflect 102 total messages */ |
|||
size_t total = 0; |
|||
for (size_t i = 0; i < lb->num_entries; i++) |
|||
total += 1 + lb->log[i].skipped; |
|||
assert(total == 102); |
|||
|
|||
/* Freeing (last) log frees logbook */ |
|||
tal_free(l); |
|||
} |
|||
Loading…
Reference in new issue