From ab72ff797c05840808d62e7e466f8e6bddafc0d3 Mon Sep 17 00:00:00 2001 From: Roman Gershman Date: Wed, 19 Oct 2022 14:32:03 +0300 Subject: [PATCH] fix(server): remove double decrement of obj_memory_usage. (#406) Also, add timing stats to malloc-stats command. Signed-off-by: Roman Gershman Signed-off-by: Roman Gershman --- src/server/db_slice.cc | 2 -- src/server/memory_cmd.cc | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/db_slice.cc b/src/server/db_slice.cc index 3b70ae7ca..6ccc841ca 100644 --- a/src/server/db_slice.cc +++ b/src/server/db_slice.cc @@ -419,8 +419,6 @@ tuple DbSlice::AddOrFind2(const Context& cn // Keep the entry but reset the object. size_t value_heap_size = existing->second.MallocUsed(); db.stats.obj_memory_usage -= value_heap_size; - if (existing->second.ObjType() == OBJ_STRING) - db.stats.obj_memory_usage -= value_heap_size; existing->second.Reset(); events_.expired_keys++; diff --git a/src/server/memory_cmd.cc b/src/server/memory_cmd.cc index 1839a03e8..447d43174 100644 --- a/src/server/memory_cmd.cc +++ b/src/server/memory_cmd.cc @@ -57,6 +57,8 @@ void MemoryCmd::Run(CmdArgList args) { string MemoryCmd::MallocStats() { string str; + + uint64_t start = absl::GetCurrentTimeNanos(); absl::StrAppend(&str, "___ Begin mimalloc statistics ___\n"); mi_stats_print_out(MiStatsCallback, &str); @@ -73,7 +75,8 @@ string MemoryCmd::MallocStats() { get<2>(k_v.first), " ", get<3>(k_v.first), "\n"); } - absl::StrAppend(&str, "--- End mimalloc statistics ---\n"); + uint64_t delta = (absl::GetCurrentTimeNanos() - start) / 1000; + absl::StrAppend(&str, "--- End mimalloc statistics, took ", delta, "us ---\n"); return str; }