From 4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 29 May 2015 05:48:31 +0200 Subject: *: 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 Acked-by: Donald Sharp [CF: rebased for cmaster-next] Signed-off-by: David Lamparter Signed-off-by: Christian Franke --- lib/thread.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/thread.c') diff --git a/lib/thread.c b/lib/thread.c index 573e9f725d..a26eb6bfd2 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -32,6 +32,10 @@ #include "command.h" #include "sigevent.h" +DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread") +DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master") +DEFINE_MTYPE_STATIC(LIB, THREAD_STATS, "Thread stats") + #if defined(__APPLE__) #include #include -- cgit v1.2.3