Changeset 57192 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Apr 6, 2010, 9:38:23 PM (15 years ago)

Author:

[email protected]

Message:

2010-04-06 Adam Barth <​[email protected]>

Reviewed by Eric Seidel.

REGRESSION: Worker termination via JS timeout may cause worker tests like fast/workers/worker-terminate.html fail.
​https://bugs.webkit.org/show_bug.cgi?id=36646

Add a new exception type for forcibly terminating a JavaScript stack.
The new exception functions similarly to the
InterruptedExecutionException but is conceptually different because
execution is terminated instead of just interrupted.

• GNUmakefile.am:
  • Added new Terminator.h file.
• JavaScriptCore.gypi:
  • Added new Terminator.h file.
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
  • Added new Terminator.h file.
• JavaScriptCore.xcodeproj/project.pbxproj:
  • Added new Terminator.h file.
• interpreter/Interpreter.cpp: (JSC::Interpreter::throwException):
  • Fully unwind the stack for TerminatedExecutionException.

(JSC::Interpreter::privateExecute):

• Check if we've been terminated at the same time we check if we've timed out.

• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION):
  • Check if we've been terminated at the same time we check if we've timed out.
• runtime/Completion.cpp:
  • Some exceptions define special completion types so that calls can see why we terminated evaluation.

(JSC::evaluate):

• runtime/Completion.h:
  • Define a new completion type for termination.

(JSC::):

• runtime/ExceptionHelpers.cpp:
  • Define TerminatedExecutionException and refactor pseudo-RTTI virtual function to be more semantic.

(JSC::InterruptedExecutionError::exceptionType):
(JSC::TerminatedExecutionError::TerminatedExecutionError):
(JSC::TerminatedExecutionError::exceptionType):
(JSC::TerminatedExecutionError::toString):
(JSC::createTerminatedExecutionException):

• runtime/ExceptionHelpers.h:
  • Entry point for generating a TerminatedExecutionException.
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
  • Add a Terminator object that can be used to asynchronously terminate a JavaScript execution stack.
• runtime/JSGlobalData.h:
• runtime/JSObject.h: (JSC::JSObject::exceptionType):
  • Define that, by default, thrown objects have a normal exception type.
• runtime/Terminator.h: Added.
  • Added a new controller object that can be used to terminate execution asynchronously. This object is more or less a glorified bool.

(JSC::Terminator::Terminator):
(JSC::Terminator::termianteSoon):
(JSC::Terminator::shouldTerminate):

2010-04-06 Adam Barth <​[email protected]>

Reviewed by Eric Seidel.

REGRESSION: Worker termination via JS timeout may cause worker tests like fast/workers/worker-terminate.html fail.
​https://bugs.webkit.org/show_bug.cgi?id=36646

• fast/workers/resources/worker-run-forever.js: Added.
• fast/workers/worker-terminate-forever-expected.txt: Added.
• fast/workers/worker-terminate-forever.html: Added.
  • Test what happens when we terminate an infinitely running worker. The essential point is that we don't spam the console with nonsense about a timeout.
• platform/mac/Skipped:
  • Rescue worker-terminate.html from the Skipped list now that we've fixed the underlying bug that was causing the flakiness.

2010-04-06 Adam Barth <​[email protected]>

Reviewed by Eric Seidel.

REGRESSION: Worker termination via JS timeout may cause worker tests like fast/workers/worker-terminate.html fail.
​https://bugs.webkit.org/show_bug.cgi?id=36646

Cause the worker code to swallow termination exceptions because these
need not be reported to the user because they are an implementation
detail of how we terminate worker execution.

Test: fast/workers/worker-terminate-forever.html

• bindings/js/JSDOMBinding.cpp: (WebCore::reportException):
  • Refuse to report termination exceptions to the user because they are an implementation detail.
• bindings/js/WorkerScriptController.cpp: (WebCore::WorkerScriptController::forbidExecution):
  • Instead of using timeouts to stop run away workers, use our fancy new Terminator object.

Location:

trunk/JavaScriptCore/runtime

Files:

• Completion.cpp (modified) (1 diff)
• Completion.h (modified) (1 diff)
• ExceptionHelpers.cpp (modified) (2 diffs)
• ExceptionHelpers.h (modified) (1 diff)
• JSGlobalData.cpp (modified) (1 diff)
• JSGlobalData.h (modified) (3 diffs)
• JSObject.h (modified) (2 diffs)
• Terminator.h (copied) (copied from trunk/JavaScriptCore/runtime/ExceptionHelpers.h ) (3 diffs)

trunk/JavaScriptCore/runtime/Completion.cpp

@@ -63 +63 @@
 
     if (exception) {
-        if (exception.isObject() && asObject(exception)->isWatchdogException())
-            return Completion(Interrupted, exception);
-        return Completion(Throw, exception);
+        ComplType exceptionType = Throw;
+        if (exception.isObject())
+            exceptionType = asObject(exception)->exceptionType();
+        return Completion(exceptionType, exception);
     }
     return Completion(Normal, result);

trunk/JavaScriptCore/runtime/Completion.h

@@ -32 +32 @@
     class SourceCode;
 
