1 files changed, 24 insertions, 15 deletions

diff --git a/nest/cmds.c b/nest/cmds.c
index 77c92077..6717be0c 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -8,7 +8,7 @@
 
 #include "nest/bird.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "nest/cmds.h"
@@ -51,17 +51,18 @@ cmd_show_symbols(struct sym_show_data *sd)
     cli_msg(1010, "%-8s\t%s", sd->sym->name, cf_symbol_class_name(sd->sym));
   else
   {
-    HASH_WALK(config->sym_hash, next, sym)
-    {
-      if (!sym->scope->active)
-	continue;
+    for (const struct sym_scope *scope = config->root_scope; scope; scope = scope->next)
+      HASH_WALK(scope->hash, next, sym)
+      {
+	if (!sym->scope->active)
+	  continue;
 
-      if (sd->type && (sym->class != sd->type))
-	continue;
+	if (sd->type && (sym->class != sd->type))
+	  continue;
 
-      cli_msg(-1010, "%-8s\t%s", sym->name, cf_symbol_class_name(sym));
-    }
-    HASH_WALK_END;
+	cli_msg(-1010, "%-8s\t%s", sym->name, cf_symbol_class_name(sym));
+      }
+      HASH_WALK_END;
 
     cli_msg(0, "");
   }
@@ -114,10 +115,18 @@ cmd_show_memory(void)
 {
   cli_msg(-1018, "BIRD memory usage");
   cli_msg(-1018, "%-17s Effective    Overhead", "");
-  print_size("Routing tables:", rp_memsize(rt_table_pool));
-  print_size("Route attributes:", rp_memsize(rta_pool));
-  print_size("Protocols:", rp_memsize(proto_pool));
-  print_size("Total:", rp_memsize(&root_pool));
+  print_size("Routing tables:", rmemsize(rt_table_pool));
+  print_size("Route attributes:", rmemsize(rta_pool));
+  print_size("Protocols:", rmemsize(proto_pool));
+  print_size("Current config:", rmemsize(config_pool));
+  struct resmem total = rmemsize(&root_pool);
+#ifdef HAVE_MMAP
+  int pk  = atomic_load_explicit(&pages_kept, memory_order_relaxed)
+	  + atomic_load_explicit(&pages_kept_locally, memory_order_relaxed);
+  print_size("Standby memory:", (struct resmem) { .overhead = page_size * pk });
+  total.overhead += page_size * pk;
+#endif
+  print_size("Total:", total);
   cli_msg(0, "");
 }
 
@@ -127,7 +136,7 @@ cmd_eval(const struct f_line *expr)
   buffer buf;
   LOG_BUFFER_INIT(buf);
 
-  if (f_eval_buf(expr, this_cli->parser_pool, &buf) > F_RETURN)
+  if (f_eval_buf(expr, &buf) > F_RETURN)
     {
       cli_msg(8008, "runtime error");
       return;