fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-07-31 16:31:58 +00:00
Code Issues Projects Releases Wiki Activity

client argv mem reporting: less precise and expansive.

Browse Source 
Avoid doing efforts to include fragmentation and just count the bulk
size: enough to give an hint about clients doing huge argv allocations
(the gist of the original patch was such detection), without risks of
performances impacts.
This commit is contained in:
antirez
2018-10-02 13:47:02 +02:00
parent 2379e5db62
commit 8b343f1c0f
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/networking.c
View File

@@ -54,17 +54,6 @@ size_t getStringObjectSdsUsedMemory(robj *o) {
} }
} }
/* Return approximate memory used by the sds string at object->ptr
* for a string object. This method does not include internal fragmentation. */
size_t getStringObjectSize(robj *o) {
serverAssertWithInfo(NULL,o,o->type == OBJ_STRING);
switch(o->encoding) {
case OBJ_ENCODING_RAW: return sdsAllocSize(o->ptr);
case OBJ_ENCODING_EMBSTR: return sdsAllocSize(o->ptr);
default: return 0; /* Just integer encoding for now. */
}
}
/* Client.reply list dup and free methods. */ /* Client.reply list dup and free methods. */
void *dupClientReplyValue(void *o) { void *dupClientReplyValue(void *o) {
clientReplyBlock *old = o; clientReplyBlock *old = o;
@@ -1177,9 +1166,10 @@ int processInlineBuffer(client *c) {
/* Create redis objects for all arguments. */ /* Create redis objects for all arguments. */
for (c->argc = 0, j = 0; j < argc; j++) { for (c->argc = 0, j = 0; j < argc; j++) {
if (sdslen(argv[j])) { size_t arglen = sdslen(argv[j]);
if (arglen) {
c->argv[c->argc] = createObject(OBJ_STRING,argv[j]); c->argv[c->argc] = createObject(OBJ_STRING,argv[j]);
c->argv_bytes += getStringObjectSize(c->argv[c->argc]); c->argv_bytes += arglen;
c->argc++; c->argc++;
} else { } else {
sdsfree(argv[j]); sdsfree(argv[j]);
@@ -1344,7 +1334,7 @@ int processMultibulkBuffer(client *c) {
sdslen(c->querybuf) == (size_t)(c->bulklen+2)) sdslen(c->querybuf) == (size_t)(c->bulklen+2))
{ {
c->argv[c->argc] = createObject(OBJ_STRING,c->querybuf); c->argv[c->argc] = createObject(OBJ_STRING,c->querybuf);
c->argv_bytes += getStringObjectSize(c->argv[c->argc]); c->argv_bytes += c->bulklen;
c->argc++; c->argc++;
sdsIncrLen(c->querybuf,-2); /* remove CRLF */ sdsIncrLen(c->querybuf,-2); /* remove CRLF */
/* Assume that if we saw a fat argument we'll see another one /* Assume that if we saw a fat argument we'll see another one
@@ -1354,7 +1344,7 @@ int processMultibulkBuffer(client *c) {
} else { } else {
c->argv[c->argc] = c->argv[c->argc] =
createStringObject(c->querybuf+c->qb_pos,c->bulklen); createStringObject(c->querybuf+c->qb_pos,c->bulklen);
c->argv_bytes += getStringObjectSize(c->argv[c->argc]); c->argv_bytes += c->bulklen;
c->argc++; c->argc++;
c->qb_pos += c->bulklen+2; c->qb_pos += c->bulklen+2;
} }
@@ -1932,7 +1922,7 @@ void rewriteClientCommandVector(client *c, int argc, ...) {
c->argv_bytes = 0; c->argv_bytes = 0;
for (j = 0; j < c->argc; j++) for (j = 0; j < c->argc; j++)
if (c->argv[j]) if (c->argv[j])
c->argv_bytes += getStringObjectSize(c->argv[j]); c->argv_bytes += getStringObjectSdsUsedMemory(c->argv[j]);
c->cmd = lookupCommandOrOriginal(c->argv[0]->ptr); c->cmd = lookupCommandOrOriginal(c->argv[0]->ptr);
serverAssertWithInfo(c,NULL,c->cmd != NULL); serverAssertWithInfo(c,NULL,c->cmd != NULL);
va_end(ap); va_end(ap);
@@ -1948,7 +1938,7 @@ void replaceClientCommandVector(client *c, int argc, robj **argv) {
c->argv_bytes = 0; c->argv_bytes = 0;
for (j = 0; j < c->argc; j++) for (j = 0; j < c->argc; j++)
if (c->argv[j]) if (c->argv[j])
c->argv_bytes += getStringObjectSize(c->argv[j]); c->argv_bytes += getStringObjectSdsUsedMemory(c->argv[j]);
c->cmd = lookupCommandOrOriginal(c->argv[0]->ptr); c->cmd = lookupCommandOrOriginal(c->argv[0]->ptr);
serverAssertWithInfo(c,NULL,c->cmd != NULL); serverAssertWithInfo(c,NULL,c->cmd != NULL);
} }
@@ -1973,8 +1963,8 @@ void rewriteClientCommandArgument(client *c, int i, robj *newval) {
c->argv[i] = NULL; c->argv[i] = NULL;
} }
oldval = c->argv[i]; oldval = c->argv[i];
if (oldval) c->argv_bytes -= getStringObjectSize(oldval); if (oldval) c->argv_bytes -= getStringObjectSdsUsedMemory(oldval);
if (newval) c->argv_bytes += getStringObjectSize(newval); if (newval) c->argv_bytes += getStringObjectSdsUsedMemory(newval);
c->argv[i] = newval; c->argv[i] = newval;
incrRefCount(newval); incrRefCount(newval);
if (oldval) decrRefCount(oldval); if (oldval) decrRefCount(oldval);