-
-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30.
- Loading branch information
Showing
8 changed files
with
177 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| The MIT License (MIT) | ||
| Copyright (c) 2013-2014 winlin | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| this software and associated documentation files (the "Software"), to deal in | ||
| the Software without restriction, including without limitation the rights to | ||
| use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| the Software, and to permit persons to whom the Software is furnished to do so, | ||
| subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| #include <srs_app_recv_thread.hpp> | ||
|
|
||
| #include <srs_protocol_rtmp.hpp> | ||
| #include <srs_protocol_stack.hpp> | ||
|
|
||
| SrsRecvThread::SrsRecvThread(SrsRtmpServer* rtmp_sdk) | ||
| { | ||
| rtmp = rtmp_sdk; | ||
| trd = new SrsThread(this, 0, true); | ||
| } | ||
|
|
||
| SrsRecvThread::~SrsRecvThread() | ||
| { | ||
| // stop recv thread. | ||
| stop(); | ||
|
|
||
| // destroy the thread. | ||
| srs_freep(trd); | ||
|
|
||
| // clear all messages. | ||
| std::vector<SrsMessage*>::iterator it; | ||
| for (it = queue.begin(); it != queue.end(); ++it) { | ||
| SrsMessage* msg = *it; | ||
| srs_freep(msg); | ||
| } | ||
| queue.clear(); | ||
| } | ||
|
|
||
| bool SrsRecvThread::empty() | ||
| { | ||
| return queue.empty(); | ||
| } | ||
|
|
||
| SrsMessage* SrsRecvThread::pump() | ||
| { | ||
| srs_assert(!queue.empty()); | ||
|
|
||
| SrsMessage* msg = *queue.begin(); | ||
|
|
||
| queue.erase(queue.begin()); | ||
|
|
||
| return msg; | ||
| } | ||
|
|
||
| int SrsRecvThread::start() | ||
| { | ||
| return trd->start(); | ||
| } | ||
|
|
||
| void SrsRecvThread::stop() | ||
| { | ||
| trd->stop(); | ||
| } | ||
|
|
||
| int SrsRecvThread::cycle() | ||
| { | ||
| int ret = ERROR_SUCCESS; | ||
|
|
||
| SrsMessage* msg = NULL; | ||
|
|
||
| if ((ret = rtmp->recv_message(&msg)) != ERROR_SUCCESS) { | ||
| if (!srs_is_client_gracefully_close(ret)) { | ||
| srs_error("recv client control message failed. ret=%d", ret); | ||
| } | ||
|
|
||
| // we use no timeout to recv, should never got any error. | ||
| trd->stop_loop(); | ||
|
|
||
| return ret; | ||
| } | ||
| srs_verbose("play loop recv message. ret=%d", ret); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| The MIT License (MIT) | ||
| Copyright (c) 2013-2014 winlin | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| this software and associated documentation files (the "Software"), to deal in | ||
| the Software without restriction, including without limitation the rights to | ||
| use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| the Software, and to permit persons to whom the Software is furnished to do so, | ||
| subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| #ifndef SRS_APP_RECV_THREAD_HPP | ||
| #define SRS_APP_RECV_THREAD_HPP | ||
|
|
||
| /* | ||
| #include <srs_app_recv_thread.hpp> | ||
| */ | ||
|
|
||
| #include <srs_core.hpp> | ||
|
|
||
| #include <vector> | ||
|
|
||
| #include <srs_app_thread.hpp> | ||
|
|
||
| class SrsRtmpServer; | ||
| class SrsMessage; | ||
|
|
||
| /** | ||
| * the recv thread used to replace the timeout recv, | ||
| * which hurt performance for the epoll_ctrl is frequently used. | ||
| * @see: SrsRtmpConn::playing | ||
| * @see: https://github.com/winlinvip/simple-rtmp-server/issues/217 | ||
| */ | ||
| class SrsRecvThread : public ISrsThreadHandler | ||
| { | ||
| private: | ||
| SrsThread* trd; | ||
| SrsRtmpServer* rtmp; | ||
| std::vector<SrsMessage*> queue; | ||
| public: | ||
| SrsRecvThread(SrsRtmpServer* rtmp_sdk); | ||
| virtual ~SrsRecvThread(); | ||
| public: | ||
| virtual bool empty(); | ||
| virtual SrsMessage* pump(); | ||
| public: | ||
| virtual int start(); | ||
| virtual void stop(); | ||
| virtual int cycle(); | ||
| }; | ||
|
|
||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters