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/pqueue.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/pqueue.c') diff --git a/lib/pqueue.c b/lib/pqueue.c index 69ab8e65d6..0f870564da 100644 --- a/lib/pqueue.c +++ b/lib/pqueue.c @@ -23,6 +23,9 @@ Boston, MA 02111-1307, USA. */ #include "memory.h" #include "pqueue.h" +DEFINE_MTYPE_STATIC(LIB, PQUEUE, "Priority queue") +DEFINE_MTYPE_STATIC(LIB, PQUEUE_DATA, "Priority queue data") + /* priority queue using heap sort */ /* pqueue->cmp() controls the order of sorting (i.e, ascending or -- cgit v1.2.3