Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
0a6f3f0f
Commit
0a6f3f0f
authored
May 07, 2010
by
Pieter Noordhuis
Browse files
swap arguments in blockClientOnSwappedKeys to be consistent
parent
3805e04f
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
0a6f3f0f
...
...
@@ -611,7 +611,7 @@ static void vmReopenSwapFile(void);
static
int
vmFreePage
(
off_t
page
);
static
void
zunionInterBlockClientOnSwappedKeys
(
redisClient
*
c
,
struct
redisCommand
*
cmd
,
int
argc
,
robj
**
argv
);
static
void
execBlockClientOnSwappedKeys
(
redisClient
*
c
,
struct
redisCommand
*
cmd
,
int
argc
,
robj
**
argv
);
static
int
blockClientOnSwappedKeys
(
struct
redisCommand
*
cmd
,
redisClient
*
c
);
static
int
blockClientOnSwappedKeys
(
redisClient
*
c
,
struct
redisCommand
*
cmd
);
static
int
dontWaitForSwappedKey
(
redisClient
*
c
,
robj
*
key
);
static
void
handleClientsBlockedOnSwappedKey
(
redisDb
*
db
,
robj
*
key
);
static
void
readQueryFromClient
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
);
...
...
@@ -2396,7 +2396,7 @@ static int processCommand(redisClient *c) {
addReply
(
c
,
shared
.
queued
);
}
else
{
if
(
server
.
vm_enabled
&&
server
.
vm_max_threads
>
0
&&
blockClientOnSwappedKeys
(
c
md
,
c
))
return
1
;
blockClientOnSwappedKeys
(
c
,
c
md
))
return
1
;
call
(
c
,
cmd
);
}
...
...
@@ -9613,7 +9613,7 @@ static void execBlockClientOnSwappedKeys(redisClient *c, struct redisCommand *cm
*
* 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. */
static
int
blockClientOnSwappedKeys
(
struct
redisCommand
*
cmd
,
redisClient
*
c
)
{
static
int
blockClientOnSwappedKeys
(
redisClient
*
c
,
struct
redisCommand
*
cmd
)
{
if
(
cmd
->
vm_preload_proc
!=
NULL
)
{
cmd
->
vm_preload_proc
(
c
,
cmd
,
c
->
argc
,
c
->
argv
);
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment