diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2015-05-29 05:48:31 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-09-19 22:31:04 +0200 |
| commit | 4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8 (patch) | |
| tree | 14b33d958cb88df6195994c78ee74b781e7968a6 /lib/memory.h | |
| parent | lib: migrate to new memory-type handling (diff) | |
| download | frr-4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8.tar.xz frr-4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8.zip | |
*: split & distribute memtypes and stop (re|ab)using lib/ MTYPEs
This is a rather large mechanical commit that splits up the memory types
defined in lib/memtypes.c and distributes them into *_memory.[ch] files
in the individual daemons.
The zebra change is slightly annoying because there is no nice place to
put the #include "zebra_memory.h" statement.
bgpd, ospf6d, isisd and some tests were reusing MTYPEs defined in the
library for its own use. This is bad practice and would break when the
memtype are made static.
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
[CF: rebased for cmaster-next]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'lib/memory.h')
| -rw-r--r-- | lib/memory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/memory.h b/lib/memory.h index e8243f173..2680253d9 100644 --- a/lib/memory.h +++ b/lib/memory.h @@ -138,6 +138,9 @@ struct memgroup DEFINE_MTYPE_ATTR(group, name, static, desc) \ static struct memtype * const MTYPE_ ## name = &_mt_##name; +DECLARE_MGROUP(LIB) +DECLARE_MTYPE(TMP) + extern void *qmalloc (struct memtype *mt, size_t size) __attribute__ ((malloc, _ALLOC_SIZE(2), nonnull (1) _RET_NONNULL)); @@ -172,6 +175,4 @@ extern int qmem_walk (qmem_walk_fn *func, void *arg); extern void memory_oom (size_t size, const char *name); -#include "memtypes.h" - #endif /* _QUAGGA_MEMORY_H */ |