merge from 2.0

@@ -71,6 +71,15 @@ int SrsThreadContext::set_id(int v)
     return ov;
     return ov;
 }
 }
 
 
+void SrsThreadContext::clear_cid()
+{
+    st_thread_t self = st_thread_self();
+    std::map<st_thread_t, int>::iterator it = cache.find(self);
+    if (it != cache.end()) {
+        cache.erase(it);
+    }
+}
+
 // the max size of a line of log.
 // the max size of a line of log.
 #define LOG_MAX_SIZE 4096
 #define LOG_MAX_SIZE 4096
 
 

@@ -54,6 +54,8 @@ public:
     virtual int generate_id();
     virtual int generate_id();
     virtual int get_id();
     virtual int get_id();
     virtual int set_id(int v);
     virtual int set_id(int v);
+public:
+    virtual void clear_cid();
 };
 };
 
 
 /**
 /**

@@ -903,6 +903,11 @@ int SrsServer::cycle()
     srs_warn("main cycle terminated, system quit normally.");
     srs_warn("main cycle terminated, system quit normally.");
     dispose();
     dispose();
     srs_trace("srs terminated");
     srs_trace("srs terminated");
+    
+    // for valgrind to detect.
+    srs_freep(_srs_config);
+    srs_freep(_srs_log);
+    
     exit(0);
     exit(0);
 #endif
 #endif
     
     

@@ -59,6 +59,9 @@ using namespace std;
 // when got these videos or audios, pure audio or video, mix ok.
 // when got these videos or audios, pure audio or video, mix ok.
 #define SRS_MIX_CORRECT_PURE_AV 10
 #define SRS_MIX_CORRECT_PURE_AV 10
 
 
+// the time to cleanup source in ms.
+#define SRS_SOURCE_CLEANUP 30000
+
 int _srs_time_jitter_string2int(std::string time_jitter)
 int _srs_time_jitter_string2int(std::string time_jitter)
 {
 {
     if (time_jitter == "full") {
     if (time_jitter == "full") {
@@ -803,15 +806,38 @@ void SrsSource::dispose_all()
 
 
 int SrsSource::cycle_all()
 int SrsSource::cycle_all()
 {
 {
+    int cid = _srs_context->get_id();
+    int ret = do_cycle_all();
+    _srs_context->set_id(cid);
+    return ret;
+}
+
+int SrsSource::do_cycle_all()
+{
     int ret = ERROR_SUCCESS;
     int ret = ERROR_SUCCESS;
     
     
-    // TODO: FIXME: support remove dead source for a long time.
     std::map<std::string, SrsSource*>::iterator it;
     std::map<std::string, SrsSource*>::iterator it;
-    for (it = pool.begin(); it != pool.end(); ++it) {
+    for (it = pool.begin(); it != pool.end();) {
         SrsSource* source = it->second;
         SrsSource* source = it->second;
         if ((ret = source->cycle()) != ERROR_SUCCESS) {
         if ((ret = source->cycle()) != ERROR_SUCCESS) {
             return ret;
             return ret;
         }
         }
+        
+        if (source->expired()) {
+            int cid = source->source_id();
+            if (cid == -1 && source->pre_source_id() > 0) {
+                cid = source->pre_source_id();
+            }
+            if (cid > 0) {
+                _srs_context->set_id(cid);
+            }
+            srs_trace("cleanup die source, total=%d", (int)pool.size());
+            
+            srs_freep(source);
+            pool.erase(it++);
+        } else {
+            ++it;
+        }
     }
     }
     
     
     return ret;
     return ret;
@@ -922,7 +948,8 @@ SrsSource::SrsSource()
     cache_metadata = cache_sh_video = cache_sh_audio = NULL;
     cache_metadata = cache_sh_video = cache_sh_audio = NULL;
     
     
     _can_publish = true;
     _can_publish = true;
-    _source_id = -1;
+    _pre_source_id = _source_id = -1;
+    die_at = -1;
     
     
     play_edge = new SrsPlayEdge();
     play_edge = new SrsPlayEdge();
     publish_edge = new SrsPublishEdge();
     publish_edge = new SrsPublishEdge();
@@ -1009,6 +1036,20 @@ int SrsSource::cycle()
     return ret;
     return ret;
 }
 }
 
 
+bool SrsSource::expired()
+{
+    if (!consumers.empty() || die_at == -1) {
+        return false;
+    }
+    
+    int64_t now = srs_get_system_time_ms();
+    if (now > die_at + SRS_SOURCE_CLEANUP) {
+        return true;
+    }
+    
+    return false;
+}
+
 int SrsSource::initialize(SrsRequest* r, ISrsSourceHandler* h, ISrsHlsHandler* hh)
 int SrsSource::initialize(SrsRequest* r, ISrsSourceHandler* h, ISrsHlsHandler* hh)
 {
 {
     int ret = ERROR_SUCCESS;
     int ret = ERROR_SUCCESS;
@@ -1362,6 +1403,12 @@ int SrsSource::on_source_id_changed(int id)
         return ret;
         return ret;
     }
     }
     
     
+    if (_pre_source_id == -1) {
+        _pre_source_id = id;
+    } else if (_pre_source_id != _source_id) {
+        _pre_source_id = _source_id;
+    }
+    
     _source_id = id;
     _source_id = id;
     
     
     // notice all consumer
     // notice all consumer
@@ -1379,6 +1426,11 @@ int SrsSource::source_id()
     return _source_id;
     return _source_id;
 }
 }
 
 
+int SrsSource::pre_source_id()
+{
+    return _pre_source_id;
+}
+
 bool SrsSource::can_publish(bool is_edge)
 bool SrsSource::can_publish(bool is_edge)
 {
 {
     if (is_edge) {
     if (is_edge) {
@@ -2121,6 +2173,11 @@ int SrsSource::on_publish()
 
 
 void SrsSource::on_unpublish()
 void SrsSource::on_unpublish()
 {
 {
+    // ignore when already unpublished.
+    if (_can_publish) {
+        return;
+    }
+    
     // destroy all forwarders
     // destroy all forwarders
     destroy_forwarders();
     destroy_forwarders();
 
 
@@ -2158,12 +2215,18 @@ void SrsSource::on_unpublish()
     SrsStatistic* stat = SrsStatistic::instance();
     SrsStatistic* stat = SrsStatistic::instance();
     stat->on_stream_close(req);
     stat->on_stream_close(req);
     handler->on_unpublish(this, req);
     handler->on_unpublish(this, req);
+    
+    // no consumer, stream is die.
+    if (consumers.empty()) {
+        die_at = srs_get_system_time_ms();
+    }
 }
 }
 
 
 int SrsSource::create_consumer(SrsConnection* conn, SrsConsumer*& consumer, bool ds, bool dm, bool dg)
 int SrsSource::create_consumer(SrsConnection* conn, SrsConsumer*& consumer, bool ds, bool dm, bool dg)
 {
 {
     int ret = ERROR_SUCCESS;
     int ret = ERROR_SUCCESS;
     
     
+    die_at = -1;
     consumer = new SrsConsumer(this, conn);
     consumer = new SrsConsumer(this, conn);
     consumers.push_back(consumer);
     consumers.push_back(consumer);
     
     
@@ -2240,6 +2303,7 @@ void SrsSource::on_consumer_destroy(SrsConsumer* consumer)
     
     
     if (consumers.empty()) {
     if (consumers.empty()) {
         play_edge->on_all_client_stop();
         play_edge->on_all_client_stop();
+        die_at = srs_get_system_time_ms();
     }
     }
 }
 }
 
 

@@ -441,6 +441,9 @@ public:
      */
      */
     static void dispose_all();
     static void dispose_all();
     static int cycle_all();
     static int cycle_all();
