From 309c2bcd1bf00ac6a224a76aad9c05733d2f4a18 Mon Sep 17 00:00:00 2001 From: oranagra Date: Wed, 18 May 2016 08:08:43 +0300 Subject: [PATCH] add zmalloc used mem to DEBUG SDSLEN --- src/debug.c | 8 +++++--- src/server.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/debug.c b/src/debug.c index bceae8b3b..e00526577 100644 --- a/src/debug.c +++ b/src/debug.c @@ -409,12 +409,14 @@ void debugCommand(client *c) { addReplyError(c,"Not an sds encoded string."); } else { addReplyStatusFormat(c, - "key_sds_len:%lld, key_sds_avail:%lld, " - "val_sds_len:%lld, val_sds_avail:%lld", + "key_sds_len:%lld, key_sds_avail:%lld, key_zmalloc: %lld, " + "val_sds_len:%lld, val_sds_avail:%lld, val_zmalloc: %lld", (long long) sdslen(key), (long long) sdsavail(key), + (long long) sdsZmallocSize(key), (long long) sdslen(val->ptr), - (long long) sdsavail(val->ptr)); + (long long) sdsavail(val->ptr), + (long long) getStringObjectSdsUsedMemory(val)); } } else if (!strcasecmp(c->argv[1]->ptr,"populate") && (c->argc == 3 || c->argc == 4)) { diff --git a/src/server.h b/src/server.h index 3f2028f83..6d5edb5ae 100644 --- a/src/server.h +++ b/src/server.h @@ -1242,6 +1242,8 @@ void addReplyHumanLongDouble(client *c, long double d); void addReplyLongLong(client *c, long long ll); void addReplyMultiBulkLen(client *c, long length); void copyClientOutputBuffer(client *dst, client *src); +size_t sdsZmallocSize(sds s); +size_t getStringObjectSdsUsedMemory(robj *o); void *dupClientReplyValue(void *o); void getClientsMaxBuffers(unsigned long *longest_output_list, unsigned long *biggest_input_buffer); -- GitLab