-    enum ComplType { Normal, Break, Continue, ReturnValue, Throw, Interrupted };
+    enum ComplType { Normal, Break, Continue, ReturnValue, Throw, Interrupted, Terminated };
 
     /*

trunk/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -47 +47 @@
     }
 
-    virtual bool isWatchdogException() const { return true; }
+    virtual ComplType exceptionType() const { return Interrupted; }
 
     virtual UString toString(ExecState*) const { return "JavaScript execution exceeded timeout."; }
@@ -55 +55 @@
 {
     return new (globalData) InterruptedExecutionError(globalData);
+}
+
+class TerminatedExecutionError : public JSObject {
+public:
+    TerminatedExecutionError(JSGlobalData* globalData)
+        : JSObject(globalData->terminatedExecutionErrorStructure)
+    {
+    }
+
+    virtual ComplType exceptionType() const { return Terminated; }
+
+    virtual UString toString(ExecState*) const { return "JavaScript execution terminated."; }
+};
+
+JSValue createTerminatedExecutionException(JSGlobalData* globalData)
+{
+    return new (globalData) TerminatedExecutionError(globalData);
 }
 

trunk/JavaScriptCore/runtime/ExceptionHelpers.h

@@ -44 +44 @@
     
     JSValue createInterruptedExecutionException(JSGlobalData*);
+    JSValue createTerminatedExecutionException(JSGlobalData*);
     JSValue createStackOverflowError(ExecState*);
     JSValue createTypeError(ExecState*, const char* message);

trunk/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -116 +116 @@
     , activationStructure(JSActivation::createStructure(jsNull()))
     , interruptedExecutionErrorStructure(JSObject::createStructure(jsNull()))
+    , terminatedExecutionErrorStructure(JSObject::createStructure(jsNull()))
     , staticScopeStructure(JSStaticScopeObject::createStructure(jsNull()))
     , stringStructure(JSString::createStructure(jsNull()))

trunk/JavaScriptCore/runtime/JSGlobalData.h

@@ -38 +38 @@
 #include "NumericStrings.h"
 #include "SmallStrings.h"
+#include "Terminator.h"
 #include "TimeoutChecker.h"
 #include "WeakRandom.h"
@@ -117 +118 @@
         RefPtr<Structure> activationStructure;
         RefPtr<Structure> interruptedExecutionErrorStructure;
+        RefPtr<Structure> terminatedExecutionErrorStructure;
         RefPtr<Structure> staticScopeStructure;
         RefPtr<Structure> stringStructure;
@@ -154 +156 @@
 #endif
         TimeoutChecker timeoutChecker;
+        Terminator terminator;
         Heap heap;
 

trunk/JavaScriptCore/runtime/JSObject.h

@@ -27 +27 @@
 #include "ClassInfo.h"
 #include "CommonIdentifiers.h"
+#include "Completion.h"
 #include "CallFrame.h"
 #include "JSCell.h"
@@ -196 +197 @@
         virtual bool isVariableObject() const { return false; }
         virtual bool isActivationObject() const { return false; }
-        virtual bool isWatchdogException() const { return false; }
         virtual bool isNotAnObjectErrorStub() const { return false; }
+
+        virtual ComplType exceptionType() const { return Throw; }
 
         void allocatePropertyStorage(size_t oldSize, size_t newSize);

trunk/JavaScriptCore/runtime/Terminator.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11 +11 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Google Inc. ("Google") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
@@ -27 +27 @@
  */
 
-#ifndef ExceptionHelpers_h
-#define ExceptionHelpers_h
-
+#ifndef Terminator_h
+#define Terminator_h
 
 namespace JSC {
 
-    class CodeBlock;
-    class ExecState;
-    class Identifier;
-    class JSGlobalData;
-    class JSNotAnObjectErrorStub;
-    class JSObject;
-    class JSValue;
-    class Node;
-    struct Instruction;
-    
-    JSValue createInterruptedExecutionException(JSGlobalData*);
-    JSValue createStackOverflowError(ExecState*);
-    JSValue createTypeError(ExecState*, const char* message);
-    JSValue createUndefinedVariableError(ExecState*, const Identifier&, unsigned bytecodeOffset, CodeBlock*);
-    JSNotAnObjectErrorStub* createNotAnObjectErrorStub(ExecState*, bool isNull);
-    JSObject* createInvalidParamError(ExecState*, const char* op, JSValue, unsigned bytecodeOffset, CodeBlock*);
-    JSObject* createNotAConstructorError(ExecState*, JSValue, unsigned bytecodeOffset, CodeBlock*);
-    JSValue createNotAFunctionError(ExecState*, JSValue, unsigned bytecodeOffset, CodeBlock*);
-    JSObject* createNotAnObjectError(ExecState*, JSNotAnObjectErrorStub*, unsigned bytecodeOffset, CodeBlock*);
-    JSValue throwOutOfMemoryError(ExecState*);
+class Terminator {
+public:
+    Terminator() : m_shouldTerminate(false) { }
+
+    void terminateSoon() { m_shouldTerminate = true; }
+    bool shouldTerminate() const { return m_shouldTerminate; }
+
+private:
+    bool m_shouldTerminate;
+};
 
 } // namespace JSC
 
-#endif // ExceptionHelpers_h
+#endif // Terminator_h