mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-11 02:16:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simply code about zm_terminate, replace fixed 60 second max sleep time with ZM_WATCH_MAX_DELAY

Browse Source
This commit is contained in:
Isaac Connor
2022-08-02 20:45:45 -04:00
parent 6f02096098
commit c40cedc15c
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/zmc.cpp
View File

@@ -251,36 +251,31 @@ int main(int argc, char *argv[]) {
monitor->Id());
zmDbDo(sql);
if (monitor->Capturing() == Monitor::CAPTURING_ONDEMAND) {
while (!zm_terminate and !monitor->hasViewers()) {
Debug(1, "ONDEMAND and no Viewers. Sleeping");
std::this_thread::sleep_for(Seconds(1));
monitor->SetHeartbeatTime(std::chrono::system_clock::now());
}
}
Seconds sleep_time = Seconds(0);
while (monitor->PrimeCapture() <= 0) {
while ((monitor->PrimeCapture() <= 0) and !zm_terminate) {
if (prime_capture_log_count % 60) {
logPrintf(Logger::ERROR + monitor->Importance(),
"Failed to prime capture of initial monitor");
logPrintf(Logger::ERROR + monitor->Importance(), "Failed to prime capture of initial monitor");
} else {
Debug(1, "Failed to prime capture of initial monitor");
}
prime_capture_log_count++;
if (zm_terminate) {
break;
}
if (sleep_time < Seconds(60)) {
if (sleep_time < Seconds(ZM_WATCH_MAX_DELAY)) {
sleep_time++;
}
std::this_thread::sleep_for(sleep_time);
monitor->SetHeartbeatTime(std::chrono::system_clock::now());
}
if (zm_terminate) {
break;
}
if (zm_terminate) break;
sql = stringtf(
"INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'Connected') ON DUPLICATE KEY UPDATE Status='Connected'",
@@ -288,9 +283,7 @@ int main(int argc, char *argv[]) {
zmDbDo(sql);
} // end foreach monitor
if (zm_terminate) {
break;
}
if (zm_terminate) break;
std::vector<SystemTimePoint> last_capture_times = std::vector<SystemTimePoint>(monitors.size());
Microseconds sleep_time = Microseconds(0);
@@ -325,11 +318,13 @@ int main(int argc, char *argv[]) {
}
monitors[i]->UpdateFPS();
SystemTimePoint now = std::chrono::system_clock::now();
monitors[i]->SetHeartbeatTime(now);
// capture_delay is the amount of time we should sleep in useconds to achieve the desired framerate.
Microseconds delay = (monitors[i]->GetState() == Monitor::ALARM) ? monitors[i]->GetAlarmCaptureDelay()
: monitors[i]->GetCaptureDelay();
if (delay != Seconds(0)) {
SystemTimePoint now = std::chrono::system_clock::now();
if (last_capture_times[i].time_since_epoch() != Seconds(0)) {
Microseconds delta_time = std::chrono::duration_cast<Microseconds>(now - last_capture_times[i]);