mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-29 11:12:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix lock around deleting causinganalysis to hang

Browse Source
This commit is contained in:
Isaac Connor
2025-04-24 08:15:18 +05:30
parent cb23ce65e8
commit 6e6b3d097b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_packetqueue.cpp
View File

@@ -419,7 +419,10 @@ void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
} // end voidPacketQueue::clearPackets(ZMPacket* zm_packet)
void PacketQueue::stop() {
deleting = true;
{
std::unique_lock<std::mutex> lck(mutex);
deleting = true;
}
condition.notify_all();
for (const auto &p : pktQueue) {
p->notify_all();
@@ -544,7 +547,7 @@ ZMPacketLock PacketQueue::get_packet(packetqueue_iterator *it) {
Debug(2, "waiting on packet %d. Queue size %zu it == end? %d", p->image_index, pktQueue.size(), (*it == pktQueue.end()));
condition.wait(lck);
} // end while !lp
} // end while ! deleting or zm_terminate
} // end scope for lock
Debug(1, "terminated, leaving");