amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 03:10:04 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复一个可能导致死锁的bug

Browse Source
This commit is contained in:
xiongziliang 2018-11-07 16:59:42 +08:00
parent 823d887b17
commit 62d56ff395
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Common/MediaSource.cpp
View File

@ -73,9 +73,12 @@ MediaSource::Ptr MediaSource::find(
} }
bool MediaSource::regist() { bool MediaSource::regist() {
//注册该源，注册后服务器才能找到该源 //注册该源，注册后服务器才能找到该源
lock_guard<recursive_mutex> lock(g_mtxMediaSrc); bool success;
auto pr = g_mapMediaSrc[_strSchema][_strVhost][_strApp].emplace(_strId,shared_from_this()); {
auto success = pr.second; lock_guard<recursive_mutex> lock(g_mtxMediaSrc);
auto pr = g_mapMediaSrc[_strSchema][_strVhost][_strApp].emplace(_strId, shared_from_this());
success = pr.second;
}
if(success){ if(success){
InfoL << _strSchema << " " << _strVhost << " " << _strApp << " " << _strId; InfoL << _strSchema << " " << _strVhost << " " << _strApp << " " << _strId;
NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaChanged, NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaChanged,