diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-10-04 16:15:36 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-10-04 16:15:36 +0200 |
| commit | dc9351d326b9d2d8bcb7e9a0e5126878c2b02762 (patch) | |
| tree | 842b9d21cc1f4b16869cac58711902f5b1f78b91 /nest/cmds.c | |
| parent | 00679a688a5feff7a919cbeae71dd050ccc90b22 (diff) | |
| parent | 67256d50359d42aca4e64bb1cb5dcb3c63669578 (diff) | |
Merge commit '67256d50' into HEAD
Diffstat (limited to 'nest/cmds.c')
| -rw-r--r-- | nest/cmds.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nest/cmds.c b/nest/cmds.c index 092be48a..8a5bbdd4 100644 --- a/nest/cmds.c +++ b/nest/cmds.c @@ -109,7 +109,6 @@ print_size(char *dsc, struct resmem vals) extern pool *rt_table_pool; extern pool *rta_pool; -extern uint *pages_kept; void cmd_show_memory(void) @@ -121,8 +120,10 @@ cmd_show_memory(void) print_size("Protocols:", rmemsize(proto_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, ""); |