Changeset 1206 in vbox for trunk

Timestamp:

Mar 5, 2007 12:58:31 AM (18 years ago)

Author:

vboxsync

Message:

use the mscount member of the GIS for system monotonic time source on OS/2.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile (modified) (1 diff)
• r0drv/os2/assert-r0drv-os2.cpp (modified) (1 diff)
• r3/os2/time-os2.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/posix/time-posix.cpp ) (2 diffs)
• testcase/tstTime.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile

@@ -314 +314 @@
         generic/semnoint-generic.cpp \
         generic/sched-generic.cpp \
-        r3/posix/time-posix.cpp \
+        r3/os2/time-os2.cpp \
         r3/posix/timer-posix.cpp \
         r3/posix/RTTimeNow-posix.cpp \

trunk/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp

@@ -2 +2 @@
 /** @file
  * InnoTek Portable Runtime - Assertion Workers, Ring-0 Drivers, OS/2.
+ */
+
+/*
+ * Copyright (c) 2007 knut st. osmundsen <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 

trunk/src/VBox/Runtime/r3/os2/time-os2.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006 InnoTek Systemberatung GmbH
+ * Copyright (c) 2007 knut st. osmundsen <[email protected]>
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation,
- * in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
- * distribution. VirtualBox OSE is distributed in the hope that it will
- * be useful, but WITHOUT ANY WARRANTY of any kind.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
  *
- * If you received this file as part of a commercial VirtualBox
- * distribution, then only the terms of your commercial VirtualBox
- * license agreement apply instead of the previous paragraph.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
@@ -25 +34 @@
 *******************************************************************************/
 #define LOG_GROUP RTLOGGROUP_TIME
-#define RTTIME_INCL_TIMEVAL
-#include <sys/time.h>
-#include <time.h>
+#include <InnoTekLIBC/FastInfoBlocks.h>
 
 #include <iprt/time.h>
 #include "internal/time.h"
 
+/** @todo mscount will roll over after ~48 days. */
 
-DECLINLINE(uint64_t) rtTimeGetSystemNanoTS(void)
+RTDECL(uint64_t) RTTimeSystemNanoTS(void)
 {
-#if defined(CLOCK_MONOTONIC) && !defined(__L4__) && !defined(__OS2__)
-    /* check monotonic clock first. */
-    static bool s_fMonoClock = true;
-    if (s_fMonoClock)
-    {
-        struct timespec ts;
-        if (!clock_gettime(CLOCK_MONOTONIC, &ts))
-            return (uint64_t)ts.tv_sec * (uint64_t)(1000 * 1000 * 1000)
-                 + ts.tv_nsec;
-        s_fMonoClock = false;
-    }
-#endif
-
-    /* fallback to gettimeofday(). */
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (uint64_t)tv.tv_sec  * (uint64_t)(1000 * 1000 * 1000)
-         + (uint64_t)(tv.tv_usec * 1000);
+    return fibGetMsCount() * UINT64_C(10000000);
 }
 
 
-/**
- * Gets the current nanosecond timestamp.
- *
- * This differs from RTTimeNanoTS in that it will use system APIs and not do any
- * resolution or performance optimizations.
- *
- * @returns nanosecond timestamp.
- */
-RTDECL(uint64_t) RTTimeSystemNanoTS(void)
+RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS();
+    return fibGetMsCount();
 }
 
-
-/**
- * Gets the current millisecond timestamp.
- *
- * This differs from RTTimeNanoTS in that it will use system APIs and not do any
- * resolution or performance optimizations.
- *
- * @returns millisecond timestamp.
- */
-RTDECL(uint64_t) RTTimeSystemMilliTS(void)
-{
-    return rtTimeGetSystemNanoTS() / 1000000;
-}
-

trunk/src/VBox/Runtime/testcase/tstTime.cpp

@@ -121 +121 @@
                  u64OSElapsedTS, u64RTElapsedTS, u64OSElapsedTS - u64RTElapsedTS);
 
-#if defined __WIN__ || defined __LINUX__
-    RTPrintf("RTTime1nsSteps -> %u\n", RTTime1nsSteps());
-#endif
+    RTPrintf("RTTime1nsSteps -> %u (%d ppt)\n", RTTime1nsSteps(), (RTTime1nsSteps() * 1000) / i);
     if (!cErrors)
         RTPrintf("tstTime: SUCCESS\n");