Make TimeoutTimer::expired() tolerate rounding in TimeoutTimer::currTime() up to 1 ms.

hvlad · hvlad · commit 88d9d867c2cb · 2025-01-24T13:01:45.000+02:00
This should fix failures of QA test for #6802 that sometimes happens due to waiting in Lock Manager completes 1ms before timer expiration.
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
@@ -8988,7 +8988,7 @@ bool TimeoutTimer::expired() const
 		return false;
 
 	const SINT64 t = currTime();
-	return t >= m_start + m_value;
+	return t >= m_start + m_value - 1;
 }
 
 unsigned int TimeoutTimer::timeToExpire() const

Original file line number	Diff line number	Diff line change
`@@ -8988,7 +8988,7 @@ bool TimeoutTimer::expired() const`
`8988`	`8988`	`return false;`
`8989`	`8989`
`8990`	`8990`	`const SINT64 t = currTime();`
`8991`		`- return t >= m_start + m_value;`
	`8991`	`+ return t >= m_start + m_value - 1;`
`8992`	`8992`	`}`
`8993`	`8993`
`8994`	`8994`	`unsigned int TimeoutTimer::timeToExpire() const`