epics/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fix lock order

Browse Source 
maybe introducing issue w/ concurrent release()...
This commit is contained in:
Michael Davidsaver
2016-03-19 17:54:10 -04:00
parent 322810a5f0
commit 76bab402ef
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/pvahelper.h
View File

@ -324,14 +324,17 @@ public:
virtual void destroy()
{
requester_t::shared_pointer req;
bool run;
{
guard_t G(lock);
if(running) {
run = running;
if(run) {
running = false;
this->onStop();
}
requester.swap(req);
}
if(run)
this->onStop();
}
private:
@ -387,13 +390,14 @@ private:
virtual void release(epics::pvAccess::MonitorElementPtr const & elem)
{
BaseMonitor::shared_pointer self;
requester_t::shared_pointer req;
{
guard_t G(lock);
empty.push_back(elem);
if(inoverflow)
this->requestUpdate(); // may result in post()
self = weakself.lock(); //TODO: concurrent release?
}
if(self)
self->requestUpdate(); // may result in post()
}
public:
virtual void getStats(Stats& s) const