Revision: 4016
Author: [email protected]
Date: Thu Mar 4 04:13:04 2010
Log: Add IsExecutionTerminating api method.
IsExecutionTerminating returns true if a termination exception is
currently being propagated. C++ code should not reenter V8 when
IsExecutionTerminating returns true.
Review URL: http://codereview.chromium.org/668052
http://code.google.com/p/v8/source/detail?r=4016
Modified:
/branches/bleeding_edge/include/v8.h
/branches/bleeding_edge/src/api.cc
/branches/bleeding_edge/test/cctest/test-thread-termination.cc
=======================================
--- /branches/bleeding_edge/include/v8.h Wed Mar 3 05:44:20 2010
+++ /branches/bleeding_edge/include/v8.h Thu Mar 4 04:13:04 2010
@@ -2463,6 +2463,16 @@
*/
static void TerminateExecution();
+ /**
+ * Is V8 terminating JavaScript execution.
+ *
+ * Returns true if JavaScript execution is currently terminating
+ * because of a call to TerminateExecution. In that case there are
+ * still JavaScript frames on the stack and the termination
+ * exception is still active.
+ */
+ static bool IsExecutionTerminating();
+
/**
* Releases any resources used by v8 and stops any utility threads
* that may be running. Note that disposing v8 is permanent, it
=======================================
--- /branches/bleeding_edge/src/api.cc Wed Mar 3 23:43:05 2010
+++ /branches/bleeding_edge/src/api.cc Thu Mar 4 04:13:04 2010
@@ -3613,6 +3613,15 @@
if (!i::V8::IsRunning()) return;
i::StackGuard::TerminateExecution();
}
+
+
+bool V8::IsExecutionTerminating() {
+ if (!i::V8::IsRunning()) return false;
+ if (i::Top::has_scheduled_exception()) {
+ return i::Top::scheduled_exception() ==
i::Heap::termination_exception();
+ }
+ return false;
+}
String::Utf8Value::Utf8Value(v8::Handle<v8::Value> obj) {
=======================================
--- /branches/bleeding_edge/test/cctest/test-thread-termination.cc Tue Nov
24 04:23:29 2009
+++ /branches/bleeding_edge/test/cctest/test-thread-termination.cc Thu Mar
4 04:13:04 2010
@@ -40,6 +40,7 @@
v8::Handle<v8::Value> TerminateCurrentThread(const v8::Arguments& args) {
+ CHECK(!v8::V8::IsExecutionTerminating());
v8::V8::TerminateExecution();
return v8::Undefined();
}
@@ -52,15 +53,19 @@
v8::Handle<v8::Value> Loop(const v8::Arguments& args) {
+ CHECK(!v8::V8::IsExecutionTerminating());
v8::Handle<v8::String> source =
v8::String::New("try { doloop(); fail(); } catch(e) { fail(); }");
- v8::Script::Compile(source)->Run();
+ v8::Handle<v8::Value> result = v8::Script::Compile(source)->Run();
+ CHECK(result.IsEmpty());
+ CHECK(v8::V8::IsExecutionTerminating());
return v8::Undefined();
}
v8::Handle<v8::Value> DoLoop(const v8::Arguments& args) {
v8::TryCatch try_catch;
+ CHECK(!v8::V8::IsExecutionTerminating());
v8::Script::Compile(v8::String::New("function f() {"
" var term = true;"
" try {"
@@ -78,12 +83,14 @@
CHECK(try_catch.Exception()->IsNull());
CHECK(try_catch.Message().IsEmpty());
CHECK(!try_catch.CanContinue());
+ CHECK(v8::V8::IsExecutionTerminating());
return v8::Undefined();
}
v8::Handle<v8::Value> DoLoopNoCall(const v8::Arguments& args) {
v8::TryCatch try_catch;
+ CHECK(!v8::V8::IsExecutionTerminating());
v8::Script::Compile(v8::String::New("var term = true;"
"while(true) {"
" if (term) terminate();"
@@ -93,6 +100,7 @@
CHECK(try_catch.Exception()->IsNull());
CHECK(try_catch.Message().IsEmpty());
CHECK(!try_catch.CanContinue());
+ CHECK(v8::V8::IsExecutionTerminating());
return v8::Undefined();
}
@@ -118,11 +126,13 @@
CreateGlobalTemplate(TerminateCurrentThread, DoLoop);
v8::Persistent<v8::Context> context = v8::Context::New(NULL, global);
v8::Context::Scope context_scope(context);
+ CHECK(!v8::V8::IsExecutionTerminating());
// Run a loop that will be infinite if thread termination does not work.
v8::Handle<v8::String> source =
v8::String::New("try { loop(); fail(); } catch(e) { fail(); }");
v8::Script::Compile(source)->Run();
// Test that we can run the code again after thread termination.
+ CHECK(!v8::V8::IsExecutionTerminating());
v8::Script::Compile(source)->Run();
context.Dispose();
}
@@ -136,10 +146,12 @@
CreateGlobalTemplate(TerminateCurrentThread, DoLoopNoCall);
v8::Persistent<v8::Context> context = v8::Context::New(NULL, global);
v8::Context::Scope context_scope(context);
+ CHECK(!v8::V8::IsExecutionTerminating());
// Run a loop that will be infinite if thread termination does not work.
v8::Handle<v8::String> source =
v8::String::New("try { loop(); fail(); } catch(e) { fail(); }");
v8::Script::Compile(source)->Run();
+ CHECK(!v8::V8::IsExecutionTerminating());
// Test that we can run the code again after thread termination.
v8::Script::Compile(source)->Run();
context.Dispose();
@@ -149,6 +161,7 @@
class TerminatorThread : public v8::internal::Thread {
void Run() {
semaphore->Wait();
+ CHECK(!v8::V8::IsExecutionTerminating());
v8::V8::TerminateExecution();
}
};
@@ -165,6 +178,7 @@
v8::Handle<v8::ObjectTemplate> global = CreateGlobalTemplate(Signal,
DoLoop);
v8::Persistent<v8::Context> context = v8::Context::New(NULL, global);
v8::Context::Scope context_scope(context);
+ CHECK(!v8::V8::IsExecutionTerminating());
// Run a loop that will be infinite if thread termination does not work.
v8::Handle<v8::String> source =
v8::String::New("try { loop(); fail(); } catch(e) { fail(); }");
@@ -187,6 +201,7 @@
CreateGlobalTemplate(Signal, DoLoop);
v8::Persistent<v8::Context> context = v8::Context::New(NULL, global);
v8::Context::Scope context_scope(context);
+ CHECK(!v8::V8::IsExecutionTerminating());
// Run a loop that will be infinite if thread termination does not
work.
v8::Handle<v8::String> source =
v8::String::New("try { loop(); fail(); } catch(e) { fail(); }");
@@ -235,6 +250,7 @@
v8::Handle<v8::Value> TerminateOrReturnObject(const v8::Arguments& args) {
if (++call_count == 10) {
+ CHECK(!v8::V8::IsExecutionTerminating());
v8::V8::TerminateExecution();
return v8::Undefined();
}
@@ -246,6 +262,7 @@
v8::Handle<v8::Value> LoopGetProperty(const v8::Arguments& args) {
v8::TryCatch try_catch;
+ CHECK(!v8::V8::IsExecutionTerminating());
v8::Script::Compile(v8::String::New("function f() {"
" try {"
" while(true) {"
@@ -261,6 +278,7 @@
CHECK(try_catch.Exception()->IsNull());
CHECK(try_catch.Message().IsEmpty());
CHECK(!try_catch.CanContinue());
+ CHECK(v8::V8::IsExecutionTerminating());
return v8::Undefined();
}
@@ -278,12 +296,14 @@
v8::Persistent<v8::Context> context = v8::Context::New(NULL, global);
v8::Context::Scope context_scope(context);
+ CHECK(!v8::V8::IsExecutionTerminating());
// Run a loop that will be infinite if thread termination does not work.
v8::Handle<v8::String> source =
v8::String::New("try { loop(); fail(); } catch(e) { fail(); }");
call_count = 0;
v8::Script::Compile(source)->Run();
// Test that we can run the code again after thread termination.
+ CHECK(!v8::V8::IsExecutionTerminating());
call_count = 0;
v8::Script::Compile(source)->Run();
context.Dispose();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
