1 files changed, 39 insertions, 34 deletions

diff --git a/pr/src/md/os2/os2inrval.c b/pr/src/md/os2/os2inrval.c
index 469da314..d4c90073 100644
--- a/pr/src/md/os2/os2inrval.c
+++ b/pr/src/md/os2/os2inrval.c
@@ -39,57 +39,62 @@
 
 #include "primpl.h"
 
-ULONG _os2_ticksPerSec = -1;
+static PRBool useHighResTimer = PR_FALSE;
+PRIntervalTime _os2_ticksPerSec = -1;
 PRIntn _os2_bitShift = 0;
 PRInt32 _os2_highMask = 0;
-
-
    
 void
 _PR_MD_INTERVAL_INIT()
 {
-   if (DosTmrQueryFreq(&_os2_ticksPerSec) == NO_ERROR)
-   {
-      while(_os2_ticksPerSec > PR_INTERVAL_MAX) {
-          _os2_ticksPerSec >>= 1;
-          _os2_bitShift++;
-          _os2_highMask = (_os2_highMask << 1)+1;
-      }
-   }
-   else
-      _os2_ticksPerSec = -1;
+    ULONG timerFreq = 0; /* OS/2 high-resolution timer frequency in Hz */
+    APIRET rc = DosTmrQueryFreq(&timerFreq);
+    if (NO_ERROR == rc) {
+        useHighResTimer = PR_TRUE;
+        PR_ASSERT(timerFreq != 0);
+        while (timerFreq > PR_INTERVAL_MAX) {
+            timerFreq >>= 1;
+            _os2_bitShift++;
+            _os2_highMask = (_os2_highMask << 1)+1;
+        }
 
-   PR_ASSERT(_os2_ticksPerSec > PR_INTERVAL_MIN && _os2_ticksPerSec < PR_INTERVAL_MAX);
+        _os2_ticksPerSec = timerFreq;
+        PR_ASSERT(_os2_ticksPerSec > PR_INTERVAL_MIN);
+    }
 }
 
 PRIntervalTime
 _PR_MD_GET_INTERVAL()
 {
-   QWORD count;
-
-   /* Sadly; nspr requires the interval to range from 1000 ticks per second
-    * to only 100000 ticks per second; Counter is too high
-    * resolution...
-    */
-    if (DosTmrQueryTime(&count) == NO_ERROR) {
-        PRInt32 top = count.ulHi & _os2_highMask;
+    if (useHighResTimer) {
+        QWORD timestamp;
+        PRInt32 top;
+        APIRET rc = DosTmrQueryTime(&timestamp);
+        if (NO_ERROR != rc) {
+            return -1;
+        }
+        /* Sadly, nspr requires the interval to range from 1000 ticks per
+         * second to only 100000 ticks per second. DosTmrQueryTime is too
+         * high resolution...
+         */
+        top = timestamp.ulHi & _os2_highMask;
         top = top << (32 - _os2_bitShift);
-        count.ulLo = count.ulLo >> _os2_bitShift;   
-        count.ulHi = count.ulLo + top; 
-        return (PRUint32)count.ulLo;
-    }
-    else{
-       ULONG msCount = PR_FAILURE;
-       DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, &msCount, sizeof(msCount));
-       return msCount;
+        timestamp.ulLo = timestamp.ulLo >> _os2_bitShift;   
+        timestamp.ulLo = timestamp.ulLo + top; 
+        return (PRUint32)timestamp.ulLo;
+    } else {
+        ULONG msCount = -1;
+        DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, &msCount, sizeof(msCount));
+        return msCount;
     }
 }
 
 PRIntervalTime
 _PR_MD_INTERVAL_PER_SEC()
 {
-    if(_os2_ticksPerSec != -1)
-       return _os2_ticksPerSec;
-    else
-       return 1000;
+    if (useHighResTimer) {
+        return _os2_ticksPerSec;
+    } else {
+        return 1000;
+    }
 }