解决死锁问题

src/Common/MediaSource.cpp

@@ -253,8 +253,9 @@ MediaSource::Ptr MediaSource::find(const string &schema, const string &vhost_tmp
         vhost = DEFAULT_VHOST;
         vhost = DEFAULT_VHOST;
     }
     }
 
 
-    lock_guard<recursive_mutex> lock(g_mtxMediaSrc);
     MediaSource::Ptr ret;
     MediaSource::Ptr ret;
+    {
+        lock_guard<recursive_mutex> lock(g_mtxMediaSrc);
         //查找某一媒体源，找到后返回
         //查找某一媒体源，找到后返回
         searchMedia(g_mapMediaSrc, schema, vhost, app, id, [&](SchemaVhostAppStreamMap::iterator &it0,
         searchMedia(g_mapMediaSrc, schema, vhost, app, id, [&](SchemaVhostAppStreamMap::iterator &it0,
                                                                VhostAppStreamMap::iterator &it1,
                                                                VhostAppStreamMap::iterator &it1,
@@ -264,11 +265,13 @@ MediaSource::Ptr MediaSource::find(const string &schema, const string &vhost_tmp
             if (!ret) {
             if (!ret) {
                 //该对象已经销毁
                 //该对象已经销毁
                 it2->second.erase(it3);
                 it2->second.erase(it3);
-            eraseIfEmpty(g_mapMediaSrc,it0, it1, it2);
+                eraseIfEmpty(g_mapMediaSrc, it0, it1, it2);
                 return false;
                 return false;
             }
             }
             return true;
             return true;
         });
         });
+    }
+
     if(!ret && bMake){
     if(!ret && bMake){
         //未查找媒体源，则创建一个
         //未查找媒体源，则创建一个
         ret = MP4Reader::onMakeMediaSource(schema, vhost,app,id);
         ret = MP4Reader::onMakeMediaSource(schema, vhost,app,id);
@@ -288,10 +291,14 @@ void MediaSource::regist() {
     InfoL << _strSchema << " " << _strVhost << " " << _strApp << " " << _strId;
     InfoL << _strSchema << " " << _strVhost << " " << _strApp << " " << _strId;
     NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaChanged, true, *this);
     NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaChanged, true, *this);
 }
 }
+
+//反注册该源
 bool MediaSource::unregist() {
 bool MediaSource::unregist() {
-    //反注册该源
+    bool ret;
+    {
         lock_guard<recursive_mutex> lock(g_mtxMediaSrc);
         lock_guard<recursive_mutex> lock(g_mtxMediaSrc);
-    return searchMedia(g_mapMediaSrc, _strSchema, _strVhost, _strApp, _strId,[&](SchemaVhostAppStreamMap::iterator &it0,
+        ret = searchMedia(g_mapMediaSrc, _strSchema, _strVhost, _strApp, _strId,
+                          [&](SchemaVhostAppStreamMap::iterator &it0,
                               VhostAppStreamMap::iterator &it1,
                               VhostAppStreamMap::iterator &it1,
                               AppStreamMap::iterator &it2,
                               AppStreamMap::iterator &it2,
                               StreamMap::iterator &it3) {
                               StreamMap::iterator &it3) {
@@ -302,16 +309,17 @@ bool MediaSource::unregist() {
                               }
                               }
                               it2->second.erase(it3);
                               it2->second.erase(it3);
                               eraseIfEmpty(g_mapMediaSrc, it0, it1, it2);
                               eraseIfEmpty(g_mapMediaSrc, it0, it1, it2);
-        unregisted();
                               return true;
                               return true;
                           });
                           });
-}
-void MediaSource::unregisted(){
+    }
+
+    if(ret){
         InfoL <<  "" <<  _strSchema << " " << _strVhost << " " << _strApp << " " << _strId;
         InfoL <<  "" <<  _strSchema << " " << _strVhost << " " << _strApp << " " << _strId;
         NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaChanged, false, *this);
         NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaChanged, false, *this);
+    }
+    return ret;
 }
 }
 
 
-
 /////////////////////////////////////MediaInfo//////////////////////////////////////
 /////////////////////////////////////MediaInfo//////////////////////////////////////
 
 
 void MediaInfo::parse(const string &url){
 void MediaInfo::parse(const string &url){

src/Common/MediaSource.h

@@ -151,7 +151,6 @@ public:
 protected:
 protected:
     void regist() ;
     void regist() ;
     bool unregist() ;
     bool unregist() ;
-    void unregisted();
 private:
 private:
     string _strSchema;
     string _strSchema;
     string _strVhost;
     string _strVhost;