Merge srs_app_thread.hpp to srs_app_conn.hpp

trunk/configure

@@ -267,7 +267,7 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
 fi
 MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_source"
         "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http_stream"
-        "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config"
+        "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config"
         "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks"
         "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_edge"
         "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static"

trunk/ide/srs_upp/srs_upp.upp

@@ -142,8 +142,6 @@ file
     ../../src/app/srs_app_statistic.cpp,
     ../../src/app/srs_app_source.hpp,
     ../../src/app/srs_app_source.cpp,
-    ../../src/app/srs_app_thread.hpp,
-    ../../src/app/srs_app_thread.cpp,
     ../../src/app/srs_app_utility.hpp,
     ../../src/app/srs_app_utility.cpp,
     utest readonly separator,

trunk/src/app/srs_app_async_call.hpp

@@ -29,7 +29,7 @@
 #include <string>
 #include <vector>
 
-#include <srs_app_thread.hpp>
+#include <srs_app_st.hpp>
 
 // The async call for http hooks, for the http hooks will switch st-thread,
 // so we must use isolate thread to avoid the thread corrupt,

trunk/src/app/srs_app_caster_flv.hpp

@@ -40,7 +40,7 @@ class SrsFlvDecoder;
 class SrsTcpClient;
 class SrsSimpleRtmpClient;
 
-#include <srs_app_thread.hpp>
+#include <srs_app_st.hpp>
 #include <srs_app_listener.hpp>
 #include <srs_app_conn.hpp>
 #include <srs_app_http_conn.hpp>

trunk/src/app/srs_app_config.hpp

@@ -34,7 +34,7 @@
 
 #include <srs_app_reload.hpp>
 #include <srs_app_async_call.hpp>
-#include <srs_app_thread.hpp>
+#include <srs_app_st.hpp>
 
 class SrsRequest;
 class SrsFileWriter;

trunk/src/app/srs_app_conn.cpp

@@ -31,6 +31,69 @@ using namespace std;
 #include <srs_app_utility.hpp>
 #include <srs_kernel_utility.hpp>
 
