From 8918de9202669609442c40af7f7625b5685b8a7c Mon Sep 17 00:00:00 2001
From: Premysl Hruby <dfenze@gmail.com>
Date: Mon, 2 Apr 2012 11:56:03 +0200
Subject: [PATCH] remove mentions of VM in comments
---
src/debug.c | 1 -
src/object.c | 12 +-----------
src/redis.h | 1 -
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/debug.c b/src/debug.c
index e7b3ba40..37e6a1f7 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -105,7 +105,6 @@ void computeDatasetDigest(unsigned char *final) {
mixDigest(digest,key,sdslen(key));
- /* Make sure the key is loaded if VM is active */
o = dictGetVal(de);
aux = htonl(o->type);
diff --git a/src/object.c b/src/object.c
index a15ebcfa..ba7ea323 100644
--- a/src/object.c
+++ b/src/object.c
@@ -9,18 +9,8 @@ robj *createObject(int type, void *ptr) {
o->ptr = ptr;
o->refcount = 1;
- /* Set the LRU to the current lruclock (minutes resolution).
- * We do this regardless of the fact VM is active as LRU is also
- * used for the maxmemory directive when Redis is used as cache.
- *
- * Note that this code may run in the context of an I/O thread
- * and accessing server.lruclock in theory is an error
- * (no locks). But in practice this is safe, and even if we read
- * garbage Redis will not fail. */
+ /* Set the LRU to the current lruclock (minutes resolution). */
o->lru = server.lruclock;
- /* The following is only needed if VM is active, but since the conditional
- * is probably more costly than initializing the field it's better to
- * have every field properly initialized anyway. */
return o;
}
diff --git a/src/redis.h b/src/redis.h
index 66883832..7502aa11 100644
--- a/src/redis.h
+++ b/src/redis.h
@@ -89,7 +89,6 @@
#define REDIS_SET 2
#define REDIS_ZSET 3
#define REDIS_HASH 4
-#define REDIS_VMPOINTER 8
/* Objects encoding. Some kind of objects like Strings and Hashes can be
* internally represented in multiple ways. The 'encoding' field of the object
--
2.47.2