ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only update db entry when value changes

This commit is contained in:
Isaac Connor 2018-02-05 22:59:22 -05:00
parent 86ae1b6598
commit a4c956da7d
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/zm_monitor.cpp
View File

@ -1202,13 +1202,18 @@ bool Monitor::Analyse() {
gettimeofday( &now, NULL ); gettimeofday( &now, NULL );
if ( image_count && fps_report_interval && !(image_count%fps_report_interval) ) { if ( image_count && fps_report_interval && !(image_count%fps_report_interval) ) {
fps = double(fps_report_interval)/(now.tv_sec - last_fps_time);
Info( "%s: %d - Analysing at %.2f fps", name, image_count, fps ); double new_fps = double(fps_report_interval)/(now.tv_sec - last_fps_time);
static char sql[ZM_SQL_SML_BUFSIZ]; Info( "%s: %d - Analysing at %.2f fps", name, image_count, new_fps );
snprintf( sql, sizeof(sql), "INSERT INTO Monitor_Status (MonitorId,AnalysisFPS) VALUES (%d, %.2lf) ON DUPLICATE KEY UPDATE AnalysisFPS = %.2lf", id, fps, fps ); if ( fps != new_fps ) {
if ( mysql_query( &dbconn, sql ) ) { fps = new_fps;
Error( "Can't run query: %s", mysql_error( &dbconn ) ); static char sql[ZM_SQL_SML_BUFSIZ];
} snprintf(sql, sizeof(sql), "INSERT INTO Monitor_Status (MonitorId,AnalysisFPS) VALUES (%d, %.2lf) ON DUPLICATE KEY UPDATE AnalysisFPS = %.2lf", id, fps, fps);
if ( mysql_query(&dbconn, sql) ) {
Error("Can't run query: %s", mysql_error(&dbconn));
}
} // end if fps != new_fps
last_fps_time = now.tv_sec; last_fps_time = now.tv_sec;
} }
@ -3016,17 +3021,20 @@ Debug(4, "Return from Capture (%d)", captureResult);
// If we are too fast, we get div by zero. This seems to happen in the case of audio packets. // If we are too fast, we get div by zero. This seems to happen in the case of audio packets.
if ( now != last_fps_time ) { if ( now != last_fps_time ) {
// # of images per interval / the amount of time it took // # of images per interval / the amount of time it took
fps = double(fps_report_interval)/(now-last_fps_time); double new_fps = double(fps_report_interval)/(now-last_fps_time);
Info( "%d -> %d -> %d", fps_report_interval, now, last_fps_time ); //Info( "%d -> %d -> %d", fps_report_interval, now, last_fps_time );
//Info( "%d -> %d -> %lf -> %lf", now-last_fps_time, fps_report_interval/(now-last_fps_time), double(fps_report_interval)/(now-last_fps_time), fps ); //Info( "%d -> %d -> %lf -> %lf", now-last_fps_time, fps_report_interval/(now-last_fps_time), double(fps_report_interval)/(now-last_fps_time), fps );
Info( "%s: images:%d - Capturing at %.2lf fps", name, image_count, fps ); Info("%s: images:%d - Capturing at %.2lf fps", name, image_count, new_fps);
last_fps_time = now; last_fps_time = now;
static char sql[ZM_SQL_SML_BUFSIZ]; if ( new_fps != fps ) {
snprintf( sql, sizeof(sql), "INSERT INTO Monitor_Status (MonitorId,CaptureFPS) VALUES (%d, %.2lf) ON DUPLICATE KEY UPDATE CaptureFPS = %.2lf", id, fps, fps ); fps = new_fps;
if ( mysql_query( &dbconn, sql ) ) { static char sql[ZM_SQL_SML_BUFSIZ];
Error( "Can't run query: %s", mysql_error( &dbconn ) ); snprintf( sql, sizeof(sql), "INSERT INTO Monitor_Status (MonitorId,CaptureFPS) VALUES (%d, %.2lf) ON DUPLICATE KEY UPDATE CaptureFPS = %.2lf", id, fps, fps );
} if ( mysql_query( &dbconn, sql ) ) {
} Error( "Can't run query: %s", mysql_error( &dbconn ) );
}
} // end if new_fps != fps
} // end if time has changed since last update
} // end if captureResult } // end if captureResult
} }