fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-29 17:01:33 +00:00
Code Issues Projects Releases Wiki Activity

Manual merge after cherry-pick

Browse Source
This commit is contained in:
antirez
2011-07-12 10:03:22 +02:00
parent 63aed54a27
commit 3a4afb0473
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/redis.c
View File

@ -706,7 +706,7 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
readQueryFromClient, c); readQueryFromClient, c);
cmd = lookupCommand(c->argv[0]->ptr); cmd = lookupCommand(c->argv[0]->ptr);
redisAssert(cmd != NULL); redisAssert(cmd != NULL);
call(c,cmd); call(c);
resetClient(c); resetClient(c);
/* There may be more data to process in the input buffer. */ /* There may be more data to process in the input buffer. */
if (c->querybuf && sdslen(c->querybuf) > 0) if (c->querybuf && sdslen(c->querybuf) > 0)
@ -1106,7 +1106,7 @@ int processCommand(redisClient *c) {
addReply(c,shared.queued); addReply(c,shared.queued);
} else { } else {
if (server.vm_enabled && server.vm_max_threads > 0 && if (server.vm_enabled && server.vm_max_threads > 0 &&
blockClientOnSwappedKeys(c,cmd)) return REDIS_ERR; blockClientOnSwappedKeys(c)) return REDIS_ERR;
call(c); call(c);
} }
return REDIS_OK; return REDIS_OK;

2
src/redis.h
View File

@ -853,7 +853,7 @@ void vmReopenSwapFile(void);
int vmFreePage(off_t page); int vmFreePage(off_t page);
void zunionInterBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd, int argc, robj **argv); void zunionInterBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd, int argc, robj **argv);
void execBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd, int argc, robj **argv); void execBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd, int argc, robj **argv);
int blockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd); int blockClientOnSwappedKeys(redisClient *c);
int dontWaitForSwappedKey(redisClient *c, robj *key); int dontWaitForSwappedKey(redisClient *c, robj *key);
void handleClientsBlockedOnSwappedKey(redisDb *db, robj *key); void handleClientsBlockedOnSwappedKey(redisDb *db, robj *key);
vmpointer *vmSwapObjectBlocking(robj *val); vmpointer *vmSwapObjectBlocking(robj *val);

8
src/vm.c
View File

@ -1074,11 +1074,11 @@ void execBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd, int
* *
* Return 1 if the client is marked as blocked, 0 if the client can * Return 1 if the client is marked as blocked, 0 if the client can
* continue as the keys it is going to access appear to be in memory. */ * continue as the keys it is going to access appear to be in memory. */
int blockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd) { int blockClientOnSwappedKeys(redisClient *c) {
if (cmd->vm_preload_proc != NULL) { if (c->cmd->vm_preload_proc != NULL) {
cmd->vm_preload_proc(c,cmd,c->argc,c->argv); c->cmd->vm_preload_proc(c,c->cmd,c->argc,c->argv);
} else { } else {
waitForMultipleSwappedKeys(c,cmd,c->argc,c->argv); waitForMultipleSwappedKeys(c,c->cmd,c->argc,c->argv);
} }
/* If the client was blocked for at least one key, mark it as blocked. */ /* If the client was blocked for at least one key, mark it as blocked. */