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

Just code cleanups, but also add a mysqL-free_result which should fix a mem leak

pull/3783/head
Isaac Connor 2023-11-01 16:48:22 -04:00
parent 859baf6f8f
commit 5bb7529c3e
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/zm_eventstream.cpp
View File

@ -47,8 +47,7 @@ bool EventStream::loadInitialEventData(int monitor_id, SystemTimePoint event_tim
"ORDER BY `Id` ASC LIMIT 1", monitor_id, std::chrono::system_clock::to_time_t(event_time)); "ORDER BY `Id` ASC LIMIT 1", monitor_id, std::chrono::system_clock::to_time_t(event_time));
MYSQL_RES *result = zmDbFetch(sql); MYSQL_RES *result = zmDbFetch(sql);
if (!result) if (!result) exit(-1);
exit(-1);
MYSQL_ROW dbrow = mysql_fetch_row(result); MYSQL_ROW dbrow = mysql_fetch_row(result);
@ -68,7 +67,7 @@ bool EventStream::loadInitialEventData(int monitor_id, SystemTimePoint event_tim
curr_frame_id = 1; // curr_frame_id is 1-based curr_frame_id = 1; // curr_frame_id is 1-based
if (event_time >= event_data->start_time) { if (event_time >= event_data->start_time) {
Debug(2, "event time is after event start"); Debug(2, "event time is after event start");
for (int i = 0; i < event_data->frame_count; i++) { for (int i=0; i < event_data->frame_count; i++) {
//Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time ); //Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time );
if (event_data->frames[i].timestamp >= event_time) { if (event_data->frames[i].timestamp >= event_time) {
curr_frame_id = i + 1; curr_frame_id = i + 1;
@ -750,19 +749,14 @@ bool EventStream::checkEventLoaded() {
loadEventData(event_id); loadEventData(event_id);
if ( replay_rate < 0 ) // rewind curr_frame_id = replay_rate < 0 ? event_data->last_frame_id : 1;
curr_frame_id = event_data->last_frame_id;
else
curr_frame_id = 1;
Debug(2, "New frame id = %d", curr_frame_id); Debug(2, "New frame id = %d", curr_frame_id);
start = std::chrono::steady_clock::now(); start = std::chrono::steady_clock::now();
mysql_free_result(result);
return true; return true;
} else { } else {
Debug(2, "No next event loaded using %s. Pausing", sql.c_str()); Debug(2, "No next event loaded using %s. Pausing", sql.c_str());
if ( curr_frame_id <= 0 ) curr_frame_id = curr_frame_id <= 0 ? 1 : event_data->frame_count;
curr_frame_id = 1;
else
curr_frame_id = event_data->frame_count;
paused = true; paused = true;
sendTextFrame("No more event data found"); sendTextFrame("No more event data found");
} // end if found a new event or not } // end if found a new event or not
@ -770,10 +764,7 @@ bool EventStream::checkEventLoaded() {
forceEventChange = false; forceEventChange = false;
} else { } else {
Debug(2, "Pausing because mode is %s", StreamMode_Strings[mode].c_str()); Debug(2, "Pausing because mode is %s", StreamMode_Strings[mode].c_str());
if ( curr_frame_id <= 0 ) curr_frame_id = curr_frame_id <= 0 ? 1 : event_data->last_frame_id;
curr_frame_id = 1;
else
curr_frame_id = event_data->last_frame_id;
paused = true; paused = true;
} }
return false; return false;
@ -964,7 +955,7 @@ void EventStream::runStream() {
if (!paused) { if (!paused) {
// Figure out if we should send this frame // Figure out if we should send this frame
Debug(3, "not paused at cur_frame_id (%d-1) mod frame_mod(%d)", curr_frame_id, frame_mod); Debug(3, "not paused at curr_frame_id (%d-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
// If we are streaming and this frame is due to be sent // If we are streaming and this frame is due to be sent
// frame mod defaults to 1 and if we are going faster than max_fps will get multiplied by 2 // frame mod defaults to 1 and if we are going faster than max_fps will get multiplied by 2
// so if it is 2, then we send every other frame, if is it 4 then every fourth frame, etc. // so if it is 2, then we send every other frame, if is it 4 then every fourth frame, etc.
@ -1111,7 +1102,7 @@ void EventStream::runStream() {
} // end if !paused } // end if !paused
} // end scope for mutex lock } // end scope for mutex lock
if (send_frame && type != STREAM_MPEG) { if (send_frame && (type != STREAM_MPEG)) {
if (delta > Seconds(0)) { if (delta > Seconds(0)) {
if (delta > MAX_SLEEP) { if (delta > MAX_SLEEP) {
Debug(1, "Limiting sleep to %" PRIi64 " ms because calculated sleep is too long %" PRIi64, Debug(1, "Limiting sleep to %" PRIi64 " ms because calculated sleep is too long %" PRIi64,