Changeset 66475 in webkit

Timestamp:

Aug 31, 2010 5:02:10 AM (14 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2010-08-31 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

JSC TimeoutChecker::didTimeOut overflows on ARM
​https://bugs.webkit.org/show_bug.cgi?id=38538

Make getCPUTime() return values relative to the first call.
The previous implementation relied on simply on currentTime(), which
return a time since epoch and not a time since the thread started. This
made the return value of getCPUTime() overflow on 32 bits.

• runtime/TimeoutChecker.cpp: (JSC::getCPUTime):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/TimeoutChecker.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-08-31  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        JSC TimeoutChecker::didTimeOut overflows on ARM
+        https://bugs.webkit.org/show_bug.cgi?id=38538
+
+        Make getCPUTime() return values relative to the first call.
+        The previous implementation relied on simply on currentTime(), which
+        return a time since epoch and not a time since the thread started. This
+        made the return value of getCPUTime() overflow on 32 bits.
+
+        * runtime/TimeoutChecker.cpp:
+        (JSC::getCPUTime):
+
 2010-08-30  Mihai Parparita  <mihaip@chromium.org>
 

trunk/JavaScriptCore/runtime/TimeoutChecker.cpp

@@ -99 +99 @@
 #else
     // FIXME: We should return the time the current thread has spent executing.
-    return currentTime() * 1000;
+
+    // use a relative time from first call in order to avoid an overflow
+    static double firstTime = currentTime();
+    return (currentTime() - firstTime) * 1000;
 #endif
 }