From 22524f390a46b29fb432535fa818edcf6ee8f53e Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 1 Dec 2014 22:23:05 +0800
Subject: [PATCH] rename the recv thread to queue recv thread for bug #237.

---
 trunk/src/app/srs_app_recv_thread.cpp | 20 ++++++++++----------
 trunk/src/app/srs_app_recv_thread.hpp |  6 +++---
 trunk/src/app/srs_app_rtmp_conn.cpp   |  4 ++--
 trunk/src/app/srs_app_rtmp_conn.hpp   |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/trunk/src/app/srs_app_recv_thread.cpp b/trunk/src/app/srs_app_recv_thread.cpp
index 0134af8de..261578479 100644
--- a/trunk/src/app/srs_app_recv_thread.cpp
+++ b/trunk/src/app/srs_app_recv_thread.cpp
@@ -26,13 +26,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_protocol_rtmp.hpp>
 #include <srs_protocol_stack.hpp>
 
-SrsRecvThread::SrsRecvThread(SrsRtmpServer* rtmp_sdk)
+SrsQueueRecvThread::SrsQueueRecvThread(SrsRtmpServer* rtmp_sdk)
 {
     rtmp = rtmp_sdk;
     trd = new SrsThread(this, 0, true);
 }
 
-SrsRecvThread::~SrsRecvThread()
+SrsQueueRecvThread::~SrsQueueRecvThread()
 {
     // stop recv thread.
     stop();
@@ -49,17 +49,17 @@ SrsRecvThread::~SrsRecvThread()
     queue.clear();
 }
 
-bool SrsRecvThread::empty()
+bool SrsQueueRecvThread::empty()
 {
     return queue.empty();
 }
 
-int SrsRecvThread::size()
+int SrsQueueRecvThread::size()
 {
     return (int)queue.size();
 }
 
-SrsMessage* SrsRecvThread::pump()
+SrsMessage* SrsQueueRecvThread::pump()
 {
     srs_assert(!queue.empty());
     
@@ -70,17 +70,17 @@ SrsMessage* SrsRecvThread::pump()
     return msg;
 }
 
-int SrsRecvThread::start()
+int SrsQueueRecvThread::start()
 {
     return trd->start();
 }
 
-void SrsRecvThread::stop()
+void SrsQueueRecvThread::stop()
 {
     trd->stop();
 }
 
-int SrsRecvThread::cycle()
+int SrsQueueRecvThread::cycle()
 {
     int ret = ERROR_SUCCESS;
     
@@ -114,7 +114,7 @@ int SrsRecvThread::cycle()
     return ret;
 }
 
-void SrsRecvThread::on_thread_start()
+void SrsQueueRecvThread::on_thread_start()
 {
     // the multiple messages writev improve performance large,
     // but the timeout recv will cause 33% sys call performance,
@@ -128,7 +128,7 @@ void SrsRecvThread::on_thread_start()
     rtmp->set_auto_response(false);
 }
 
-void SrsRecvThread::on_thread_stop()
+void SrsQueueRecvThread::on_thread_stop()
 {
     // enable the protocol auto response,
     // for the isolate recv thread terminated.
diff --git a/trunk/src/app/srs_app_recv_thread.hpp b/trunk/src/app/srs_app_recv_thread.hpp
index 640decd1c..29cd74b27 100644
--- a/trunk/src/app/srs_app_recv_thread.hpp
+++ b/trunk/src/app/srs_app_recv_thread.hpp
@@ -43,15 +43,15 @@ class SrsMessage;
 * @see: SrsRtmpConn::playing
 * @see: https://github.com/winlinvip/simple-rtmp-server/issues/217
 */
-class SrsRecvThread : public ISrsThreadHandler
+class SrsQueueRecvThread : public ISrsThreadHandler
 {
 private:
     SrsThread* trd;
     SrsRtmpServer* rtmp;
     std::vector<SrsMessage*> queue;
 public:
-    SrsRecvThread(SrsRtmpServer* rtmp_sdk);
-    virtual ~SrsRecvThread();
+    SrsQueueRecvThread(SrsRtmpServer* rtmp_sdk);
+    virtual ~SrsQueueRecvThread();
 public:
     virtual bool empty();
     virtual int size();
diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp
index f280490e4..d5663bcfb 100644
--- a/trunk/src/app/srs_app_rtmp_conn.cpp
+++ b/trunk/src/app/srs_app_rtmp_conn.cpp
@@ -500,7 +500,7 @@ int SrsRtmpConn::playing(SrsSource* source)
     
     // use isolate thread to recv, 
     // @see: https://github.com/winlinvip/simple-rtmp-server/issues/217
-    SrsRecvThread trd(rtmp);
+    SrsQueueRecvThread trd(rtmp);
     
     // start isolate recv thread.
     if ((ret = trd.start()) != ERROR_SUCCESS) {
@@ -522,7 +522,7 @@ int SrsRtmpConn::playing(SrsSource* source)
     return ret;
 }
 
-int SrsRtmpConn::do_playing(SrsSource* source, SrsRecvThread* trd)
+int SrsRtmpConn::do_playing(SrsSource* source, SrsQueueRecvThread* trd)
 {
     int ret = ERROR_SUCCESS;
     
diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp
index 0374c1077..06dd91707 100644
--- a/trunk/src/app/srs_app_rtmp_conn.hpp
+++ b/trunk/src/app/srs_app_rtmp_conn.hpp
@@ -49,7 +49,7 @@ class SrsBandwidth;
 class SrsKbps;
 class SrsRtmpClient;
 class SrsSharedPtrMessage;
-class SrsRecvThread;
+class SrsQueueRecvThread;
 
 /**
 * the client provides the main logic control for RTMP clients.
@@ -89,7 +89,7 @@ private:
     virtual int stream_service_cycle();
     virtual int check_vhost();
     virtual int playing(SrsSource* source);
-    virtual int do_playing(SrsSource* source, SrsRecvThread* trd);
+    virtual int do_playing(SrsSource* source, SrsQueueRecvThread* trd);
     virtual int fmle_publishing(SrsSource* source);
     virtual int do_fmle_publishing(SrsSource* source);
     virtual int flash_publishing(SrsSource* source);