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:26:44 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
691b784ae9d622203c1522dfcc3e145ad4a7fe4d
691b784a
2 parents
044de0eb
be46e428
Merge branch 'srs.master'
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
4 行增加
和
18 行删除
trunk/research/st/event.c
trunk/research/st/srs.c
trunk/research/st/event.c
查看文件 @
691b784
...
...
@@ -309,23 +309,9 @@ ST_HIDDEN void _st_epoll_dispatch(void)
}
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 */
...
...
trunk/research/st/srs.c
查看文件 @
691b784
...
...
@@ -52,8 +52,8 @@ int sleep_test()
srs_trace
(
"sleep test: start"
);
srs_trace
(
"1. sleep..."
);
st_usleep
(
sleep_ms
*
1000
);
srs_trace
(
"2. sleep ok"
);
srs_trace
(
"sleep test: end"
);
...
...
请
注册
或
登录
后发表评论