proto-standard: fix normalization of incorrect timestamp

For whatever reason we perform a normalization on an incorrect timestamp, don't treat is as an negative value. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

proto-standard: fix normalization of incorrect timestamp
For whatever reason we perform a normalization on an incorrect timestamp, don't treat is as an negative value. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
5856bd77 · Adam Wujek · ed394bc1 · 5856bd77
Commit 5856bd77 authored Jul 31, 2017 by Adam Wujek 💬
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

arith.c proto-standard/arith.c +4 -1

No files found.
--- a/proto-standard/arith.c
+++ b/proto-standard/arith.c
@@ -14,7 +14,10 @@ void normalize_pp_time(struct pp_time *t)
 	/* no 64b division please, we'll rather loop a few times */
 	#define SNS_PER_S ((1000LL * 1000 * 1000) << 16)

-	int sign = (t->secs < 0 || (t->secs == 0 && t->scaled_nsecs < 0))
+	/* For whatever reason we perform a normalization on an incorrect
+	 * timestamp, don't treat is as an negative value. */
+	int64_t sign = ((t->secs < 0 && !is_incorrect(t))
+			|| (t->secs == 0 && t->scaled_nsecs < 0))
 		? -1 : 1;

 	/* turn into positive, to make code shorter (don't replicate loops) */