Changeset 9880 for trunk/src/kernel32/cpu.cpp

Timestamp:

Feb 28, 2003, 4:37:21 PM (22 years ago)

Author:

sandervl

Message:

Check for invalid data while measuring the CPU speed. DosTmrQueryTime isn't very reliable (on laptops)

File:

• trunk/src/kernel32/cpu.cpp (modified) (3 diffs)

trunk/src/kernel32/cpu.cpp

@@ -1 @@
-/* $Id: cpu.cpp,v 1.13 2002-05-22 12:57:16 sandervl Exp $ */
+/* $Id: cpu.cpp,v 1.14 2003-02-28 15:37:21 sandervl Exp $ */
 /*
  * Odin win32 CPU apis
@@ -158 +158 @@
                                         tmp1 = (double)time1.LowPart + (double)time1.HighPart*4.0*1024.0*1024.0;
                                         millisec = tmp - tmp1;
+
                                         frequency= (double)freq.LowPart;
                                         frequency= frequency / 1000.0;
@@ -165 +166 @@
                                         tmp1 = (double)tsc1.LowPart + (double)tsc1.HighPart*4.0*1024.0*1024.0;
                                         clockticks = tmp - tmp1;
-
-                                        tmp = 1000 / millisec;
-                                        clockticks = clockticks * tmp;  //ticks per second
-                                        mhertz = clockticks / 1000000.0;
-                                        mhz = (DWORD)mhertz;
+                                        if(millisec > 0) 
+                                        {//make sure we have something valid here
+                                                tmp = 1000 / millisec;
+                                                clockticks = clockticks * tmp;  //ticks per second
+                                                mhertz = clockticks / 1000000.0;
+                                                mhz = (DWORD)mhertz;
+                                        }
+                                        else    mhz = 500;
                                 }
-                                else    mhz = 100;
+                                else    mhz = 500;
                                 RegSetValueExA(xhkey,"~Mhz",0,REG_DWORD, (LPBYTE)&mhz, sizeof(DWORD));
                         }