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 /pimd/pim_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 'pimd/pim_memory.h')
| -rw-r--r-- | pimd/pim_memory.h | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/pimd/pim_memory.h b/pimd/pim_memory.h new file mode 100644 index 000000000..81841e58b --- /dev/null +++ b/pimd/pim_memory.h @@ -0,0 +1,42 @@ +/* pimd memory type declarations + * + * Copyright (C) 2015 David Lamparter + * + * This file is part of Quagga. + * + * Quagga is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * Quagga is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _QUAGGA_PIM_MEMORY_H +#define _QUAGGA_PIM_MEMORY_H + +#include "memory.h" + +DECLARE_MGROUP(PIMD) +DECLARE_MTYPE(PIM_CHANNEL_OIL) +DECLARE_MTYPE(PIM_INTERFACE) +DECLARE_MTYPE(PIM_IGMP_JOIN) +DECLARE_MTYPE(PIM_IGMP_SOCKET) +DECLARE_MTYPE(PIM_IGMP_GROUP) +DECLARE_MTYPE(PIM_IGMP_GROUP_SOURCE) +DECLARE_MTYPE(PIM_NEIGHBOR) +DECLARE_MTYPE(PIM_IFCHANNEL) +DECLARE_MTYPE(PIM_UPSTREAM) +DECLARE_MTYPE(PIM_SSMPINGD) +DECLARE_MTYPE(PIM_STATIC_ROUTE) +DECLARE_MTYPE(PIM_BR) + +#endif /* _QUAGGA_PIM_MEMORY_H */ |