Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xindoo
redis
提交
a4ce7581
R
redis
项目概览
xindoo
/
redis
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a4ce7581
编写于
12月 06, 2010
作者:
P
Pieter Noordhuis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't execute commands for clients when they are unblocked
上级
ecf94014
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
19 addition
and
8 deletion
+19
-8
src/redis.c
src/redis.c
+17
-2
src/redis.h
src/redis.h
+1
-0
src/t_list.c
src/t_list.c
+1
-6
未找到文件。
src/redis.c
浏览文件 @
a4ce7581
...
@@ -646,15 +646,16 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
...
@@ -646,15 +646,16 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
* for ready file descriptors. */
* for ready file descriptors. */
void
beforeSleep
(
struct
aeEventLoop
*
eventLoop
)
{
void
beforeSleep
(
struct
aeEventLoop
*
eventLoop
)
{
REDIS_NOTUSED
(
eventLoop
);
REDIS_NOTUSED
(
eventLoop
);
listNode
*
ln
;
redisClient
*
c
;
/* Awake clients that got all the swapped keys they requested */
/* Awake clients that got all the swapped keys they requested */
if
(
server
.
vm_enabled
&&
listLength
(
server
.
io_ready_clients
))
{
if
(
server
.
vm_enabled
&&
listLength
(
server
.
io_ready_clients
))
{
listIter
li
;
listIter
li
;
listNode
*
ln
;
listRewind
(
server
.
io_ready_clients
,
&
li
);
listRewind
(
server
.
io_ready_clients
,
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
while
((
ln
=
listNext
(
&
li
)))
{
redisClient
*
c
=
ln
->
value
;
c
=
ln
->
value
;
struct
redisCommand
*
cmd
;
struct
redisCommand
*
cmd
;
/* Resume the client. */
/* Resume the client. */
...
@@ -672,6 +673,19 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
...
@@ -672,6 +673,19 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
processInputBuffer
(
c
);
processInputBuffer
(
c
);
}
}
}
}
/* Try to process pending commands for clients that were just unblocked. */
while
(
listLength
(
server
.
unblocked_clients
))
{
ln
=
listFirst
(
server
.
unblocked_clients
);
redisAssert
(
ln
!=
NULL
);
c
=
ln
->
value
;
listDelNode
(
server
.
unblocked_clients
,
ln
);
/* Process remaining data in the input buffer. */
if
(
c
->
querybuf
&&
sdslen
(
c
->
querybuf
)
>
0
)
processInputBuffer
(
c
);
}
/* Write the AOF buffer on disk */
/* Write the AOF buffer on disk */
flushAppendOnlyFile
();
flushAppendOnlyFile
();
}
}
...
@@ -818,6 +832,7 @@ void initServer() {
...
@@ -818,6 +832,7 @@ void initServer() {
server
.
clients
=
listCreate
();
server
.
clients
=
listCreate
();
server
.
slaves
=
listCreate
();
server
.
slaves
=
listCreate
();
server
.
monitors
=
listCreate
();
server
.
monitors
=
listCreate
();
server
.
unblocked_clients
=
listCreate
();
createSharedObjects
();
createSharedObjects
();
server
.
el
=
aeCreateEventLoop
();
server
.
el
=
aeCreateEventLoop
();
server
.
db
=
zmalloc
(
sizeof
(
redisDb
)
*
server
.
dbnum
);
server
.
db
=
zmalloc
(
sizeof
(
redisDb
)
*
server
.
dbnum
);
...
...
src/redis.h
浏览文件 @
a4ce7581
...
@@ -435,6 +435,7 @@ struct redisServer {
...
@@ -435,6 +435,7 @@ struct redisServer {
/* Blocked clients */
/* Blocked clients */
unsigned
int
bpop_blocked_clients
;
unsigned
int
bpop_blocked_clients
;
unsigned
int
vm_blocked_clients
;
unsigned
int
vm_blocked_clients
;
list
*
unblocked_clients
;
/* Sort parameters - qsort_r() is only available under BSD so we
/* Sort parameters - qsort_r() is only available under BSD so we
* have to take this state global, in order to pass it to sortCompare() */
* have to take this state global, in order to pass it to sortCompare() */
int
sort_desc
;
int
sort_desc
;
...
...
src/t_list.c
浏览文件 @
a4ce7581
...
@@ -759,12 +759,7 @@ void unblockClientWaitingData(redisClient *c) {
...
@@ -759,12 +759,7 @@ void unblockClientWaitingData(redisClient *c) {
c
->
bpop
.
target
=
NULL
;
c
->
bpop
.
target
=
NULL
;
c
->
flags
&=
(
~
REDIS_BLOCKED
);
c
->
flags
&=
(
~
REDIS_BLOCKED
);
server
.
bpop_blocked_clients
--
;
server
.
bpop_blocked_clients
--
;
/* We want to process data if there is some command waiting
listAddNodeTail
(
server
.
unblocked_clients
,
c
);
* in the input buffer. Note that this is safe even if
* unblockClientWaitingData() gets called from freeClient() because
* freeClient() will be smart enough to call this function
* *after* c->querybuf was set to NULL. */
if
(
c
->
querybuf
&&
sdslen
(
c
->
querybuf
)
>
0
)
processInputBuffer
(
c
);
}
}
/* This should be called from any function PUSHing into lists.
/* This should be called from any function PUSHing into lists.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录