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

Switch to using std::string for inserting frames and stats. We just can't know how long the sql will be and we aren't going to waste 2MB of ram on it. Remove unused functions.

This commit is contained in:
Isaac Connor 2021-04-22 22:30:45 -04:00
parent d07d85dd6c
commit 27d200d376
2 changed files with 34 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/zm_event.cpp
View File

@ -36,11 +36,6 @@
const char * Event::frame_type_names[3] = { "Normal", "Bulk", "Alarm" };
#define MAX_DB_FRAMES 100
char frame_insert_sql[ZM_SQL_LGE_BUFSIZ] = "INSERT INTO `Frames` (`EventId`, `FrameId`, `Type`, `TimeStamp`, `Delta`, `Score`) VALUES ";
char stats_insert_sql[ZM_SQL_LGE_BUFSIZ] = "INSERT INTO `Stats` (`EventId`, `FrameId`, `MonitorId`, `ZoneId`, "
"`PixelDiff`, `AlarmPixels`, `FilterPixels`, `BlobPixels`,"
"`Blobs`,`MinBlobSize`, `MaxBlobSize`, "
"`MinX`, `MinY`, `MaxX`, `MaxY`,`Score`) VALUES ";
int Event::pre_alarm_count = 0;
@ -423,70 +418,6 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
} // end if update
} // void Event::updateNotes(const StringSetMap &newNoteSetMap)
void Event::AddFrames(int n_frames, Image **images, struct timeval **timestamps) {
for ( int i = 0; i < n_frames; i += ZM_SQL_BATCH_SIZE ) {
AddFramesInternal(n_frames, i, images, timestamps);
}
}
void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, struct timeval **timestamps) {
char *frame_insert_values = (char *)&frame_insert_sql + 90; // 90 == strlen(frame_insert_sql);
//static char sql[ZM_SQL_LGE_BUFSIZ];
//strncpy(sql, "INSERT INTO `Frames` (`EventId`, `FrameId`, `TimeStamp`, `Delta`) VALUES ", sizeof(sql));
int frameCount = 0;
for ( int i = start_frame; i < n_frames && i - start_frame < ZM_SQL_BATCH_SIZE; i++ ) {
if ( timestamps[i]->tv_sec <= 0 ) {
Debug(1, "Not adding pre-capture frame %d, zero or less than 0 timestamp", i);
continue;
} else {
Debug( 3, "Adding pre-capture frame %d, timestamp = (%d), start_time=(%d)", i, timestamps[i]->tv_sec, start_time.tv_sec );
}
frames++;
if ( save_jpegs & 1 ) {
std::string event_file = stringtf(staticConfig.capture_file_format, path.c_str(), frames);
Debug(1, "Writing pre-capture frame %d", frames);
WriteFrameImage(images[i], *(timestamps[i]), event_file.c_str());
}
//If this is the first frame, we should add a thumbnail to the event directory
// ICON: We are working through the pre-event frames so this snapshot won't
// neccessarily be of the motion. But some events are less than 10 frames,
// so I am changing this to 1, but we should overwrite it later with a better snapshot.
if ( frames == 1 ) {
WriteFrameImage(images[i], *(timestamps[i]), snapshot_file.c_str());
}
struct DeltaTimeval delta_time;
DELTA_TIMEVAL(delta_time, *(timestamps[i]), start_time, DT_PREC_2);
// Delta is Decimal(8,2) so 6 integer digits and 2 decimal digits
if ( delta_time.sec > 999999 ) {
Warning("Invalid delta_time from_unixtime(%ld), %s%ld.%02ld",
timestamps[i]->tv_sec,
(delta_time.positive?"":"-"),
delta_time.sec,
delta_time.fsec);
delta_time.sec = 0;
}
frame_insert_values += snprintf(frame_insert_values,
sizeof(frame_insert_sql)-(frame_insert_values-(char *)&frame_insert_sql),
"\n( %" PRIu64 ", %d, 'Normal', from_unixtime(%ld), %s%ld.%02ld, 0 ),",
id, frames, timestamps[i]->tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec);
frameCount++;
} // end foreach frame
if ( frameCount ) {
*(frame_insert_values-1) = '\0';
zmDbDo(frame_insert_sql);
last_db_frame = frames;
} else {
Debug(1, "No valid pre-capture frames to add");
}
end_time = *timestamps[n_frames-1];
} // void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, struct timeval **timestamps)
void Event::AddPacket(ZMPacket *packet) {
have_video_keyframe = have_video_keyframe ||
@ -510,18 +441,17 @@ void Event::AddPacket(ZMPacket *packet) {
}
void Event::WriteDbFrames() {
char *frame_insert_values_ptr = (char *)&frame_insert_sql + 90; // 90 == strlen(frame_insert_sql);
char *stats_insert_values_ptr = nullptr;
std::string frame_insert_sql = "INSERT INTO `Frames` (`EventId`, `FrameId`, `Type`, `TimeStamp`, `Delta`, `Score`) VALUES ";
std::string stats_insert_sql = "INSERT INTO `Stats` (`EventId`, `FrameId`, `MonitorId`, `ZoneId`, "
"`PixelDiff`, `AlarmPixels`, `FilterPixels`, `BlobPixels`,"
"`Blobs`,`MinBlobSize`, `MaxBlobSize`, "
"`MinX`, `MinY`, `MaxX`, `MaxY`,`Score`) VALUES ";
/* Each frame needs about 63 chars. So if we buffer too many frames, we will exceed the size of frame_insert_sql;
*/
Debug(1, "Inserting %d frames", frame_data.size());
while (frame_data.size()) {
Frame *frame = frame_data.front();
frame_data.pop();
frame_insert_values_ptr += snprintf(frame_insert_values_ptr,
sizeof(frame_insert_sql)-(frame_insert_values_ptr-(char *)&frame_insert_sql),
"\n( %" PRIu64 ", %d, '%s', from_unixtime( %ld ), %s%ld.%02ld, %d ),",
frame_insert_sql += stringtf("\n( %" PRIu64 ", %d, '%s', from_unixtime( %ld ), %s%ld.%02ld, %d ),",
id, frame->frame_id,
frame_type_names[frame->type],
frame->timestamp.tv_sec,
@ -530,12 +460,9 @@ void Event::WriteDbFrames() {
frame->delta.fsec,
frame->score);
if (config.record_event_stats and frame->zone_stats.size()) {
stats_insert_values_ptr = (char *)&stats_insert_sql + 208;
for (ZoneStats stats : frame->zone_stats) {
stats_insert_values_ptr += snprintf(stats_insert_values_ptr,
sizeof(stats_insert_sql)-(stats_insert_values_ptr-(char *)&stats_insert_sql),
"\n(%" PRIu64 ",%d,%u,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%u),",
Debug(1, "ZOne stats size for frame %d: %d", frame->frame_id, frame->zone_stats.size());
for (ZoneStats &stats : frame->zone_stats) {
stats_insert_sql += stringtf("\n(%" PRIu64 ",%d,%u,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%u),",
id, frame->frame_id,
monitor->Id(),
stats.zone_id,
@ -554,17 +481,17 @@ void Event::WriteDbFrames() {
} // end foreach zone stats
} // end if recording stats
delete frame;
}
*(frame_insert_values_ptr-1) = '\0'; // The -1 is for the extra , added for values above
zmDbDo(frame_insert_sql);
} // end while frames
frame_insert_sql.erase(frame_insert_sql.size()-1); // The -1 is for the extra , added for values above
//zmDbDo(frame_insert_sql);
//dbQueue.push(std::move(frame_insert_sql));
//dbQueue.push(std::move(sql));
if (stats_insert_values_ptr) {
*(stats_insert_values_ptr-1) = '\0'; // The -1 is for the extra , added for values above
zmDbDo(stats_insert_sql);
//dbQueue.push(std::move(stats_insert_sql));
if (stats_insert_sql.size() > 206) {
stats_insert_sql.erase(stats_insert_sql.size()-1); // The -1 is for the extra , added for values above
//zmDbDo(stats_insert_sql);
dbQueue.push(std::move(stats_insert_sql));
} else {
Debug(1, "stats size %d %s", stats_insert_sql.size(), stats_insert_sql.c_str());
}
//std::string sql(frame_insert_sql);
} // end void Event::WriteDbFrames()
void Event::AddFrame(
@ -647,10 +574,12 @@ void Event::AddFrame(
struct DeltaTimeval delta_time;
DELTA_TIMEVAL(delta_time, timestamp, start_time, DT_PREC_2);
Debug(1, "Frame delta is %d.%d - %d.%d = %d.%d",
Debug(1, "Frame delta is %d.%d - %d.%d = %d.%d, score %u zone_stats.size %u",
start_time.tv_sec, start_time.tv_usec,
timestamp.tv_sec, timestamp.tv_usec,
delta_time.sec, delta_time.fsec);
delta_time.sec, delta_time.fsec,
score,
zone_stats.size());
// The idea is to write out 1/sec
frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score, zone_stats));

6
src/zm_event.h
View File

@ -124,7 +124,6 @@ class Event {
void updateNotes(const StringSetMap &stringSetMap);
void AddFrames(int n_frames, Image **images, struct timeval **timestamps);
void AddFrame(
Image *image,
struct timeval timestamp,
@ -134,11 +133,6 @@ class Event {
);
private:
void AddFramesInternal(
int n_frames,
int start_frame,
Image **images,
struct timeval **timestamps);
void WriteDbFrames();
bool SetPath(Storage *storage);