forked from Mirror/frr
lib: move memory.[ch] out of the way
The following commit will recreate memory.[ch]. Signed-off-by: David Lamparter <equinox@opensourcerouting.org> Acked-by: Vincent JARDIN <vincent.jardin@6wind.com> Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
David Lamparter
Christian Franke
parent
49d41a26c6
commit
6ba26ad5d2
|
|
@ -10,11 +10,11 @@ libzebra_la_LDFLAGS = -version-info 0:0:0
|
|||
libzebra_la_SOURCES = \
|
||||
network.c pid_output.c getopt.c getopt1.c daemon.c \
|
||||
checksum.c vector.c linklist.c vty.c command.c \
|
||||
sockunion.c prefix.c thread.c if.c memory.c buffer.c table.c hash.c \
|
||||
sockunion.c prefix.c thread.c if.c buffer.c table.c hash.c \
|
||||
filter.c routemap.c distribute.c stream.c str.c log.c plist.c \
|
||||
zclient.c sockopt.c smux.c agentx.c snmp.c md5.c if_rmap.c keychain.c privs.c \
|
||||
sigevent.c pqueue.c jhash.c memtypes.c workqueue.c nexthop.c json.c \
|
||||
ptm_lib.c csv.c bfd.c vrf.c systemd.c ns.c
|
||||
ptm_lib.c csv.c bfd.c vrf.c systemd.c ns.c memory_vty.c
|
||||
|
||||
BUILT_SOURCES = memtypes.h route_types.h gitversion.h
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ pkginclude_HEADERS = \
|
|||
privs.h sigevent.h pqueue.h jhash.h zassert.h memtypes.h \
|
||||
workqueue.h route_types.h libospf.h nexthop.h json.h \
|
||||
ptm_lib.h csv.h bfd.h vrf.h ns.h systemd.h bitfield.h \
|
||||
fifo.h
|
||||
fifo.h memory_vty.h
|
||||
|
||||
noinst_HEADERS = \
|
||||
plist_int.h
|
||||
|
|
|
|||
98
lib/memory.h
98
lib/memory.h
|
|
@ -1,96 +1,2 @@
|
|||
/* Memory management routine
|
||||
Copyright (C) 1998 Kunihiro Ishiguro
|
||||
|
||||
This file is part of GNU Zebra.
|
||||
|
||||
GNU Zebra 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.
|
||||
|
||||
GNU Zebra 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 GNU Zebra; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
02111-1307, USA. */
|
||||
|
||||
#ifndef _ZEBRA_MEMORY_H
|
||||
#define _ZEBRA_MEMORY_H
|
||||
|
||||
#define array_size(ar) (sizeof(ar) / sizeof(ar[0]))
|
||||
|
||||
/* For pretty printing of memory allocate information. */
|
||||
struct memory_list
|
||||
{
|
||||
int index;
|
||||
const char *format;
|
||||
};
|
||||
|
||||
struct mlist {
|
||||
struct memory_list *list;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
#include "lib/memtypes.h"
|
||||
|
||||
extern struct mlist mlists[];
|
||||
|
||||
/* #define MEMORY_LOG */
|
||||
#ifdef MEMORY_LOG
|
||||
#define XMALLOC(mtype, size) \
|
||||
mtype_zmalloc (__FILE__, __LINE__, (mtype), (size))
|
||||
#define XCALLOC(mtype, size) \
|
||||
mtype_zcalloc (__FILE__, __LINE__, (mtype), (size))
|
||||
#define XREALLOC(mtype, ptr, size) \
|
||||
mtype_zrealloc (__FILE__, __LINE__, (mtype), (ptr), (size))
|
||||
#define XFREE(mtype, ptr) \
|
||||
do { \
|
||||
mtype_zfree (__FILE__, __LINE__, (mtype), (ptr)); \
|
||||
ptr = NULL; } \
|
||||
while (0)
|
||||
#define XSTRDUP(mtype, str) \
|
||||
mtype_zstrdup (__FILE__, __LINE__, (mtype), (str))
|
||||
#else
|
||||
#define XMALLOC(mtype, size) zmalloc ((mtype), (size))
|
||||
#define XCALLOC(mtype, size) zzcalloc ((mtype), (size))
|
||||
#define XREALLOC(mtype, ptr, size) zrealloc ((mtype), (ptr), (size))
|
||||
#define XFREE(mtype, ptr) do { \
|
||||
zfree ((mtype), (ptr)); \
|
||||
ptr = NULL; } \
|
||||
while (0)
|
||||
#define XSTRDUP(mtype, str) zstrdup ((mtype), (str))
|
||||
#endif /* MEMORY_LOG */
|
||||
|
||||
/* Prototypes of memory function. */
|
||||
extern void *zmalloc (int type, size_t size);
|
||||
extern void *zzcalloc (int type, size_t size);
|
||||
extern void *zrealloc (int type, void *ptr, size_t size);
|
||||
extern void zfree (int type, void *ptr);
|
||||
extern char *zstrdup (int type, const char *str);
|
||||
|
||||
extern void *mtype_zmalloc (const char *file, int line, int type, size_t size);
|
||||
|
||||
extern void *mtype_zcalloc (const char *file, int line, int type, size_t size);
|
||||
|
||||
extern void *mtype_zrealloc (const char *file, int line, int type, void *ptr,
|
||||
size_t size);
|
||||
|
||||
extern void mtype_zfree (const char *file, int line, int type,
|
||||
void *ptr);
|
||||
|
||||
extern char *mtype_zstrdup (const char *file, int line, int type,
|
||||
const char *str);
|
||||
extern void memory_init (void);
|
||||
extern void log_memstats_stderr (const char *);
|
||||
|
||||
/* return number of allocations outstanding for the type */
|
||||
extern unsigned long mtype_stats_alloc (int);
|
||||
|
||||
/* Human friendly string for given byte count */
|
||||
#define MTYPE_MEMSTR_LEN 20
|
||||
extern const char *mtype_memstr (char *, size_t, unsigned long);
|
||||
#endif /* _ZEBRA_MEMORY_H */
|
||||
/* temporary */
|
||||
#include "memory_vty.h"
|
||||
|
|
|
|||
96
lib/memory_vty.h
Normal file
96
lib/memory_vty.h
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
/* Memory management routine
|
||||
Copyright (C) 1998 Kunihiro Ishiguro
|
||||
|
||||
This file is part of GNU Zebra.
|
||||
|
||||
GNU Zebra 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.
|
||||
|
||||
GNU Zebra 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 GNU Zebra; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
02111-1307, USA. */
|
||||
|
||||
#ifndef _ZEBRA_MEMORY_VTY_H
|
||||
#define _ZEBRA_MEMORY_VTY_H
|
||||
|
||||
#define array_size(ar) (sizeof(ar) / sizeof(ar[0]))
|
||||
|
||||
/* For pretty printing of memory allocate information. */
|
||||
struct memory_list
|
||||
{
|
||||
int index;
|
||||
const char *format;
|
||||
};
|
||||
|
||||
struct mlist {
|
||||
struct memory_list *list;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
#include "lib/memtypes.h"
|
||||
|
||||
extern struct mlist mlists[];
|
||||
|
||||
/* #define MEMORY_LOG */
|
||||
#ifdef MEMORY_LOG
|
||||
#define XMALLOC(mtype, size) \
|
||||
mtype_zmalloc (__FILE__, __LINE__, (mtype), (size))
|
||||
#define XCALLOC(mtype, size) \
|
||||
mtype_zcalloc (__FILE__, __LINE__, (mtype), (size))
|
||||
#define XREALLOC(mtype, ptr, size) \
|
||||
mtype_zrealloc (__FILE__, __LINE__, (mtype), (ptr), (size))
|
||||
#define XFREE(mtype, ptr) \
|
||||
do { \
|
||||
mtype_zfree (__FILE__, __LINE__, (mtype), (ptr)); \
|
||||
ptr = NULL; } \
|
||||
while (0)
|
||||
#define XSTRDUP(mtype, str) \
|
||||
mtype_zstrdup (__FILE__, __LINE__, (mtype), (str))
|
||||
#else
|
||||
#define XMALLOC(mtype, size) zmalloc ((mtype), (size))
|
||||
#define XCALLOC(mtype, size) zcalloc ((mtype), (size))
|
||||
#define XREALLOC(mtype, ptr, size) zrealloc ((mtype), (ptr), (size))
|
||||
#define XFREE(mtype, ptr) do { \
|
||||
zfree ((mtype), (ptr)); \
|
||||
ptr = NULL; } \
|
||||
while (0)
|
||||
#define XSTRDUP(mtype, str) zstrdup ((mtype), (str))
|
||||
#endif /* MEMORY_LOG */
|
||||
|
||||
/* Prototypes of memory function. */
|
||||
extern void *zmalloc (int type, size_t size);
|
||||
extern void *zcalloc (int type, size_t size);
|
||||
extern void *zrealloc (int type, void *ptr, size_t size);
|
||||
extern void zfree (int type, void *ptr);
|
||||
extern char *zstrdup (int type, const char *str);
|
||||
|
||||
extern void *mtype_zmalloc (const char *file, int line, int type, size_t size);
|
||||
|
||||
extern void *mtype_zcalloc (const char *file, int line, int type, size_t size);
|
||||
|
||||
extern void *mtype_zrealloc (const char *file, int line, int type, void *ptr,
|
||||
size_t size);
|
||||
|
||||
extern void mtype_zfree (const char *file, int line, int type,
|
||||
void *ptr);
|
||||
|
||||
extern char *mtype_zstrdup (const char *file, int line, int type,
|
||||
const char *str);
|
||||
extern void memory_init (void);
|
||||
extern void log_memstats_stderr (const char *);
|
||||
|
||||
/* return number of allocations outstanding for the type */
|
||||
extern unsigned long mtype_stats_alloc (int);
|
||||
|
||||
/* Human friendly string for given byte count */
|
||||
#define MTYPE_MEMSTR_LEN 20
|
||||
extern const char *mtype_memstr (char *, size_t, unsigned long);
|
||||
#endif /* _ZEBRA_MEMORY_VTY_H */
|
||||
Loading…
Reference in a new issue