Revert "reduce oveflow chance in tick counters"

This reverts commit a278b3e854ec20dace996766509bc25e08b89319.

diff --git a/src/core/concurrent/qtconcurrentiteratekernel.cpp b/src/core/concurrent/qtconcurrentiteratekernel.cpp
index a0527f5..40d826a 100644 (file)
--- a/src/core/concurrent/qtconcurrentiteratekernel.cpp
+++ b/src/core/concurrent/qtconcurrentiteratekernel.cpp
@@ -50,7 +50,7 @@ static qint64 getticks()
     struct timespec ts;
     if (::clock_gettime(clockId, &ts) == -1)
         return 0;
-    return (ts.tv_sec + ts.tv_nsec);
+    return (ts.tv_sec * 1000000000) + ts.tv_nsec;
 }
 
 static inline double elapsed(qint64 after, qint64 before)

diff --git a/src/test/qbenchmarkmeasurement.cpp b/src/test/qbenchmarkmeasurement.cpp
index aac1f9d..fd11709 100644 (file)
--- a/src/test/qbenchmarkmeasurement.cpp
+++ b/src/test/qbenchmarkmeasurement.cpp
@@ -67,7 +67,7 @@ static qint64 getticks()
     struct timespec ts;
     if (::clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) == -1)
         return 0;
-    return (ts.tv_sec + ts.tv_nsec);
+    return (ts.tv_sec * 1000000000) + ts.tv_nsec;
 }
 
 void QBenchmarkTickMeasurer::start()