From 50fe7100fa2eb7c3a1be37e4b52ef752f4688356 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 31 May 2021 12:52:24 -0400 Subject: [PATCH] Remove the code to do adaptive skipping. We should never sleep when doing Analysis unless an error occurred. --- src/zm_analysis_thread.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/zm_analysis_thread.cpp b/src/zm_analysis_thread.cpp index 74d677316..1836cf6b1 100644 --- a/src/zm_analysis_thread.cpp +++ b/src/zm_analysis_thread.cpp @@ -22,28 +22,8 @@ void AnalysisThread::Start() { } void AnalysisThread::Run() { - Microseconds analysis_rate = Microseconds(monitor_->GetAnalysisRate()); - Seconds analysis_update_delay = Seconds(monitor_->GetAnalysisUpdateDelay()); - Debug(2, "AnalysisThread::Run() has an update delay of %" PRId64 "s", - static_cast(analysis_update_delay.count())); - - monitor_->UpdateAdaptiveSkip(); - - TimePoint last_analysis_update_time = std::chrono::steady_clock::now(); - TimePoint cur_time; - while (!(terminate_ or zm_terminate)) { // Some periodic updates are required for variable capturing framerate - if (analysis_update_delay != Seconds::zero()) { - cur_time = std::chrono::steady_clock::now(); - Debug(2, "Updating adaptive skip"); - if ((cur_time - last_analysis_update_time) > analysis_update_delay) { - analysis_rate = Microseconds(monitor_->GetAnalysisRate()); - monitor_->UpdateAdaptiveSkip(); - last_analysis_update_time = cur_time; - } - } - Debug(2, "Analyzing"); if (!monitor_->Analyse()) { if (!(terminate_ or zm_terminate)) { @@ -51,11 +31,6 @@ void AnalysisThread::Run() { Debug(2, "Sleeping for %" PRId64 "us", int64(sleep_for.count())); std::this_thread::sleep_for(sleep_for); } - } else if (analysis_rate != Microseconds::zero()) { - Debug(2, "Sleeping for %" PRId64 " us", int64(analysis_rate.count())); - std::this_thread::sleep_for(analysis_rate); - } else { - Debug(2, "Not sleeping"); } } }