Merge commit '37b64441' into thread-next

diff --cc conf/cf-lex.l
Simple merge

diff --cc conf/conf.c
Simple merge

diff --cc conf/conf.h
index ffefa519f3e22545ea141898cbbcf755b200c874,5ec924b02f942b6a66645cb156e9530a377b4020..ce4a3c5a3bf644e2aa903726d6d6d9de95ae248c
--- 1/conf/conf.h
--- 2/conf/conf.h
+++ b/conf/conf.h
@@@ -132,11 -132,9 +132,12 @@@ struct symbol 
  struct sym_scope {
    struct sym_scope *next;             /* Next on scope stack */
    struct symbol *name;                        /* Name of this scope */
 +
 +  HASH(struct symbol) hash;           /* Local symbol hash */
 +
    uint slots;                         /* Variable slots */
    byte active;                                /* Currently entered */
+   byte block;                         /* No independent stack frame */
    byte soft_scopes;                   /* Number of soft scopes above */
  };
  

diff --cc doc/bird.sgml
Simple merge

diff --cc filter/config.Y
Simple merge

diff --cc nest/cmds.c
index 8a5bbdd468a2bb37eaf4c801424a2b5e44f13248,bcc8d6c29bc26391e8a8d12b3c84e8963edc6080..6717be0c21a897a0056790a471df2602c8ee64b5
--- 1/nest/cmds.c
--- 2/nest/cmds.c
+++ b/nest/cmds.c
@@@ -118,12 -118,11 +118,13 @@@ cmd_show_memory(void
    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
 -  print_size("Standby memory:", (struct resmem) { .overhead = page_size * *pages_kept });
 -  total.overhead += page_size * *pages_kept;
 +  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, "");

diff --cc nest/config.Y
Simple merge