1 files changed, 10 insertions, 260 deletions

diff --git a/lib/memory_vty.c b/lib/memory_vty.c
index 8084aeba0f..fa9f50a23a 100644
--- a/lib/memory_vty.c
+++ b/lib/memory_vty.c
@@ -28,267 +28,17 @@
 
 #include "log.h"
 #include "memory.h"
-
-static void alloc_inc (int);
-static void alloc_dec (int);
-static void log_memstats(int log_priority);
-
-static const struct message mstr [] =
-{
-  { MTYPE_THREAD, "thread" },
-  { MTYPE_THREAD_MASTER, "thread_master" },
-  { MTYPE_VECTOR, "vector" },
-  { MTYPE_VECTOR_INDEX, "vector_index" },
-  { MTYPE_IF, "interface" },
-  { 0, NULL },
-};
-
-/* Fatal memory allocation error occured. */
-static void __attribute__ ((noreturn))
-zerror (const char *fname, int type, size_t size)
-{
-  zlog_err ("%s : can't allocate memory for `%s' size %d: %s\n", 
-	    fname, lookup (mstr, type), (int) size, safe_strerror(errno));
-  log_memstats(LOG_WARNING);
-  /* N.B. It might be preferable to call zlog_backtrace_sigsafe here, since
-     that function should definitely be safe in an OOM condition.  But
-     unfortunately zlog_backtrace_sigsafe does not support syslog logging at
-     this time... */
-  zlog_backtrace(LOG_WARNING);
-  abort();
-}
-
-/*
- * Allocate memory of a given size, to be tracked by a given type.
- * Effects: Returns a pointer to usable memory.  If memory cannot
- * be allocated, aborts execution.
- */
-void *
-zmalloc (int type, size_t size)
-{
-  void *memory;
-
-  memory = malloc (size);
-
-  if (memory == NULL)
-    zerror ("malloc", type, size);
-
-  alloc_inc (type);
-
-  return memory;
-}
-
-/*
- * Allocate memory as in zmalloc, and also clear the memory.
- * Add an extra 'z' prefix to function name to avoid collision when linking
- * statically with zlib that exports the 'zcalloc' symbol.
- */
-void *
-zzcalloc (int type, size_t size)
-{
-  void *memory;
-
-  memory = calloc (1, size);
-
-  if (memory == NULL)
-    zerror ("calloc", type, size);
-
-  alloc_inc (type);
-
-  return memory;
-}
-
-/* 
- * Given a pointer returned by zmalloc or zzcalloc, free it and
- * return a pointer to a new size, basically acting like realloc().
- * Requires: ptr was returned by zmalloc, zzcalloc, or zrealloc with the
- * same type.
- * Effects: Returns a pointer to the new memory, or aborts.
- */
-void *
-zrealloc (int type, void *ptr, size_t size)
-{
-  void *memory;
-
-  if (ptr == NULL)              /* is really alloc */
-      return zzcalloc(type, size);
-
-  memory = realloc (ptr, size);
-  if (memory == NULL)
-    zerror ("realloc", type, size);
-  if (ptr == NULL)
-    alloc_inc (type);
-
-  return memory;
-}
-
-/*
- * Free memory allocated by z*alloc or zstrdup.
- * Requires: ptr was returned by zmalloc, zzcalloc, or zrealloc with the
- * same type.
- * Effects: The memory is freed and may no longer be referenced.
- */
-void
-zfree (int type, void *ptr)
-{
-  if (ptr != NULL)
-    {
-      alloc_dec (type);
-      free (ptr);
-    }
-}
-
-/*
- * Duplicate a string, counting memory usage by type.
- * Effects: The string is duplicated, and the return value must
- * eventually be passed to zfree with the same type.  The function will
- * succeed or abort.
- */
-char *
-zstrdup (int type, const char *str)
-{
-  void *dup;
-
-  dup = strdup (str);
-  if (dup == NULL)
-    zerror ("strdup", type, strlen (str));
-  alloc_inc (type);
-  return dup;
-}
-
-#ifdef MEMORY_LOG
-static struct 
-{
-  const char *name;
-  long alloc;
-  unsigned long t_malloc;
-  unsigned long c_malloc;
-  unsigned long t_calloc;
-  unsigned long c_calloc;
-  unsigned long t_realloc;
-  unsigned long t_free;
-  unsigned long c_strdup;
-} mstat [MTYPE_MAX];
-
-static void
-mtype_log (char *func, void *memory, const char *file, int line, int type)
-{
-  zlog_debug ("%s: %s %p %s %d", func, lookup (mstr, type), memory, file, line);
-}
-
-void *
-mtype_zmalloc (const char *file, int line, int type, size_t size)
-{
-  void *memory;
-
-  mstat[type].c_malloc++;
-  mstat[type].t_malloc++;
-
-  memory = zmalloc (type, size);
-  mtype_log ("zmalloc", memory, file, line, type);
-
-  return memory;
-}
-
-void *
-mtype_zcalloc (const char *file, int line, int type, size_t size)
-{
-  void *memory;
-
-  mstat[type].c_calloc++;
-  mstat[type].t_calloc++;
-
-  memory = zzcalloc (type, size);
-  mtype_log ("xcalloc", memory, file, line, type);
-
-  return memory;
-}
-
-void *
-mtype_zrealloc (const char *file, int line, int type, void *ptr, size_t size)
-{
-  void *memory;
-
-  /* Realloc need before allocated pointer. */
-  mstat[type].t_realloc++;
-
-  memory = zrealloc (type, ptr, size);
-
-  mtype_log ("xrealloc", memory, file, line, type);
-
-  return memory;
-}
-
-/* Important function. */
-void 
-mtype_zfree (const char *file, int line, int type, void *ptr)
-{
-  mstat[type].t_free++;
-
-  mtype_log ("xfree", ptr, file, line, type);
-
-  zfree (type, ptr);
-}
-
-char *
-mtype_zstrdup (const char *file, int line, int type, const char *str)
-{
-  char *memory;
-
-  mstat[type].c_strdup++;
-
-  memory = zstrdup (type, str);
-  
-  mtype_log ("xstrdup", memory, file, line, type);
-
-  return memory;
-}
-#else
-static struct 
-{
-  char *name;
-  long alloc;
-} mstat [MTYPE_MAX];
-#endif /* MEMORY_LOG */
-
-/* Increment allocation counter. */
-static void
-alloc_inc (int type)
-{
-  mstat[type].alloc++;
-}
-
-/* Decrement allocation counter. */
-static void
-alloc_dec (int type)
-{
-  mstat[type].alloc--;
-}
+#include "memory_vty.h"
 
 /* Looking up memory status from vty interface. */
 #include "vector.h"
 #include "vty.h"
 #include "command.h"
 
