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

Queue packets instead of packet locks in event thread. Since we are using std::shared_ptr and not modifying the packet, should not need locking. Also, locking in one thread and unlocking in another is apparentlyundefined behaviour and doesn't work infreebsd.

Browse Source
This commit is contained in:
Isaac Connor
2023-01-20 01:38:09 -05:00
parent 9c52ae7856
commit 08f02ecd09
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/zm_monitor.cpp
View File

@@ -2263,7 +2263,7 @@ bool Monitor::Analyse() {
}
if (event) {
event->AddPacket(packet_lock);
event->AddPacket(snap);
} else {
// In the case where people have pre-alarm frames, the web ui will generate the frame images
// from the mp4. So no one will notice anyways.
@@ -2283,9 +2283,9 @@ bool Monitor::Analyse() {
// Free up the decoded frame as well, we won't be using it for anything at this time.
snap->out_frame = nullptr;
delete packet_lock;
}
} // end scope for event_lock
delete packet_lock;
packetqueue.increment_it(analysis_it);
shared_data->last_read_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
@@ -2892,7 +2892,10 @@ Event * Monitor::openEvent(
// Write out starting packets, do not modify packetqueue it will garbage collect itself
while (starting_packet_lock && (*start_it != *analysis_it) && !zm_terminate) {
ZM_DUMP_PACKET(starting_packet_lock->packet_->packet, "Queuing packet for event");
event->AddPacket(starting_packet_lock);
event->AddPacket(starting_packet);
delete starting_packet_lock;
starting_packet_lock = nullptr;
packetqueue.increment_it(start_it);
if ((*start_it) != *analysis_it) {