Changeset 19534 in webkit for trunk/JavaScriptCore/kjs/interpreter.h

Timestamp:

Feb 9, 2007, 11:28:02 AM (18 years ago)

Author:

andersca

Message:

JavaScriptCore:

Reviewed by Geoff.

<rdar://problem/4930614>
Safari complains about "Slow Script" if GMail is left open and machine is busy

<rdar://problem/4649516>
Turn off slow script dialog or crank up time that makes it come up

<rdar://problem/4963589>
Slow script warning is displayed after closing of PROMPT or PRINT dialog

Re-do the way script timeouts are handled. No longer use a unix timer that sends signals. Instead, add a
tick count and increment it in loop bodies. If the tick count reaches a threshold, do a timeout check. If the total time executing
is higher than the timeout value, (possibly) interrupt the script. The timeout checker also adjusts the threshold dynamically
to prevent doing the timeout check too often.

• JavaScriptCore.exp: Remove pause and resume calls.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Add winmm.lib.

• kjs/interpreter.cpp: (KJS::Interpreter::init): (KJS::Interpreter::~Interpreter): (KJS::Interpreter::startTimeoutCheck): (KJS::Interpreter::stopTimeoutCheck): (KJS::Interpreter::resetTimeoutCheck): (KJS::getCurrentTime): (KJS::Interpreter::checkTimeout):
• kjs/interpreter.h: (KJS::Interpreter::timedOut):
• kjs/nodes.cpp: (DoWhileNode::execute): (WhileNode::execute): (ForNode::execute):

WebCore:

Reviewed by Geoff.

No need to pause timeout checks anymore.

• bindings/js/kjs_window.cpp: (KJS::WindowFunc::callAsFunction):

File:

• trunk/JavaScriptCore/kjs/interpreter.h (modified) (6 diffs)

trunk/JavaScriptCore/kjs/interpreter.h

@@ -37 +37 @@
   class SavedBuiltins;
   class ScopeChain;
-  class TimeoutChecker;
   
   /**
@@ -47 +46 @@
   class Interpreter {
       friend class Collector;
-      friend class TimeoutChecker;
   public:
     /**
@@ -315 +313 @@
     void startTimeoutCheck();
     void stopTimeoutCheck();
-
-    void pauseTimeoutCheck();
-    void resumeTimeoutCheck();
-    
-    bool checkTimeout();
+    
+    bool timedOut();
     
     void ref() { ++m_refCount; }
@@ -329 +324 @@
     virtual bool shouldInterruptScript() const { return true; }
 
-    long m_timeoutTime;
+    unsigned m_timeoutTime;
 
 private:
-    bool handleTimeout();
+    bool checkTimeout();
     void init();
-    
+    void resetTimeoutCheck();
+
     /**
      * This constructor is not implemented, in order to prevent
@@ -367 +363 @@
     CompatMode m_compatMode;
 
-    TimeoutChecker* m_timeoutChecker;
-    bool m_timedOut;
-
-    unsigned m_startTimeoutCheckCount;
-    unsigned m_pauseTimeoutCheckCount;
+    unsigned m_timeAtLastCheckTimeout;
+    unsigned m_timeExecuting;
+    unsigned m_timeoutCheckCount;
+    
+    unsigned m_tickCount;
+    unsigned m_ticksUntilNextTimeoutCheck;
 
     ProtectedPtr<JSObject> m_Object;
@@ -408 +405 @@
   };
 
-  inline bool Interpreter::checkTimeout()
+  inline bool Interpreter::timedOut()
   {
-    if (!m_timedOut)
-      return false;
-
-    return handleTimeout();
+      m_tickCount++;
+      
+      if (m_tickCount != m_ticksUntilNextTimeoutCheck)
+          return false;
+      
+      return checkTimeout();
   }