From f8e9b985c8240a113de921344304390b21544994 Mon Sep 17 00:00:00 2001 From: Sylvain Chapeland Date: Thu, 5 May 2022 19:18:19 +0200 Subject: [PATCH 1/2] fix regulator not working after 35min, wrong conversion --- src/RateRegulator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RateRegulator.h b/src/RateRegulator.h index 7e4ecf2d..4226db3e 100644 --- a/src/RateRegulator.h +++ b/src/RateRegulator.h @@ -76,7 +76,7 @@ class RateRegulator { void updateTimeNext() { if (tnextCount >= tnextFullRefreshInterval) { // full update, calculated from t0 - tnext = t0 + std::chrono::microseconds((int)(nItemsAccepted * period)); + tnext = t0 + std::chrono::microseconds((unsigned long long)(nItemsAccepted * period)); tnextCount = 1; } else { // quick update, by incrementing period From 868b82a917d78351b7e581747694a75c1f03187e Mon Sep 17 00:00:00 2001 From: Sylvain Chapeland Date: Thu, 5 May 2022 19:18:40 +0200 Subject: [PATCH 2/2] v2.10.3 --- doc/releaseNotes.md | 3 +++ src/ReadoutVersion.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md index 6cbd0327..2a164606 100644 --- a/doc/releaseNotes.md +++ b/doc/releaseNotes.md @@ -454,3 +454,6 @@ This file describes the main feature changes for each readout.exe released versi ## v2.10.2 - 04/05/2022 - Added some buffer monitoring counters. They are logged in console stats and in monitoring (readout.bufferUsage, one per buffer, from 0% to 100%). + +## v2.10.3 - 05/05/2022 +- Bug fixed in the readout TF rate regulator (was ineffective after 35 minutes = 2^31 microseconds - wrong variable width in a conversion). diff --git a/src/ReadoutVersion.h b/src/ReadoutVersion.h index eb5e9d08..65e54c52 100644 --- a/src/ReadoutVersion.h +++ b/src/ReadoutVersion.h @@ -9,5 +9,5 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -#define READOUT_VERSION "2.10.2" +#define READOUT_VERSION "2.10.3"