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

hvlad · hvlad · commit 46fd841c585b · 2025-01-23T17:55:56.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
@@ -9130,7 +9130,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
`@@ -9130,7 +9130,7 @@ bool TimeoutTimer::expired() const`
`9130`	`9130`	`return false;`
`9131`	`9131`
`9132`	`9132`	`const SINT64 t = currTime();`
`9133`		`- return t >= m_start + m_value;`
	`9133`	`+ return t >= m_start + m_value - 1;`
`9134`	`9134`	`}`
`9135`	`9135`
`9136`	`9136`	`unsigned int TimeoutTimer::timeToExpire() const`