From 46b07cbb5c52a6a9321ab8c2134d3c6be9ddae86 Mon Sep 17 00:00:00 2001
From: Dvir Volk <dvirsky@gmail.com>
Date: Thu, 19 May 2016 12:16:14 +0300
Subject: [PATCH 1/2] Optimized autoMemoryFreed loop
---
src/module.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/module.c b/src/module.c
index 6a8a5f5b0..bedda7fd5 100644
--- a/src/module.c
+++ b/src/module.c
@@ -580,7 +580,7 @@ void autoMemoryFreed(RedisModuleCtx *ctx, int type, void *ptr) {
if (!(ctx->flags & REDISMODULE_CTX_AUTO_MEMORY)) return;
int j;
- for (j = 0; j < ctx->amqueue_used; j++) {
+ for (j = ctx->amqueue_used - 1; j >= 0; j--) {
if (ctx->amqueue[j].type == type &&
ctx->amqueue[j].ptr == ptr)
{
@@ -588,6 +588,9 @@ void autoMemoryFreed(RedisModuleCtx *ctx, int type, void *ptr) {
/* Optimization: if this is the last element, we can
* reuse it. */
if (j == ctx->amqueue_used-1) ctx->amqueue_used--;
+
+ break;
+
}
}
}
From 137fd86a6133b4a83c2a95215241c9906ec6877f Mon Sep 17 00:00:00 2001
From: Dvir Volk <dvirsky@gmail.com>
Date: Thu, 19 May 2016 13:51:55 +0300
Subject: [PATCH 2/2] optimized amFree even further
---
src/module.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/module.c b/src/module.c
index bedda7fd5..f79b6bda5 100644
--- a/src/module.c
+++ b/src/module.c
@@ -585,12 +585,17 @@ void autoMemoryFreed(RedisModuleCtx *ctx, int type, void *ptr) {
ctx->amqueue[j].ptr == ptr)
{
ctx->amqueue[j].type = REDISMODULE_AM_FREED;
- /* Optimization: if this is the last element, we can
- * reuse it. */
- if (j == ctx->amqueue_used-1) ctx->amqueue_used--;
+
+ /* Switch the freed element and the top element, to avoid growing
+ * the queue unnecessarily if we allocate/free in a loop */
+ if (j != ctx->amqueue_used-1) {
+ ctx->amqueue[j] = ctx->amqueue[ctx->amqueue_used-1];
+ }
+ /* Reduce the size of the queue because we either moved the top
+ * element elsewhere or freed it */
+ ctx->amqueue_used--;
break;
-
}
}
}