diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-04 03:04:36 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-04 03:04:36 +0100 |
| commit | 406aadbf8ec3605115ba9a83d4994c2b61d0f5b3 (patch) | |
| tree | 5d51e649569435ffa45591edededeba58c9d4b9a /lib/memory.c | |
| parent | 2d3b742ab0c15303e008cd83f15bea869107fab9 (diff) | |
| parent | 6cf8c261d41624992f55b195aa52f8867c6833c7 (diff) | |
| download | quagga-406aadbf8ec3605115ba9a83d4994c2b61d0f5b3.tar.bz2 quagga-406aadbf8ec3605115ba9a83d4994c2b61d0f5b3.tar.xz | |
Merge remote branch 'qpimd/pim' into merged/pimd
Conflicts:
configure.ac
lib/zebra.h
vtysh/vtysh.c
Diffstat (limited to 'lib/memory.c')
| -rw-r--r-- | lib/memory.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/memory.c b/lib/memory.c index dc09d8a6..6291bf0d 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -1,6 +1,7 @@ /* * Memory management routine * Copyright (C) 1998 Kunihiro Ishiguro + * Portions Copyright (c) 2008 Everton da Silva Marques <everton.marques@gmail.com> * * This file is part of GNU Zebra. * @@ -482,6 +483,17 @@ DEFUN (show_memory_isis, return CMD_SUCCESS; } +DEFUN (show_memory_pim, + show_memory_pim_cmd, + "show memory pim", + SHOW_STR + "Memory statistics\n" + "PIM memory\n") +{ + show_memory_vty (vty, memory_list_pim); + return CMD_SUCCESS; +} + void memory_init (void) { @@ -504,6 +516,7 @@ memory_init (void) install_element (VIEW_NODE, &show_memory_ospf_cmd); install_element (VIEW_NODE, &show_memory_ospf6_cmd); install_element (VIEW_NODE, &show_memory_isis_cmd); + install_element (VIEW_NODE, &show_memory_pim_cmd); install_element (ENABLE_NODE, &show_memory_cmd); install_element (ENABLE_NODE, &show_memory_all_cmd); @@ -514,7 +527,7 @@ memory_init (void) install_element (ENABLE_NODE, &show_memory_bgp_cmd); install_element (ENABLE_NODE, &show_memory_ospf_cmd); install_element (ENABLE_NODE, &show_memory_ospf6_cmd); - install_element (ENABLE_NODE, &show_memory_isis_cmd); + install_element (ENABLE_NODE, &show_memory_pim_cmd); } /* Stats querying from users */ |