-static void
-log_memstats(int pri)
-{
-  struct mlist *ml;
-
-  for (ml = mlists; ml->list; ml++)
-    {
-      struct memory_list *m;
-
-      zlog (NULL, pri, "Memory utilization in module %s:", ml->name);
-      for (m = ml->list; m->index >= 0; m++)
-	if (m->index && mstat[m->index].alloc)
-	  zlog (NULL, pri, "  %-30s: %10ld", m->format, mstat[m->index].alloc);
-    }
-}
-
 void
 log_memstats_stderr (const char *prefix)
 {
+#if 0
   struct mlist *ml;
   struct memory_list *m;
   int i;
@@ -325,8 +75,10 @@ log_memstats_stderr (const char *prefix)
     fprintf (stderr,
              "%s: memstats: No remaining tracked memory utilization.\n",
              prefix);
+#endif
 }
 
+#if 0
 static void
 show_separator(struct vty *vty)
 {
@@ -355,6 +107,7 @@ show_memory_vty (struct vty *vty, struct memory_list *list)
       }
   return needsep;
 }
+#endif
 
 #ifdef HAVE_MALLINFO
 static int
@@ -421,19 +174,22 @@ DEFUN (show_memory,
        "Show running system information\n"
        "Memory statistics\n")
 {
-  struct mlist *ml;
   int needsep = 0;
   
 #ifdef HAVE_MALLINFO
   needsep = show_memory_mallinfo (vty);
 #endif /* HAVE_MALLINFO */
-  
+
+  (void) needsep;
+#if 0
+  struct mlist *ml;
   for (ml = mlists; ml->list; ml++)
     {
       if (needsep)
 	show_separator (vty);
       needsep = show_memory_vty (vty, ml->list);
     }
+#endif
 
   qmem_walk(qmem_walker, vty);
   return CMD_SUCCESS;
@@ -498,9 +254,3 @@ mtype_memstr (char *buf, size_t len, unsigned long bytes)
   
   return buf;
 }
-
-unsigned long
-mtype_stats_alloc (int type)
-{
-  return mstat[type].alloc;
-}