gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ok

Browse Source
This commit is contained in:
Alex Cope 2023-07-06 15:22:52 -07:00 committed by Malavan Sotheeswaran
parent b2ecf2c856
commit cf4735b61e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server.cpp
View File

@ -5737,6 +5737,7 @@ sds genRedisInfoString(const char *section) {
const char *evict_policy = evictPolicyToString(); const char *evict_policy = evictPolicyToString();
long long memory_lua = g_pserver->lua ? (long long)lua_gc(g_pserver->lua,LUA_GCCOUNT,0)*1024 : 0; long long memory_lua = g_pserver->lua ? (long long)lua_gc(g_pserver->lua,LUA_GCCOUNT,0)*1024 : 0;
struct redisMemOverhead *mh = getMemoryOverheadData(); struct redisMemOverhead *mh = getMemoryOverheadData();
char available_system_mem[64] = "unavailable";
/* Peak memory is updated from time to time by serverCron() so it /* Peak memory is updated from time to time by serverCron() so it
* may happen that the instantaneous value is slightly bigger than * may happen that the instantaneous value is slightly bigger than
@ -5745,6 +5746,10 @@ sds genRedisInfoString(const char *section) {
if (zmalloc_used > g_pserver->stat_peak_memory) if (zmalloc_used > g_pserver->stat_peak_memory)
g_pserver->stat_peak_memory = zmalloc_used; g_pserver->stat_peak_memory = zmalloc_used;
if (g_pserver->cron_malloc_stats.sys_available) {
snprintf(available_system_mem, 64, "%lu", g_pserver->cron_malloc_stats.sys_available);
}
bytesToHuman(hmem,zmalloc_used,sizeof(hmem)); bytesToHuman(hmem,zmalloc_used,sizeof(hmem));
bytesToHuman(peak_hmem,g_pserver->stat_peak_memory,sizeof(peak_hmem)); bytesToHuman(peak_hmem,g_pserver->stat_peak_memory,sizeof(peak_hmem));
bytesToHuman(total_system_hmem,total_system_mem,sizeof(total_system_hmem)); bytesToHuman(total_system_hmem,total_system_mem,sizeof(total_system_hmem));
@ -5797,7 +5802,8 @@ sds genRedisInfoString(const char *section) {
"active_defrag_running:%d\r\n" "active_defrag_running:%d\r\n"
"lazyfree_pending_objects:%zu\r\n" "lazyfree_pending_objects:%zu\r\n"
"lazyfreed_objects:%zu\r\n" "lazyfreed_objects:%zu\r\n"
"storage_provider:%s\r\n", "storage_provider:%s\r\n"
"available_system_memory:%s\r\n",
zmalloc_used, zmalloc_used,
hmem, hmem,
g_pserver->cron_malloc_stats.process_rss, g_pserver->cron_malloc_stats.process_rss,
@ -5842,7 +5848,8 @@ sds genRedisInfoString(const char *section) {
g_pserver->active_defrag_running, g_pserver->active_defrag_running,
lazyfreeGetPendingObjectsCount(), lazyfreeGetPendingObjectsCount(),
lazyfreeGetFreedObjectsCount(), lazyfreeGetFreedObjectsCount(),
g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none" g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none",
available_system_mem
); );
freeMemoryOverheadData(mh); freeMemoryOverheadData(mh);
} }