diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2018-10-02 16:03:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 16:03:05 +0200 |
| commit | e19a06d2dd43473d87e002f59e9469b3548a10dd (patch) | |
| tree | b7ff2d8775e734389f9429874927247b5d7aed0e | |
| parent | fe43406929dbf6e6316f53f891370850cd8e1c3f (diff) | |
| parent | f4b27ae22272b9a50e970aa308ba57c3c3dbd985 (diff) | |
| download | redis-e19a06d2dd43473d87e002f59e9469b3548a10dd.tar.gz | |
Merge pull request #5242 from oranagra/script_mem
script cache memory in INFO and MEMORY includes both script code and overheads
| -rw-r--r-- | src/object.c | 2 | ||||
| -rw-r--r-- | src/server.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/object.c b/src/object.c index d8a56dd26..6987e1e6c 100644 --- a/src/object.c +++ b/src/object.c @@ -1017,7 +1017,7 @@ struct redisMemOverhead *getMemoryOverheadData(void) { mh->aof_buffer = mem; mem_total+=mem; - mem = 0; + mem = server.lua_scripts_mem; mem += dictSize(server.lua_scripts) * sizeof(dictEntry) + dictSlots(server.lua_scripts) * sizeof(dictEntry*); mem += dictSize(server.repl_scriptcache_dict) * sizeof(dictEntry) + diff --git a/src/server.c b/src/server.c index 7398252bb..ff662e95f 100644 --- a/src/server.c +++ b/src/server.c @@ -3204,7 +3204,7 @@ sds genRedisInfoString(char *section) { bytesToHuman(peak_hmem,server.stat_peak_memory); bytesToHuman(total_system_hmem,total_system_mem); bytesToHuman(used_memory_lua_hmem,memory_lua); - bytesToHuman(used_memory_scripts_hmem,server.lua_scripts_mem); + bytesToHuman(used_memory_scripts_hmem,mh->lua_caches); bytesToHuman(used_memory_rss_hmem,server.cron_malloc_stats.process_rss); bytesToHuman(maxmemory_hmem,server.maxmemory); @@ -3269,7 +3269,7 @@ sds genRedisInfoString(char *section) { total_system_hmem, memory_lua, used_memory_lua_hmem, - server.lua_scripts_mem, + mh->lua_caches, used_memory_scripts_hmem, dictSize(server.lua_scripts), server.maxmemory, |