Changeset 2064

Timestamp:

Jun 23, 2005, 8:02:57 AM (20 years ago)

Author:

bird

Message:

Changed the bootime algorithm.

File:

• trunk/src/emx/src/lib/misc/sysctl_os2.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/misc/sysctl_os2.c

@@ -39 +39 @@
 #include <sys/time.h>
 #include <InnoTekLIBC/FastInfoBlocks.h>
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MISC
+#include <InnoTekLIBC/logstrict.h>
 #define _KERNEL
 #include <sys/sysctl.h>
@@ -55 +57 @@
     if (!tv.tv_sec)
     {
+        /*
+         * Use the highres timer to estimate the wrap-arounds.
+         * Then use that with the millisecond timer to get a
+         * stable number.
+         */
+        unsigned cWraps = 0;
         union
         {
@@ -62 +70 @@
         ULONG ul;
         FS_VAR_SAVE_LOAD();
-
-        /* Try the highres timer first. */
         if (   !DosTmrQueryFreq(&ul)
             && !DosTmrQueryTime(&u.qw))
         {
-            gettimeofday(&tv, NULL);
-            tv.tv_sec -= u.ull / ul;
             long double lrd = u.ull;
-            lrd *= 1000000;
+            lrd *= 1000;
             lrd /= ul;
-            ul = (ULONG)lrd;
-            tv.tv_usec -= ul % 1000000;
-        }
-        else
-        {
-            /* Use the millisecond counter. */
-            gettimeofday(&tv, NULL);
-            ul = fibGetMsCount();
-            unsigned u = (ul % 1000) * 1000;
-            tv.tv_usec -= u;
-            tv.tv_sec -= ul / 1000;
+            unsigned long long ull = 0x100000000ULL;
+            cWraps = lrd / ull;
         }
         FS_RESTORE();
-        if (tv.tv_usec < 0)
+
+        gettimeofday(&tv, NULL);
+        gettimeofday(&tv, NULL);
+        ul = fibGetMsCount();
+        unsigned cSecs = (ul % 1000) * 1000;
+        tv.tv_usec -= cSecs;
+        tv.tv_sec -= ul / 1000;
+        for (;;)
         {
-            tv.tv_sec--;
-            tv.tv_usec += 1000000;
+            if (tv.tv_usec < 0)
+            {
+                tv.tv_sec--;
+                tv.tv_usec += 1000000;
+            }
+            if (cWraps-- <= 0)
+                break;
+            tv.tv_sec  -= 4294967;
+            tv.tv_usec -= 296000;
         }
+        LIBC_ASSERT(tv.tv_sec > 0);
+        LIBC_ASSERT(tv.tv_usec >= 0 && tv.tv_usec < 1000000);
     }