Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xindoo
redis
提交
24896427
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
24896427
编写于
1月 13, 2020
作者:
S
Salvatore Sanfilippo
提交者:
GitHub
1月 13, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6110 from soloestoy/enhance-io-threaded
Enhance IO Threaded: use main thread to handle read/write work
上级
8105f91a
1398fac3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
3 deletion
+18
-3
src/networking.c
src/networking.c
+18
-3
未找到文件。
src/networking.c
浏览文件 @
24896427
...
...
@@ -2656,7 +2656,7 @@ pthread_mutex_t io_threads_mutex[IO_THREADS_MAX_NUM];
_Atomic
unsigned
long
io_threads_pending
[
IO_THREADS_MAX_NUM
];
int
io_threads_active
;
/* Are the threads currently spinning waiting I/O? */
int
io_threads_op
;
/* IO_THREADS_OP_WRITE or IO_THREADS_OP_READ. */
list
*
io_threads_list
[
IO_THREADS_MAX_NUM
];
list
*
io_threads_list
[
IO_THREADS_MAX_NUM
+
1
];
void
*
IOThreadMain
(
void
*
myid
)
{
/* The ID is the thread number (from 0 to server.iothreads_num-1), and is
...
...
@@ -2729,6 +2729,7 @@ void initThreadedIO(void) {
}
io_threads
[
i
]
=
tid
;
}
io_threads_list
[
server
.
io_threads_num
]
=
listCreate
();
}
void
startThreadedIO
(
void
)
{
...
...
@@ -2800,7 +2801,7 @@ int handleClientsWithPendingWritesUsingThreads(void) {
while
((
ln
=
listNext
(
&
li
)))
{
client
*
c
=
listNodeValue
(
ln
);
c
->
flags
&=
~
CLIENT_PENDING_WRITE
;
int
target_id
=
item_id
%
server
.
io_threads_num
;
int
target_id
=
item_id
%
(
server
.
io_threads_num
+
1
)
;
listAddNodeTail
(
io_threads_list
[
target_id
],
c
);
item_id
++
;
}
...
...
@@ -2813,6 +2814,13 @@ int handleClientsWithPendingWritesUsingThreads(void) {
io_threads_pending
[
j
]
=
count
;
}
listRewind
(
io_threads_list
[
server
.
io_threads_num
],
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
client
*
c
=
listNodeValue
(
ln
);
writeToClient
(
c
->
fd
,
c
,
0
);
}
listEmpty
(
io_threads_list
[
server
.
io_threads_num
]);
/* Wait for all threads to end their work. */
while
(
1
)
{
unsigned
long
pending
=
0
;
...
...
@@ -2877,7 +2885,7 @@ int handleClientsWithPendingReadsUsingThreads(void) {
int
item_id
=
0
;
while
((
ln
=
listNext
(
&
li
)))
{
client
*
c
=
listNodeValue
(
ln
);
int
target_id
=
item_id
%
server
.
io_threads_num
;
int
target_id
=
item_id
%
(
server
.
io_threads_num
+
1
)
;
listAddNodeTail
(
io_threads_list
[
target_id
],
c
);
item_id
++
;
}
...
...
@@ -2890,6 +2898,13 @@ int handleClientsWithPendingReadsUsingThreads(void) {
io_threads_pending
[
j
]
=
count
;
}
listRewind
(
io_threads_list
[
server
.
io_threads_num
],
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
client
*
c
=
listNodeValue
(
ln
);
readQueryFromClient
(
NULL
,
c
->
fd
,
c
,
0
);
}
listEmpty
(
io_threads_list
[
server
.
io_threads_num
]);
/* Wait for all threads to end their work. */
while
(
1
)
{
unsigned
long
pending
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录