external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Refine resource manager, fix loop and context switching bug

Browse source
This commit is contained in:
winlin 2020-09-20 22:09:03 +08:00
parent 033e2f9210
commit 1a33452e95
3 changed files with 93 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
trunk/src/app/srs_app_conn.cpp
View file

@ -47,6 +47,7 @@ SrsResourceManager::SrsResourceManager(const std::string& label, bool verbose)
label_ = label;
cond = srs_cond_new();
trd = NULL;
p_disposing_ = NULL;
}
SrsResourceManager::~SrsResourceManager()
@ -168,15 +169,30 @@ void SrsResourceManager::remove(ISrsResource* c)
srs_trace("before dispose resource(%s), zombies=%d", c->desc().c_str(), (int)zombies_.size());
}
if (std::find(zombies_.begin(), zombies_.end(), c) == zombies_.end()) {
zombies_.push_back(c);
// Only notify when not removed(in zombies_).
vector<ISrsResource*>::iterator it = std::find(zombies_.begin(), zombies_.end(), c);
if (it != zombies_.end()) {
return;
}
// Also ignore when we are disposing it.
if (p_disposing_) {
it = std::find(p_disposing_->begin(), p_disposing_->end(), c);
if (it != p_disposing_->end()) {
return;
}
}
// Push to zombies, we will free it in another coroutine.
zombies_.push_back(c);
// Notify other handlers to handle the before-dispose event.
for (int i = 0; i < (int)handlers_.size(); i++) {
ISrsDisposingHandler* h = handlers_.at(i);
h->on_before_dispose(c);
}
// Notify the coroutine to free it.
srs_cond_signal(cond);
}
@ -191,10 +207,19 @@ void SrsResourceManager::clear()
srs_trace("clear zombies=%d connections", (int)zombies_.size());
}
do_clear();
// Reset it for it points to a local object.
p_disposing_ = NULL;
}
void SrsResourceManager::do_clear()
{
// To prevent thread switch when delete connection,
// we copy all connections then free one by one.
vector<ISrsResource*> copy;
copy.swap(zombies_);
p_disposing_ = &copy;
vector<ISrsResource*>::iterator it;
for (it = copy.begin(); it != copy.end(); ++it) {