Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

swap arguments in blockClientOnSwappedKeys to be consistent

  • Loading branch information...
commit 0a6f3f0f8a42731b36a78d58c5c11728faf97a43 1 parent 3805e04
Pieter Noordhuis pietern authored

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. +3 3 redis.c
6 redis.c
@@ -611,7 +611,7 @@ static void vmReopenSwapFile(void);
611 611 static int vmFreePage(off_t page);
612 612 static void zunionInterBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd, int argc, robj **argv);
613 613 static void execBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd, int argc, robj **argv);
614   -static int blockClientOnSwappedKeys(struct redisCommand *cmd, redisClient *c);
  614 +static int blockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd);
615 615 static int dontWaitForSwappedKey(redisClient *c, robj *key);
616 616 static void handleClientsBlockedOnSwappedKey(redisDb *db, robj *key);
617 617 static void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask);
@@ -2396,7 +2396,7 @@ static int processCommand(redisClient *c) {
2396 2396 addReply(c,shared.queued);
2397 2397 } else {
2398 2398 if (server.vm_enabled && server.vm_max_threads > 0 &&
2399   - blockClientOnSwappedKeys(cmd,c)) return 1;
  2399 + blockClientOnSwappedKeys(c,cmd)) return 1;
2400 2400 call(c,cmd);
2401 2401 }
2402 2402
@@ -9613,7 +9613,7 @@ static void execBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cm
9613 9613 *
9614 9614 * Return 1 if the client is marked as blocked, 0 if the client can
9615 9615 * continue as the keys it is going to access appear to be in memory. */
9616   -static int blockClientOnSwappedKeys(struct redisCommand *cmd, redisClient *c) {
  9616 +static int blockClientOnSwappedKeys(redisClient *c, struct redisCommand *cmd) {
9617 9617 if (cmd->vm_preload_proc != NULL) {
9618 9618 cmd->vm_preload_proc(c,cmd,c->argc,c->argv);
9619 9619 } else {

0 comments on commit 0a6f3f0

Please sign in to comment.
Something went wrong with that request. Please try again.