remove mentions of VM in comments

diff --git a/src/debug.c b/src/debug.c
index e7b3ba407fd756adadba96b932caf56f2aad9853..37e6a1f72c17f9ead483c18bdb63bfac964329cc 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -105,7 +105,6 @@ void computeDatasetDigest(unsigned char *final) {
 
             mixDigest(digest,key,sdslen(key));
 
 
             mixDigest(digest,key,sdslen(key));
 

-            /* Make sure the key is loaded if VM is active */

             o = dictGetVal(de);
 
             aux = htonl(o->type);
             o = dictGetVal(de);
 
             aux = htonl(o->type);

diff --git a/src/object.c b/src/object.c
index a15ebcfa8371fd25efcfa376a6cf58ad4e29bb0a..ba7ea323a6f2cbddd1f3cfafbc1cd93722fc6019 100644 (file)
--- a/src/object.c
+++ b/src/object.c
@@ -9,18 +9,8 @@ robj *createObject(int type, void *ptr) {
     o->ptr = ptr;
     o->refcount = 1;
 
     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;
     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;
 }
 
     return o;
 }
 

diff --git a/src/redis.h b/src/redis.h
index f2229caf930d66d47d00e6ac7c8ff952433bdd4b..9d0e19ff2c54cd7b4889d5d4c1dbbd90d4b9f6b3 100644 (file)
--- 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_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
 
 /* Objects encoding. Some kind of objects like Strings and Hashes can be
  * internally represented in multiple ways. The 'encoding' field of the object