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

notifierConveyer destruction protection

Browse Source 
Remove the work variable
This commit is contained in:
Andrew Johnson
2020-12-03 16:50:42 -06:00
committed by mdavidsaver
parent 345f2782cd
commit 0332d0f2c1
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ca/notifierConveyor.cpp
View File

@ -60,12 +60,10 @@ void NotifierConveyor::run()
workToDo.wait();
Lock the(mutex);
stopping = halt;
bool work = !workQueue.empty();
while (work)
while (!stopping && !workQueue.empty())
{
NotificationWPtr notificationWPtr(workQueue.front());
workQueue.pop();
work = !workQueue.empty();
NotificationPtr notification(notificationWPtr.lock());
if (notification) {
notification->queued = false;
@ -81,11 +79,10 @@ void NotifierConveyor::run()
std::cerr << "Unknown exception from notifyClient()"
<< std::endl;
}
if (work) {
the.lock();
stopping = halt;
}
the.lock();
}
stopping = halt;
// client's destructor may run here, could delete *this
}
}
} while (!stopping);