fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

more object-level VM primitives

Browse Source
This commit is contained in:
antirez 2010-01-05 07:19:09 -05:00
parent 3a66edc7a4
commit a35ddf129c
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
redis.c
View File

@ -487,6 +487,7 @@ static void queueMultiCommand(redisClient *c, struct redisCommand *cmd);
static void unblockClient(redisClient *c);
static int handleClientsWaitingListPush(redisClient *c, robj *key, robj *ele);
static void vmInit(void);
static void vmMarkPagesFree(off_t page, off_t count);
static void authCommand(redisClient *c);
static void pingCommand(redisClient *c);
@ -836,6 +837,7 @@ static void dictRedisObjectDestructor(void *privdata, void *val)
{
DICT_NOTUSED(privdata);
if (val == NULL) return; /* Values of swapped out keys as set to NULL */
decrRefCount(val);
}
@ -2320,20 +2322,25 @@ static void freeHashObject(robj *o) {
}
static void incrRefCount(robj *o) {
assert(!server.vm_enabled || o->storage == REDIS_VM_MEMORY);
o->refcount++;
#ifdef DEBUG_REFCOUNT
if (o->type == REDIS_STRING)
printf("Increment '%s'(%p), now is: %d\n",o->ptr,o,o->refcount);
#endif
}
static void decrRefCount(void *obj) {
robj *o = obj;
#ifdef DEBUG_REFCOUNT
if (o->type == REDIS_STRING)
printf("Decrement '%s'(%p), now is: %d\n",o->ptr,o,o->refcount-1);
#endif
/* REDIS_VM_SWAPPED */
if (server.vm_enabled && o->storage == REDIS_VM_SWAPPED) {
assert(o->refcount == 1);
assert(o->type == REDIS_STRING);
freeStringObject(o);
vmMarkPagesFree(o->vm.page,o->vm.usedpages);
if (listLength(server.objfreelist) > REDIS_OBJFREELIST_MAX ||
!listAddNodeHead(server.objfreelist,o))
zfree(o);
return;
}
/* REDIS_VM_MEMORY */
if (--(o->refcount) == 0) {
switch(o->type) {
case REDIS_STRING: freeStringObject(o); break;

4
redis.conf
View File

@ -164,6 +164,10 @@ appendfsync always
# appendfsync everysec
# appendfsync no
################################ VIRTUAL MEMORY ###############################
vm-enabled yes
############################### ADVANCED CONFIG ###############################
# Glue small output buffers together in order to send small replies in a