Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
继续操作前请注册或者登录。
Authored by
winlin
2014-11-11 11:25:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
be46e428ada0f21ec44feee800de90e846e9bcbc
be46e428
1 parent
f4dfee0e
research st, for bug #193, remove the code with bug, exit when fork.
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
3 行增加
和
19 行删除
trunk/research/st/event.c
trunk/research/st/event.c
查看文件 @
be46e42
...
...
@@ -308,26 +308,10 @@ ST_HIDDEN void _st_epoll_dispatch(void)
timeout
=
(
int
)
(
min_timeout
/
1000
);
}
// TODO: WINLIN: remove it for bug introduced.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/193
if
(
_st_epoll_data
->
pid
!=
getpid
())
{
/* We probably forked, reinitialize epoll set */
close
(
_st_epoll_data
->
epfd
);
_st_epoll_data
->
epfd
=
epoll_create
(
_st_epoll_data
->
fd_hint
);
if
(
_st_epoll_data
->
epfd
<
0
)
{
/* There is nothing we can do here, will retry later */
return
;
}
fcntl
(
_st_epoll_data
->
epfd
,
F_SETFD
,
FD_CLOEXEC
);
_st_epoll_data
->
pid
=
getpid
();
/* Put all descriptors on ioq into new epoll set */
memset
(
_st_epoll_data
->
fd_data
,
0
,
_st_epoll_data
->
fd_data_size
*
sizeof
(
_epoll_fd_data_t
));
_st_epoll_data
->
evtlist_cnt
=
0
;
for
(
q
=
_ST_IOQ
.
next
;
q
!=
&
_ST_IOQ
;
q
=
q
->
next
)
{
pq
=
_ST_POLLQUEUE_PTR
(
q
);
_st_epoll_pollset_add
(
pq
->
pds
,
pq
->
npds
);
}
// WINLIN: remove it for bug introduced.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/193
exit
(
-
1
);
}
/* Check for I/O operations */
...
...
请
注册
或
登录
后发表评论