Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
e83d5b64
Unverified
Commit
e83d5b64
authored
Apr 23, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 23, 2020
Browse files
Merge pull request #7120 from Dave-in-lafayette/patch-1
fix for unintended crash during panic response
parents
42d309ff
071197fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
e83d5b64
...
@@ -4037,7 +4037,7 @@ sds genRedisInfoString(const char *section) {
...
@@ -4037,7 +4037,7 @@ sds genRedisInfoString(const char *section) {
size_t
zmalloc_used
=
zmalloc_used_memory
();
size_t
zmalloc_used
=
zmalloc_used_memory
();
size_t
total_system_mem
=
server
.
system_memory_size
;
size_t
total_system_mem
=
server
.
system_memory_size
;
const
char
*
evict_policy
=
evictPolicyToString
();
const
char
*
evict_policy
=
evictPolicyToString
();
long
long
memory_lua
=
(
long
long
)
lua_gc
(
server
.
lua
,
LUA_GCCOUNT
,
0
)
*
1024
;
long
long
memory_lua
=
server
.
lua
?
(
long
long
)
lua_gc
(
server
.
lua
,
LUA_GCCOUNT
,
0
)
*
1024
:
0
;
struct
redisMemOverhead
*
mh
=
getMemoryOverheadData
();
struct
redisMemOverhead
*
mh
=
getMemoryOverheadData
();
/* Peak memory is updated from time to time by serverCron() so it
/* Peak memory is updated from time to time by serverCron() so it
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment