Changeset 2032

Timestamp:

Jun 14, 2005, 4:59:56 AM (20 years ago)

Author:

bird

Message:

o Fixed bug in getitimer/setitmer, it didn't zero the old value struct

if the timer wasn't running.

o Fixed a bug in ftime(), the time was jolting around.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• src/lib/sys/__ftime.c (modified) (7 diffs, 1 prop)
• src/lib/sys/b_signalTimer.c (modified) (1 diff, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -12 +12 @@
           (included by sys/param.h which is used by lot's of tcpip headers).
           Define _BSD_NAMESPACE_POLLUTION to get it all.
+        o Fixed bug in getitimer/setitmer, it didn't zero the old value struct
+          if the timer wasn't running.
+        o Fixed a bug in __ftime(), the time was jolting around.
 
 2005-06-12: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/src/lib/sys/__ftime.c

@@ -12 +12 @@
  *
  */
+
+#define CALCDIFF
 
 
@@ -29 +31 @@
 #include "syscalls.h"
 
+#ifdef CALCDIFF
 /**
  * Calcs the uDiff in formula timeb.millitm = (msecs + uDiff) % 1000.
@@ -89 +92 @@
     return uDiff;
 }
+#endif /* CALCDIFF */
 
 
@@ -99 +103 @@
 void __ftime(struct timeb *ptr)
 {
+#pragma pack(1)
+    union last
+    {
+        unsigned long long ull;
+        struct
+        {
+            unsigned secs;
+            unsigned msecs;
+            short    milli;
+        } s;
+    };
     union combined
     {
-        volatile unsigned long long ull;
         struct
         {
             ULONG       time;
             ULONG       msecs;
+            UCHAR       hour;
+            UCHAR       minutes;
+            UCHAR       seconds;
+            UCHAR       hundredths;
         } s;
     };
@@ -111 +129 @@
     {
         PGINFOSEG       pGIS;
-        union combined *pCombined;
+        volatile union combined *pCombined;
     } uGIS;
-    static unsigned     uDiff;
-    union combined      Combined;
+#pragma pack()
+    static volatile union last LastStatic;
+    static volatile unsigned uDiff;
 
     /*
@@ -121 +140 @@
     if (!uGIS.pGIS)
     {
+#ifdef CALCDIFF
         uDiff = calcdiff();
+#endif
         uGIS.pGIS = GETGINFOSEG();
     }
@@ -128 +149 @@
      * Get the value and convert it to the return format.
      */
-    Combined = *uGIS.pCombined;
-    ptr->time       = Combined.s.time;
-    ptr->millitm    = (Combined.s.msecs + uDiff) % 1000;
+    /* read times */
+    union combined  Combined = *uGIS.pCombined;
+    union last      LastCopy = LastStatic;
+
+    /* calc now */
+    union last Now;
+    Now.s.secs = Combined.s.seconds;
+#ifdef CALCDIFF
+    Now.s.milli = (Combined.s.msecs + uDiff) % 1000;
+#else
+    Now.s.milli = (Combined.s.hundredths * 10) | ((Combined.s.msecs + uDiff) % 10);
+#endif
+    Now.s.msecs = Combined.s.msecs;
+
+    /* validate now */
+    unsigned uDiffSecs = Now.s.secs - LastCopy.s.secs;
+    if (!uDiffSecs)
+    {
+        int iDiffMilli = Now.s.milli - LastCopy.s.milli;
+        if (iDiffMilli < 0)
+        {
+            uDiff -= -iDiffMilli + 1;
+            Now = LastCopy;
+        }
+    }
+    else if (uDiffSecs == 1)
+    {
+        unsigned    uDiffMsecs = Now.s.msecs - LastCopy.s.msecs;
+        unsigned    uDiffMilli = Now.s.milli + 1000 - LastCopy.s.milli;
+        if (uDiffMilli > uDiffMsecs + 500)
+        {
+            uDiff += 1000 - Now.s.milli;
+            Now.s.milli = 0;
+        }
+    }
+
+    /* update the last know ok value */
+    LastStatic = Now; /** @todo 8byte + 4 byte exchange! */
+
+    /* store the result in the user buffer */
+    ptr->time       = Now.s.secs;
+    ptr->millitm    = Now.s.milli;
     ptr->timezone   = 0;
     ptr->dstflag    = 0;

trunk/src/emx/src/lib/sys/b_signalTimer.c

@@ -399 +399 @@
      * This is *not* gonna be very accurate!
      */
-    if (pOldValue && gfArmed)
-    {
-        OldValue.it_interval.tv_sec = guInterval / 1000;
-        OldValue.it_interval.tv_usec = (guInterval % 1000) * 1000;
-
-        unsigned u = guNext;
-        u -= signalTimerClock();
-        if (u <= guInterval)
-        {
-            OldValue.it_value.tv_sec = u / 1000;
-            OldValue.it_value.tv_usec = (u % 1000) * 1000;
-        }
+    if (pOldValue)
+    {
+        if (gfArmed)
+        {
+            OldValue.it_interval.tv_sec = guInterval / 1000;
+            OldValue.it_interval.tv_usec = (guInterval % 1000) * 1000;
+
+            unsigned u = guNext;
+            u -= signalTimerClock();
+            if (u <= guInterval)
+            {
+                OldValue.it_value.tv_sec = u / 1000;
+                OldValue.it_value.tv_usec = (u % 1000) * 1000;
+            }
+        }
+        else
+            memset(pOldValue, 0, sizeof(*pOldValue));
     }