mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

chore: minor fixes (#3082)

Browse source 
1. script errors are now logged continously but at most 5 per second.
2. "memory arena" is introduced - it prints the arena stats per thread.
   "memory malloc-stats" now only prints the global stats.

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2024-05-26 10:14:02 +03:00 • committed by GitHub
parent 20c98c29c1
commit 5534ee5c23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 50 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/server/memory_cmd.cc
View file

@ -98,8 +98,10 @@ void MemoryCmd::Run(CmdArgList args) {
"MEMORY <subcommand> [<arg> ...]. Subcommands are:",
"STATS",
" Shows breakdown of memory.",
"MALLOC-STATS [BACKING] [thread-id]",
" Show malloc stats for a heap residing in specified thread-id. 0 by default.",
"MALLOC-STATS",
" Show global malloc stats as provided by allocator libraries",
"ARENA [BACKING] [thread-id]",
" Show mimalloc arena stats for a heap residing in specified thread-id. 0 by default.",
" If BACKING is specified, show stats for the backing heap.",
"USAGE <key>",
" Show memory usage of a key.",
@ -146,7 +148,11 @@ void MemoryCmd::Run(CmdArgList args) {
}
if (sub_cmd == "MALLOC-STATS") {
return MallocStats(args);
return MallocStats();
}
if (sub_cmd == "ARENA") {
return ArenaStats(args);
}
if (sub_cmd == "TRACK") {
@ -284,7 +290,35 @@ void MemoryCmd::Stats() {
}
}
void MemoryCmd::MallocStats(CmdArgList args) {
void MemoryCmd::MallocStats() {
string report;
#if __GLIBC__ // MUSL/alpine do not have mallinfo routines.
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 33)
struct mallinfo2 malloc_info = mallinfo2();
#else
struct mallinfo malloc_info = mallinfo(); // buggy because 32-bit stats may overflow.
#endif
absl::StrAppend(&report, "___ Begin malloc stats ___\n");
absl::StrAppend(&report, "arena: ", malloc_info.arena, ", ordblks: ", malloc_info.ordblks,
", smblks: ", malloc_info.smblks, "\n");
absl::StrAppend(&report, "hblks: ", malloc_info.hblks, ", hblkhd: ", malloc_info.hblkhd,
", usmblks: ", malloc_info.usmblks, "\n");
absl::StrAppend(&report, "fsmblks: ", malloc_info.fsmblks, ", uordblks: ", malloc_info.uordblks,
", fordblks: ", malloc_info.fordblks, ", keepcost: ", malloc_info.keepcost, "\n");
absl::StrAppend(&report, "___ End malloc stats ___\n\n");
#endif
absl::StrAppend(&report, "___ Begin mimalloc stats ___\n");
mi_stats_print_out(MiStatsCallback, &report);
absl::StrAppend(&report, "___ End mimalloc stats ___\n\n");
auto* rb = static_cast<RedisReplyBuilder*>(cntx_->reply_builder());
return rb->SendVerbatimString(report);
}
void MemoryCmd::ArenaStats(CmdArgList args) {
uint32_t tid = 0;
bool backing = false;
if (args.size() >= 2) {
@ -310,34 +344,11 @@ void MemoryCmd::MallocStats(CmdArgList args) {
return cntx_->SendError(absl::StrCat("Thread id must be less than ", shard_set->size()));
}
string report;
#if __GLIBC__ // MUSL/alpine do not have mallinfo routines.
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 33)
struct mallinfo2 malloc_info = mallinfo2();
#else
struct mallinfo malloc_info = mallinfo(); // buggy because 32-bit stats may overflow.
#endif
absl::StrAppend(&report, "___ Begin malloc stats ___\n");
absl::StrAppend(&report, "arena: ", malloc_info.arena, ", ordblks: ", malloc_info.ordblks,
", smblks: ", malloc_info.smblks, "\n");
absl::StrAppend(&report, "hblks: ", malloc_info.hblks, ", hblkhd: ", malloc_info.hblkhd,
", usmblks: ", malloc_info.usmblks, "\n");
absl::StrAppend(&report, "fsmblks: ", malloc_info.fsmblks, ", uordblks: ", malloc_info.uordblks,
", fordblks: ", malloc_info.fordblks, ", keepcost: ", malloc_info.keepcost, "\n");
absl::StrAppend(&report, "___ End malloc stats ___\n\n");
#endif
absl::StrAppend(&report, "___ Begin mimalloc stats ___\n");
mi_stats_print_out(MiStatsCallback, &report);
string mi_malloc_info =
shard_set->pool()->at(tid)->AwaitBrief([=] { return MallocStatsCb(backing, tid); });
report.append(std::move(mi_malloc_info));
auto* rb = static_cast<RedisReplyBuilder*>(cntx_->reply_builder());
return rb->SendVerbatimString(report);
return rb->SendVerbatimString(mi_malloc_info);
}
void MemoryCmd::Usage(std::string_view key) {