+SrsCoroutineManager::SrsCoroutineManager()
+{
+    cond = srs_cond_new();
+    trd = new SrsSTCoroutine("manager", this);
+}
+
+SrsCoroutineManager::~SrsCoroutineManager()
+{
+    srs_freep(trd);
+    srs_cond_destroy(cond);
+
+    clear();
+}
+
+srs_error_t SrsCoroutineManager::start()
+{
+    srs_error_t err = srs_success;
+
+    if ((err = trd->start()) != srs_success) {
+        return srs_error_wrap(err, "coroutine manager");
+    }
+
+    return err;
+}
+
+srs_error_t SrsCoroutineManager::cycle()
+{
+    srs_error_t err = srs_success;
+
+    while (true) {
+        if ((err = trd->pull()) != srs_success) {
+            return srs_error_wrap(err, "coroutine mansger");
+        }
+
+        srs_cond_wait(cond);
+        clear();
+    }
+
+    return err;
+}
+
+void SrsCoroutineManager::remove(ISrsConnection* c)
+{
+    if (::find(conns.begin(), conns.end(), c) == conns.end()) {
+        conns.push_back(c);
+    }
+    srs_cond_signal(cond);
+}
+
+void SrsCoroutineManager::clear()
+{
+    // To prevent thread switch when delete connection,
+    // we copy all connections then free one by one.
+    vector<ISrsConnection*> copy;
+    copy.swap(conns);
+
+    vector<ISrsConnection*>::iterator it;
+    for (it = copy.begin(); it != copy.end(); ++it) {
+        ISrsConnection* conn = *it;
+        srs_freep(conn);
+    }
+}
+
 SrsConnection::SrsConnection(IConnectionManager* cm, srs_netfd_t c, string cip, int cport)
 {
     manager = cm;

trunk/src/app/srs_app_conn.hpp

@@ -27,15 +27,40 @@
 #include <srs_core.hpp>
 
 #include <string>
+#include <vector>
 
 #include <srs_app_st.hpp>
-#include <srs_app_thread.hpp>
 #include <srs_protocol_kbps.hpp>
 #include <srs_app_reload.hpp>
 #include <srs_service_conn.hpp>
 
 class SrsWallClock;
 
+// The coroutine manager use a thread to delete a connection, which will stop the service
+// thread, for example, when the RTMP connection thread cycle terminated, it will notify
+// the manager(the server) to remove the connection from list of server and push it to
+// the manager thread to delete it, finally the thread of connection will stop.
+class SrsCoroutineManager : virtual public ISrsCoroutineHandler, virtual public IConnectionManager
+{
+private:
+    SrsCoroutine* trd;
+    std::vector<ISrsConnection*> conns;
+    srs_cond_t cond;
+public:
+    SrsCoroutineManager();
+    virtual ~SrsCoroutineManager();
+public:
+    srs_error_t start();
+// Interface ISrsCoroutineHandler
+public:
+    virtual srs_error_t cycle();
+// Interface IConnectionManager
+public:
+    virtual void remove(ISrsConnection* c);
+private:
+    void clear();
+};
+
 // The basic connection of SRS,
 // all connections accept from listener must extends from this base class,
 // server will add the connection to manager, and delete it when remove.

trunk/src/app/srs_app_edge.hpp

@@ -27,7 +27,6 @@
 #include <srs_core.hpp>
 
 #include <srs_app_st.hpp>
-#include <srs_app_thread.hpp>
 
 #include <string>
 

trunk/src/app/srs_app_encoder.hpp

@@ -29,7 +29,7 @@
 #include <string>
 #include <vector>
 
-#include <srs_app_thread.hpp>
+#include <srs_app_st.hpp>
 
 class SrsConfDirective;
 class SrsRequest;

trunk/src/app/srs_app_forward.hpp

@@ -29,7 +29,6 @@
 #include <string>
 
 #include <srs_app_st.hpp>
-#include <srs_app_thread.hpp>
 
 class ISrsProtocolReadWriter;
 class SrsSharedPtrMessage;

trunk/src/app/srs_app_gb28181.hpp

@@ -33,7 +33,6 @@
 #include <map>
 
 #include <srs_app_st.hpp>
-#include <srs_app_thread.hpp>
 #include <srs_app_listener.hpp>
 #include <srs_rtsp_stack.hpp>
 #include <srs_kernel_stream.hpp>

trunk/src/app/srs_app_http_conn.hpp

@@ -33,7 +33,7 @@
 #include <srs_service_http_conn.hpp>
 #include <srs_app_reload.hpp>
 #include <srs_kernel_file.hpp>
-#include <srs_app_thread.hpp>
+#include <srs_app_st.hpp>
 #include <srs_app_conn.hpp>
 #include <srs_app_source.hpp>
 

trunk/src/app/srs_app_ingest.hpp

@@ -28,7 +28,7 @@
 
 #include <vector>
 
-#include <srs_app_thread.hpp>
+#include <srs_app_st.hpp>
 #include <srs_app_reload.hpp>
 
 class SrsFFMPEG;

trunk/src/app/srs_app_listener.hpp

@@ -32,7 +32,6 @@
 #include <string>
 
 #include <srs_app_st.hpp>
-#include <srs_app_thread.hpp>
 
 struct sockaddr;
 

trunk/src/app/srs_app_ng_exec.hpp

@@ -29,7 +29,7 @@
 #include <vector>
 #include <string>
 
-#include <srs_app_thread.hpp>
+#include <srs_app_st.hpp>
 
 class SrsRequest;
 class SrsPithyPrint;

trunk/src/app/srs_app_recv_thread.hpp

@@ -29,7 +29,7 @@
 #include <vector>
 #include <string>
 
-#include <srs_app_thread.hpp>
+#include <srs_app_st.hpp>
 #include <srs_protocol_stream.hpp>
 #include <srs_core_performance.hpp>
 #include <srs_app_reload.hpp>

trunk/src/app/srs_app_rtsp.hpp

@@ -31,8 +31,8 @@
 #include <map>
 
 #include <srs_app_st.hpp>
-#include <srs_app_thread.hpp>
 #include <srs_app_listener.hpp>
+#include <srs_service_conn.hpp>
 
 class SrsStSocket;
 class SrsRtspConn;
@@ -51,6 +51,7 @@ class SrsAudioFrame;
 class SrsSimpleStream;
 class SrsPithyPrint;
 class SrsSimpleRtmpClient;
+class SrsCoroutineManager;
 
 // A rtp connection which transport a stream.
 class SrsRtpConn: public ISrsUdpHandler

trunk/src/app/srs_app_server.cpp

@@ -52,7 +52,6 @@ using namespace std;
 #include <srs_app_caster_flv.hpp>
 #include <srs_core_mem_watch.hpp>
 #include <srs_kernel_consts.hpp>
-#include <srs_app_thread.hpp>
 #include <srs_app_coworkers.hpp>
 #include <srs_app_gb28181.hpp>
 #include <srs_app_gb28181_sip.hpp>

trunk/src/app/srs_app_thread.cpp

@@ -1,95 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2013-2020 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_thread.hpp>
-
-#include <srs_kernel_error.hpp>
-#include <srs_kernel_log.hpp>
-
-#include <vector>
-#include <algorithm>
-using namespace std;
-
-SrsCoroutineManager::SrsCoroutineManager()
-{
-    cond = srs_cond_new();
-    trd = new SrsSTCoroutine("manager", this);
-}
-
-SrsCoroutineManager::~SrsCoroutineManager()
-{
-    srs_freep(trd);
-    srs_cond_destroy(cond);
-    
-    clear();
-}
-
-srs_error_t SrsCoroutineManager::start()
-{
-    srs_error_t err = srs_success;
-    
-    if ((err = trd->start()) != srs_success) {
-        return srs_error_wrap(err, "coroutine manager");
-    }
-    
-    return err;
-}
-
-srs_error_t SrsCoroutineManager::cycle()
-{
-    srs_error_t err = srs_success;
-    
-    while (true) {
-        if ((err = trd->pull()) != srs_success) {
-            return srs_error_wrap(err, "coroutine mansger");
-        }
-        
-        srs_cond_wait(cond);
-        clear();
-    }
-    
-    return err;
-}
-
-void SrsCoroutineManager::remove(ISrsConnection* c)
-{
-    if (::find(conns.begin(), conns.end(), c) == conns.end()) {
-        conns.push_back(c);
-    }
-    srs_cond_signal(cond);
-}
-
-void SrsCoroutineManager::clear()
-{
-    // To prevent thread switch when delete connection,
-    // we copy all connections then free one by one.
-    vector<ISrsConnection*> copy;
-    copy.swap(conns);
-    
-    vector<ISrsConnection*>::iterator it;
-    for (it = copy.begin(); it != copy.end(); ++it) {
-        ISrsConnection* conn = *it;
-        srs_freep(conn);
-    }
-}
-

trunk/src/app/srs_app_thread.hpp

@@ -1,60 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2013-2020 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_THREAD_HPP
-#define SRS_APP_THREAD_HPP
-
-#include <srs_core.hpp>
-
-#include <vector>
-
-#include <srs_app_st.hpp>
-#include <srs_service_conn.hpp>
-
-// The coroutine manager use a thread to delete a connection, which will stop the service
-// thread, for example, when the RTMP connection thread cycle terminated, it will notify
-// the manager(the server) to remove the connection from list of server and push it to
-// the manager thread to delete it, finally the thread of connection will stop.
-class SrsCoroutineManager : virtual public ISrsCoroutineHandler, virtual public IConnectionManager
-{
-private:
-    SrsCoroutine* trd;
-    std::vector<ISrsConnection*> conns;
-    srs_cond_t cond;
-public:
-    SrsCoroutineManager();
-    virtual ~SrsCoroutineManager();
-public:
-    srs_error_t start();
-// Interface ISrsCoroutineHandler
-public:
-    virtual srs_error_t cycle();
-// Interface IConnectionManager
-public:
-    virtual void remove(ISrsConnection* c);
-private:
-    void clear();
-};
-
-#endif
-