Commit fbfa0a12 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #3579 from guybe7/unstable

Fixed wrong sizeof(client) in object.c
parents f39e7d4d 8b070b5d
...@@ -828,9 +828,9 @@ struct redisMemOverhead *getMemoryOverheadData(void) { ...@@ -828,9 +828,9 @@ struct redisMemOverhead *getMemoryOverheadData(void) {
listRewind(server.slaves,&li); listRewind(server.slaves,&li);
while((ln = listNext(&li))) { while((ln = listNext(&li))) {
client *client = listNodeValue(ln); client *c = listNodeValue(ln);
mem += getClientOutputBufferMemoryUsage(client); mem += getClientOutputBufferMemoryUsage(c);
mem += sdsAllocSize(client->querybuf); mem += sdsAllocSize(c->querybuf);
mem += sizeof(client); mem += sizeof(client);
} }
} }
...@@ -844,11 +844,11 @@ struct redisMemOverhead *getMemoryOverheadData(void) { ...@@ -844,11 +844,11 @@ struct redisMemOverhead *getMemoryOverheadData(void) {
listRewind(server.clients,&li); listRewind(server.clients,&li);
while((ln = listNext(&li))) { while((ln = listNext(&li))) {
client *client = listNodeValue(ln); client *c = listNodeValue(ln);
if (client->flags & CLIENT_SLAVE) if (c->flags & CLIENT_SLAVE)
continue; continue;
mem += getClientOutputBufferMemoryUsage(client); mem += getClientOutputBufferMemoryUsage(c);
mem += sdsAllocSize(client->querybuf); mem += sdsAllocSize(c->querybuf);
mem += sizeof(client); mem += sizeof(client);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment