Bug fix in picos_to_interval

- This function checks now the minimum and maximum values which can be encoded into a RelativeDifference type. - Bux fix for the calculation of min/max value conversion (special cases)

Bug fix in picos_to_interval
- This function checks now the minimum and maximum values which can be encoded into a RelativeDifference type. - Bux fix for the calculation of min/max value conversion (special cases)
b6a29541 · Jean-Claude BAU · Adam Wujek · 0856535b · b6a29541
Commit b6a29541 authored Sep 28, 2018 by Jean-Claude BAU Committed by Adam Wujek Nov 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 1 deletion

time-arith.c lib/time-arith.c +21 -1

No files found.
--- a/lib/time-arith.c
+++ b/lib/time-arith.c
@@ -148,7 +148,27 @@ TimeInterval pp_time_to_interval(struct pp_time *ts)

 TimeInterval picos_to_interval(int64_t picos)
 {
-	return (picos << TIME_INTERVAL_FRACBITS)/1000;
+	if ( picos <= TIME_INTERVAL_MIN_PICOS_VALUE_AS_INT64) {
+		/* special case : Return the minimum value */
+		/* The evaluation is made at compilation time */
+		return (TimeInterval) 1<<(64-1); /* Maximum negative value */
+	}
+	if (  picos >= TIME_INTERVAL_MAX_PICOS_VALUE_AS_INT64 ) {
+		/* special case : Return the maximum */
+		/* The evaluation is made at compilation time */
+		return (TimeInterval) (((TIME_INTERVAL_MAX_PICOS_VALUE_AS_INT64/1000) <<  TIME_INTERVAL_FRACBITS)|
+				(((TIME_INTERVAL_MAX_PICOS_VALUE_AS_INT64%1000) << TIME_INTERVAL_FRACBITS)/1000));
+	} else {
+
+		int64_t scaled_ns;
+
+		int sign = (picos < 0 ? -1 : 1);
+		picos *= sign;
+		scaled_ns=(picos/1000) << TIME_INTERVAL_FRACBITS; /* Calculate nanos */
+		scaled_ns|=((picos%1000) << TIME_INTERVAL_FRACBITS)/1000; /* Add picos */
+
+		return scaled_ns*sign;
+	}
 }

 int64_t interval_to_picos(TimeInterval interval)