Add the non-Mac Unix implementation of QTimestamp.

Task-number: QT-2965

2 files changed, 150 insertions, 0 deletions

diff --git a/src/corelib/tools/qtimestamp_unix.cpp b/src/corelib/tools/qtimestamp_unix.cpp
new file mode 100644
index 0000000..b82259f
--- /dev/null
+++ b/src/corelib/tools/qtimestamp_unix.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtimestamp.h"
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+#if !defined(QT_NO_CLOCK_MONOTONIC)
+# if defined(QT_BOOTSTRAPPED)
+#  define QT_NO_CLOCK_MONOTONIC
+# endif
+#endif
+
+QT_BEGIN_NAMESPACE
+
+bool QTimestamp::isMonotonic()
+{
+#if (_POSIX_MONOTONIC_CLOCK-0 > 0)
+    return true;
+#else
+    static int returnValue = 0;
+
+    if (returnValue == 0) {
+#  if (_POSIX_MONOTONIC_CLOCK-0 < 0)
+        returnValue = -1;
+#  elif (_POSIX_MONOTONIC_CLOCK == 0)
+        // detect if the system support monotonic timers
+        long x = sysconf(_SC_MONOTONIC_CLOCK);
+        returnValue = (x >= 200112L) ? 1 : -1;
+#  endif
+    }
+
+    return returnValue != -1;
+#endif
+}
+
+static qint64 fractionAdjustment()
+{
+    if (QTimestamp::isMonotonic()) {
+        // the monotonic timer is measured in nanoseconds
+        // 1 ms = 1000000 ns
+        return 1000*1000ull;
+    } else {
+        // gettimeofday is measured in microseconds
+        // 1 ms = 1000 us
+        return 1000;
+    }
+}
+
+void QTimestamp::start()
+{
+#if (_POSIX_MONOTONIC_CLOCK-0 > 0)
+    timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    t1 = ts.tv_sec;
+    t2 = ts.tv_nsec;
+#else
+#  if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED)
+    if (isMonotonic()) {
+        timespec ts;
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+        t1 = ts.tv_sec;
+        t2 = ts.tv_nsec;
+        return;
+    }
+#  endif
+    // use gettimeofday
+    timeval tv;
+    ::gettimeofday(&tv, 0);
+    t1 = tv.tv_sec;
+    t2 = tv.tv_usec;
+#endif
+}
+
+qint64 QTimestamp::elapsed() const
+{
+    QTimestamp now;
+    now.start();
+    return msecsTo(now);
+}
+
+qint64 QTimestamp::msecsTo(const QTimestamp &other) const
+{
+    qint64 secs = other.t1 - t1;
+    qint64 fraction = other.t2 - t2;
+    return secs * 1000 + fraction / fractionAdjustment();
+}
+
+void QTimestamp::addMSecs(int ms)
+{
+    t1 += ms / 1000;
+    t2 += ms % 1000 * fractionAdjustment();
+}
+
+qint64 QTimestamp::secsTo(const QTimestamp &other) const
+{
+    return other.t1 - t1;
+}
+
+void QTimestamp::addSecs(int secs)
+{
+    t1 += secs;
+}
+
+bool operator<(const QTimestamp &v1, const QTimestamp &v2)
+{
+    return v1.t1 < v2.t1 || (v1.t1 == v2.t1 && v1.t2 < v2.t2);
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 3599cc7..b8a0ae1 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -83,6 +83,7 @@ SOURCES += \
 symbian:SOURCES+=tools/qlocale_symbian.cpp
 
 mac:SOURCES += tools/qtimestamp_mac.cpp
+else:unix:SOURCES += tools/qtimestamp_unix.cpp
 else:SOURCES += tools/qtimestamp_generic.cpp
 
 #zlib support