+private:
+    static int do_cycle_all();
+public:
     /**
     /**
     * when system exit, destroy the sources,
     * when system exit, destroy the sources,
     * for gmc to analysis mem leaks.
     * for gmc to analysis mem leaks.
@@ -453,6 +456,8 @@ private:
     // when source id changed, for example, the edge reconnect,
     // when source id changed, for example, the edge reconnect,
     // invoke the on_source_id_changed() to let all clients know.
     // invoke the on_source_id_changed() to let all clients know.
     int _source_id;
     int _source_id;
+    // previous source id.
+    int _pre_source_id;
     // deep copy of client request.
     // deep copy of client request.
     SrsRequest* req;
     SrsRequest* req;
     // to delivery stream to clients.
     // to delivery stream to clients.
@@ -508,6 +513,9 @@ private:
     * can publish, true when is not streaming
     * can publish, true when is not streaming
     */
     */
     bool _can_publish;
     bool _can_publish;
+    // last die time, when all consumers quit and no publisher,
+    // we will remove the source when source die.
+    int64_t die_at;
 private:
 private:
     SrsSharedPtrMessage* cache_metadata;
     SrsSharedPtrMessage* cache_metadata;
     // the cached video sequence header.
     // the cached video sequence header.
@@ -520,6 +528,8 @@ public:
 public:
 public:
     virtual void dispose();
     virtual void dispose();
     virtual int cycle();
     virtual int cycle();
+    // remove source when expired.
+    virtual bool expired();
 // initialize, get and setter.
 // initialize, get and setter.
 public:
 public:
     /**
     /**
@@ -547,6 +557,7 @@ public:
     virtual int on_source_id_changed(int id);
     virtual int on_source_id_changed(int id);
     // get current source id.
     // get current source id.
     virtual int source_id();
     virtual int source_id();
+    virtual int pre_source_id();
 // logic data methods
 // logic data methods
 public:
 public:
     virtual bool can_publish(bool is_edge);
     virtual bool can_publish(bool is_edge);

@@ -29,6 +29,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_app_utility.hpp>
+#include <srs_app_log.hpp>
 
 
 namespace internal
 namespace internal
 {
 {
@@ -248,6 +249,12 @@ namespace internal
         
         
         obj->thread_cycle();
         obj->thread_cycle();
         
         
+        // for valgrind to detect.
+        SrsThreadContext* ctx = dynamic_cast<SrsThreadContext*>(_srs_context);
+        if (ctx) {
+            ctx->clear_cid();
+        }
+        
         st_thread_exit(NULL);
         st_thread_exit(NULL);
         
         
         return NULL;
         return NULL;

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 // current release version
 #define VERSION_MAJOR       3
 #define VERSION_MAJOR       3
 #define VERSION_MINOR       0
 #define VERSION_MINOR       0
-#define VERSION_REVISION    213
+#define VERSION_REVISION    214
 
 
 // generated by configure, only macros.
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>
 #include <srs_auto_headers.hpp>