ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use get_packet_no_wait and a sleep so that if told to close we give up on getting a packet

pull/4202/head
Isaac Connor 2024-08-01 18:01:28 -04:00
parent d194a97df8
commit fe0952588a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_event.cpp
View File

@ -716,8 +716,8 @@ void Event::Run() {
// The idea is to process the queue no matter what so that all packets get processed. // The idea is to process the queue no matter what so that all packets get processed.
// We only break if the queue is empty // We only break if the queue is empty
while (!terminate_) { while (!terminate_ and !zm_terminate) {
ZMLockedPacket *packet_lock = packetqueue->get_packet(packetqueue_it); ZMLockedPacket *packet_lock = packetqueue->get_packet_no_wait(packetqueue_it);
if (packet_lock) { if (packet_lock) {
std::shared_ptr<ZMPacket> packet = packet_lock->packet_; std::shared_ptr<ZMPacket> packet = packet_lock->packet_;
if (!packet->decoded) { if (!packet->decoded) {
@ -751,8 +751,8 @@ void Event::Run() {
Debug(1, "Deleting packet lock"); Debug(1, "Deleting packet lock");
delete packet_lock; delete packet_lock;
} else { } else {
//Warning("Unable to get packet lock"); if (terminate_ or zm_terminate) return;
return; usleep(10000);
} // end if packet_lock } // end if packet_lock
} // end while } // end while
} // end Run() } // end Run()