mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 01:43:36 +01:00
Code Issues Projects Releases Wiki Activity

common: clean up autodata in common_shutdown().

Browse Source 
valgrind locally complains about the allocations in autodata leaking:

```
==138200== 16 bytes in 1 blocks are still reachable in loss record 1 of 2
==138200==    at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
==138200==    by 0x10D41A: autodata_register_ (autodata.c:20)
==138200==    by 0x10E7B8: register_autotype_type_to_string (type_to_string.h:79)
==138200==    by 0x10F5CA: register_one_type_to_string0 (block.c:259)
==138200==    by 0x19734C: __libc_csu_init (in /home/rusty/devel/cvs/lightning/common/test/run-route-specific)
==138200==    by 0x4A3D03F: (below main) (libc-start.c:264)
==138200== 
==138200== 176 bytes in 1 blocks are still reachable in loss record 2 of 2
==138200==    at 0x483DFAF: realloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
==138200==    by 0x10D472: autodata_register_ (autodata.c:26)
==138200==    by 0x122D37: register_autotype_type_to_string (type_to_string.h:79)
==138200==    by 0x122F1F: register_one_type_to_string0 (node_id.c:50)
==138200==    by 0x19734C: __libc_csu_init (in /home/rusty/devel/cvs/lightning/common/test/run-route-specific)
==138200==    by 0x4A3D03F: (below main) (libc-start.c:264)
==138200== 
make: *** [Makefile:638: unittest/common/test/run-route-specific] Error 7
```
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2021-11-15 04:21:46 +10:30
parent 82c66b10df
commit 68043c2e8c
5 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/autodata.c
View File

@ -38,3 +38,17 @@ void *autodata_get_(const char *typename, size_t *nump)
*nump = t->num;
return t->ptrs;
}
static bool free_one(const char *member,
struct typereg *t, void *unused)
{
free(t->ptrs);
free(t);
return true;
}
void autodata_cleanup(void)
{
strmap_iterate(&typemap, free_one, NULL);
strmap_clear(&typemap);
}

3
common/autodata.h
View File

@ -3,6 +3,7 @@
#include "config.h"
#include <ccan/compiler/compiler.h>
#include <ccan/cppmagic/cppmagic.h>
#include <stddef.h>
#define AUTODATA_TYPE(name, type) \
static inline void register_autotype_##name(const type *t) { \
@ -23,4 +24,6 @@
void autodata_register_(const char *typename, const void *ptr);
void *autodata_get_(const char *typename, size_t *nump);
/* Call on shutdown to keep valgrind leak detection happy. */
void autodata_cleanup(void);
#endif /* LIGHTNING_COMMON_AUTODATA_H */

2
common/setup.c
View File

@ -1,6 +1,7 @@
#include "config.h"
#include <assert.h>
#include <ccan/ccan/err/err.h>
#include <common/autodata.h>
#include <common/setup.h>
#include <common/utils.h>
#include <sodium.h>
@ -58,4 +59,5 @@ void common_shutdown(void)
tal_free(tmpctx);
wally_cleanup(0);
tal_free(wally_tal_ctx);
autodata_cleanup();
}

2
connectd/Makefile
View File

@ -76,6 +76,6 @@ CONNECTD_COMMON_OBJS := \
lightningd/lightning_connectd: $(CONNECTD_OBJS) $(CONNECTD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(HSMD_CLIENT_OBJS)
lightningd/lightning_websocketd: $(WEBSOCKETD_OBJS) common/setup.o common/utils.o
lightningd/lightning_websocketd: $(WEBSOCKETD_OBJS) common/setup.o common/utils.o common/autodata.o
include connectd/test/Makefile

2
tests/plugins/Makefile
View File

@ -8,7 +8,7 @@ $(PLUGIN_TESTLIBPLUGIN_OBJS): $(PLUGIN_LIB_HEADER)
PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_SRC := tests/plugins/test_selfdisable_after_getmanifest.c
PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_OBJS := $(PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_SRC:.c=.o)
tests/plugins/test_selfdisable_after_getmanifest: bitcoin/chainparams.o $(PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_OBJS) common/json.o common/json_stream.o common/setup.o common/utils.o $(JSMN_OBJS) $(CCAN_OBJS)
tests/plugins/test_selfdisable_after_getmanifest: bitcoin/chainparams.o $(PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_OBJS) common/autodata.o common/json.o common/json_stream.o common/setup.o common/utils.o $(JSMN_OBJS) $(CCAN_OBJS)
# Make sure these depend on everything.
ALL_TEST_PROGRAMS += tests/plugins/test_libplugin tests/plugins/test_selfdisable_after_getmanifest