Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-29 06:12:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

避免死锁

Browse Source
This commit is contained in:
xiongziliang
2020-04-06 21:23:35 +08:00
parent e192931429
commit 45c5f1ec4c
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Extension/Frame.h
View File

@@ -192,13 +192,17 @@ public:
virtual ~FrameDispatcher(){}
void addDelegate(const FrameWriterInterface::Ptr &delegate){
//_delegates_write可能多线程同时操作
lock_guard<mutex> lck(_mtx);
_delegateMap.emplace(delegate.get(),delegate);
_delegates_write.emplace(delegate.get(),delegate);
_need_update = true;
}
void delDelegate(void *ptr){
//_delegates_write可能多线程同时操作
lock_guard<mutex> lck(_mtx);
_delegateMap.erase(ptr);
_delegates_write.erase(ptr);
_need_update = true;
}
/**
@@ -206,14 +210,23 @@ public:
* @param frame 帧
*/
void inputFrame(const Frame::Ptr &frame) override{
lock_guard<mutex> lck(_mtx);
for(auto &pr : _delegateMap){
//_delegates_read能确保是单线程操作的
for(auto &pr : _delegates_read){
pr.second->inputFrame(frame);
}
if(_need_update){
//发现代理列表发生变化了，这里同步一次
lock_guard<mutex> lck(_mtx);
_delegates_read = _delegates_write;
_need_update = false;
}
}
private:
mutex _mtx;
map<void *,FrameWriterInterface::Ptr> _delegateMap;
map<void *,FrameWriterInterface::Ptr> _delegates_read;
map<void *,FrameWriterInterface::Ptr> _delegates_write;
bool _need_update = false;
};
/**