Changeset 34842 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.h

Timestamp:

Jun 27, 2008, 9:02:03 PM (17 years ago)

Author:

[email protected]

Message:

Bug 18626: SQUIRRELFISH: support the "slow script" dialog <​https://bugs.webkit.org/show_bug.cgi?id=18626>
<rdar://problem/5973931> Slow script dialog needs to be reimplemented for squirrelfish

Reviewed by Sam

Adds support for the slow script dialog in squirrelfish. This requires the addition
of three new op codes, op_loop, op_loop_if_true, and op_loop_if_less which have the
same behaviour as their simple jump equivalents but have an additional time out check.

Additional assertions were added to other jump instructions to prevent accidentally
creating loops with jump types that do not support time out checks.

Sunspider does not report a regression, however this appears very sensitive to code
layout and hardware, so i would expect up to a 1% regression on other systems.

Part of this required moving the old timeout logic from JSGlobalObject and into Machine
which is the cause of a number of the larger diff blocks.

File:

• trunk/JavaScriptCore/kjs/JSGlobalObject.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -90 +90 @@
             int recursion;
 
-            unsigned timeoutTime;
-            unsigned timeAtLastCheckTimeout;
-            unsigned timeExecuting;
-            unsigned timeoutCheckCount;
-            unsigned tickCount;
-            unsigned ticksUntilNextTimeoutCheck;
-
             RegExpConstructor* regExpConstructor;
             ErrorConstructor* errorConstructor;
@@ -203 +196 @@
         unsigned pageGroupIdentifier() const { return d()->pageGroupIdentifier; }
 
-        void setTimeoutTime(unsigned timeoutTime) { d()->timeoutTime = timeoutTime; }
+        void setTimeoutTime(unsigned timeoutTime);
         void startTimeoutCheck();
         void stopTimeoutCheck();
-        bool timedOut();
 
         Debugger* debugger() const { return d()->debugger; }
@@ -263 +255 @@
         void addStaticGlobals(GlobalPropertyInfo*, int count);
 
-    private:
-        bool checkTimeout();
-        void resetTimeoutCheck();
     };
 
@@ -299 +288 @@
     }
 
-    inline bool JSGlobalObject::timedOut()
-    {
-        d()->tickCount++;
-
-        if (d()->tickCount != d()->ticksUntilNextTimeoutCheck)
-            return false;
-
-        return checkTimeout();
-    }
-
     inline JSGlobalObject* ScopeChainNode::globalObject() const
     {