external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #2194, yield for timer, for live publisher

Browse source
This commit is contained in:
winlin 2021-02-11 22:03:00 +08:00
parent d1bcc03d9a
commit a5a96491a3
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_recv_thread.cpp
View file

@ -288,7 +288,8 @@ SrsPublishRecvThread::SrsPublishRecvThread(SrsRtmpServer* rtmp_sdk, SrsRequest*
_conn = conn; _conn = conn;
_source = source; _source = source;
nn_msgs_for_yield_ = 0;
recv_error = srs_success; recv_error = srs_success;
_nb_msgs = 0; _nb_msgs = 0;
video_frames = 0; video_frames = 0;
@ -401,6 +402,13 @@ srs_error_t SrsPublishRecvThread::consume(SrsCommonMessage* msg)
if (err != srs_success) { if (err != srs_success) {
return srs_error_wrap(err, "handle publish message"); return srs_error_wrap(err, "handle publish message");
} }
// Yield to another coroutines.
// @see https://github.com/ossrs/srs/issues/2194#issuecomment-777463768
if (++nn_msgs_for_yield_ >= 15) {
nn_msgs_for_yield_ = 0;
srs_thread_yield();
}
return err; return err;
} }

1
trunk/src/app/srs_app_recv_thread.hpp
View file

@ -144,6 +144,7 @@ class SrsPublishRecvThread : virtual public ISrsMessagePumper, virtual public IS
#endif #endif
{ {
private: private:
uint32_t nn_msgs_for_yield_;
SrsRecvThread trd; SrsRecvThread trd;
SrsRtmpServer* rtmp; SrsRtmpServer* rtmp;
SrsRequest* req; SrsRequest* req;

1
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -828,6 +828,7 @@ srs_error_t SrsRtmpConn::do_playing(SrsSource* source, SrsConsumer* consumer, Sr
} }
// Yield to another coroutines. // Yield to another coroutines.
// @see https://github.com/ossrs/srs/issues/2194#issuecomment-777437476
srs_thread_yield(); srs_thread_yield();
} }