Skip to content

V
V8
Commit 15408ba0 authored by dcarney@chromium.org's avatar dcarney@chromium.org
Browse files
Options

remove CcTest::default_isolate 

R=svenpanne@chromium.org
BUG=

Review URL: https://codereview.chromium.org/24018005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16821 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 59c32b64
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 56 deletions
test/cctest/cctest.cc
View file @ 15408ba0
......@@ -91,7 +91,7 @@ void CcTest::InitializeVM(CcTestExtensionFlags extensions) {
if (extensions.Contains(Name##_ID)) extension_names[extension_count++] = Id;
EXTENSION_LIST(CHECK_EXTENSION_FLAG)
#undef CHECK_EXTENSION_FLAG
v8::Isolate* isolate = default_isolate();
v8::Isolate* isolate = CcTest::isolate();
if (context_.IsEmpty()) {
v8::HandleScope scope(isolate);
v8::ExtensionConfiguration config(extension_count, extension_names);
......
test/cctest/cctest.h
View file @ 15408ba0
......@@ -91,7 +91,6 @@ class CcTest {
const char* name() { return name_; }
const char* dependency() { return dependency_; }
bool enabled() { return enabled_; }
static v8::Isolate* default_isolate() { return isolate(); }
static v8::Handle<v8::Context> env() {
return v8::Local<v8::Context>::New(isolate(), context_);
......
test/cctest/test-api.cc
View file @ 15408ba0
......@@ -12364,7 +12364,7 @@ void ApiTestFuzzer::Run() {
gate_.Wait();
{
// ... get the V8 lock and start running the test.
v8::Locker locker(CcTest::default_isolate());
v8::Locker locker(CcTest::isolate());
CallTest();
}
// This test finished.
......@@ -12428,7 +12428,7 @@ void ApiTestFuzzer::ContextSwitch() {
// If the new thread is the same as the current thread there is nothing to do.
if (NextThread()) {
// Now it can start.
v8::Unlocker unlocker(CcTest::default_isolate());
v8::Unlocker unlocker(CcTest::isolate());
// Wait till someone starts us again.
gate_.Wait();
// And we're off.
......@@ -12484,12 +12484,12 @@ void ApiTestFuzzer::CallTest() {
static void ThrowInJS(const v8::FunctionCallbackInfo<v8::Value>& args) {
CHECK(v8::Locker::IsLocked(CcTest::default_isolate()));
CHECK(v8::Locker::IsLocked(CcTest::isolate()));
ApiTestFuzzer::Fuzz();
v8::Unlocker unlocker(CcTest::default_isolate());
v8::Unlocker unlocker(CcTest::isolate());
const char* code = "throw 7;";
{
v8::Locker nested_locker(CcTest::default_isolate());
v8::Locker nested_locker(CcTest::isolate());
v8::HandleScope scope(args.GetIsolate());
v8::Handle<Value> exception;
{ v8::TryCatch try_catch;
......@@ -12507,12 +12507,12 @@ static void ThrowInJS(const v8::FunctionCallbackInfo<v8::Value>& args) {
static void ThrowInJSNoCatch(const v8::FunctionCallbackInfo<v8::Value>& args) {
CHECK(v8::Locker::IsLocked(CcTest::default_isolate()));
CHECK(v8::Locker::IsLocked(CcTest::isolate()));
ApiTestFuzzer::Fuzz();
v8::Unlocker unlocker(CcTest::default_isolate());
v8::Unlocker unlocker(CcTest::isolate());
const char* code = "throw 7;";
{
v8::Locker nested_locker(CcTest::default_isolate());
v8::Locker nested_locker(CcTest::isolate());
v8::HandleScope scope(args.GetIsolate());
v8::Handle<Value> value = CompileRun(code);
CHECK(value.IsEmpty());
......@@ -12524,8 +12524,8 @@ static void ThrowInJSNoCatch(const v8::FunctionCallbackInfo<v8::Value>& args) {
// These are locking tests that don't need to be run again
// as part of the locking aggregation tests.
TEST(NestedLockers) {
v8::Locker locker(CcTest::default_isolate());
CHECK(v8::Locker::IsLocked(CcTest::default_isolate()));
v8::Locker locker(CcTest::isolate());
CHECK(v8::Locker::IsLocked(CcTest::isolate()));
LocalContext env;
v8::HandleScope scope(env->GetIsolate());
Local<v8::FunctionTemplate> fun_templ = v8::FunctionTemplate::New(ThrowInJS);
......@@ -12546,7 +12546,7 @@ TEST(NestedLockers) {
// These are locking tests that don't need to be run again
// as part of the locking aggregation tests.
TEST(NestedLockersNoTryCatch) {
v8::Locker locker(CcTest::default_isolate());
v8::Locker locker(CcTest::isolate());
LocalContext env;
v8::HandleScope scope(env->GetIsolate());
Local<v8::FunctionTemplate> fun_templ =
......@@ -12566,24 +12566,24 @@ TEST(NestedLockersNoTryCatch) {
THREADED_TEST(RecursiveLocking) {
v8::Locker locker(CcTest::default_isolate());
v8::Locker locker(CcTest::isolate());
{
v8::Locker locker2(CcTest::default_isolate());
CHECK(v8::Locker::IsLocked(CcTest::default_isolate()));
v8::Locker locker2(CcTest::isolate());
CHECK(v8::Locker::IsLocked(CcTest::isolate()));
}
}
static void UnlockForAMoment(const v8::FunctionCallbackInfo<v8::Value>& args) {
ApiTestFuzzer::Fuzz();
v8::Unlocker unlocker(CcTest::default_isolate());
v8::Unlocker unlocker(CcTest::isolate());
}
THREADED_TEST(LockUnlockLock) {
{
v8::Locker locker(CcTest::default_isolate());
v8::HandleScope scope(CcTest::default_isolate());
v8::Locker locker(CcTest::isolate());
v8::HandleScope scope(CcTest::isolate());
LocalContext env;
Local<v8::FunctionTemplate> fun_templ =
v8::FunctionTemplate::New(UnlockForAMoment);
......@@ -12596,8 +12596,8 @@ THREADED_TEST(LockUnlockLock) {
CHECK_EQ(42, script->Run()->Int32Value());
}
{
v8::Locker locker(CcTest::default_isolate());
v8::HandleScope scope(CcTest::default_isolate());
v8::Locker locker(CcTest::isolate());
v8::HandleScope scope(CcTest::isolate());
LocalContext env;
Local<v8::FunctionTemplate> fun_templ =
v8::FunctionTemplate::New(UnlockForAMoment);
......@@ -14229,7 +14229,7 @@ class RegExpInterruptTest {
LongRunningRegExp();
{
v8::Unlocker unlock(CcTest::default_isolate());
v8::Unlocker unlock(CcTest::isolate());
gc_thread.Join();
}
v8::Locker::StopPreemption();
......@@ -14256,7 +14256,7 @@ class RegExpInterruptTest {
block_.Wait();
while (gc_during_regexp_ < kRequiredGCs) {
{
v8::Locker lock(CcTest::default_isolate());
v8::Locker lock(CcTest::isolate());
// TODO(lrn): Perhaps create some garbage before collecting.
CcTest::heap()->CollectAllGarbage(i::Heap::kNoGCFlags);
gc_count_++;
......@@ -14316,9 +14316,9 @@ class RegExpInterruptTest {
// Test that a regular expression execution can be interrupted and
// survive a garbage collection.
UNINITIALIZED_TEST(RegExpInterruption) {
v8::Locker lock(CcTest::default_isolate());
v8::Locker lock(CcTest::isolate());
v8::V8::Initialize();
v8::HandleScope scope(CcTest::default_isolate());
v8::HandleScope scope(CcTest::isolate());
Local<Context> local_env;
{
LocalContext env;
......@@ -14351,7 +14351,7 @@ class ApplyInterruptTest {
LongRunningApply();
{
v8::Unlocker unlock(CcTest::default_isolate());
v8::Unlocker unlock(CcTest::isolate());
gc_thread.Join();
}
v8::Locker::StopPreemption();
......@@ -14378,7 +14378,7 @@ class ApplyInterruptTest {
block_.Wait();
while (gc_during_apply_ < kRequiredGCs) {
{
v8::Locker lock(CcTest::default_isolate());
v8::Locker lock(CcTest::isolate());
CcTest::heap()->CollectAllGarbage(i::Heap::kNoGCFlags);
gc_count_++;
}
......@@ -14424,9 +14424,9 @@ class ApplyInterruptTest {
// Test that nothing bad happens if we get a preemption just when we were
// about to do an apply().
UNINITIALIZED_TEST(ApplyInterruption) {
v8::Locker lock(CcTest::default_isolate());
v8::Locker lock(CcTest::isolate());
v8::V8::Initialize();
v8::HandleScope scope(CcTest::default_isolate());
v8::HandleScope scope(CcTest::isolate());
Local<Context> local_env;
{
LocalContext env;
......@@ -14664,7 +14664,7 @@ class RegExpStringModificationTest {
v8::Locker::StartPreemption(1);
LongRunningRegExp();
{
v8::Unlocker unlock(CcTest::default_isolate());
v8::Unlocker unlock(CcTest::isolate());
morph_thread.Join();
}
v8::Locker::StopPreemption();
......@@ -14693,7 +14693,7 @@ class RegExpStringModificationTest {
while (morphs_during_regexp_ < kRequiredModifications &&
morphs_ < kMaxModifications) {
{
v8::Locker lock(CcTest::default_isolate());
v8::Locker lock(CcTest::isolate());
// Swap string between ascii and two-byte representation.
i::String* string = *input_;
MorphAString(string, &ascii_resource_, &uc16_resource_);
......@@ -14741,9 +14741,9 @@ class RegExpStringModificationTest {
// Test that a regular expression execution can be interrupted and
// the string changed without failing.
UNINITIALIZED_TEST(RegExpStringModification) {
v8::Locker lock(CcTest::default_isolate());
v8::Locker lock(CcTest::isolate());
v8::V8::Initialize();
v8::HandleScope scope(CcTest::default_isolate());
v8::HandleScope scope(CcTest::isolate());
Local<Context> local_env;
{
LocalContext env;
......@@ -17100,7 +17100,7 @@ TEST(SetResourceConstraints) {
TEST(SetResourceConstraintsInThread) {
uint32_t* set_limit;
{
v8::Locker locker(CcTest::default_isolate());
v8::Locker locker(CcTest::isolate());
set_limit = ComputeStackLimit(stack_breathing_room);
// Set stack limit.
......@@ -17109,7 +17109,7 @@ TEST(SetResourceConstraintsInThread) {
CHECK(v8::SetResourceConstraints(&constraints));
// Execute a script.
v8::HandleScope scope(CcTest::default_isolate());
v8::HandleScope scope(CcTest::isolate());
LocalContext env;
Local<v8::FunctionTemplate> fun_templ =
v8::FunctionTemplate::New(GetStackLimitCallback);
......@@ -17120,7 +17120,7 @@ TEST(SetResourceConstraintsInThread) {
CHECK(stack_limit == set_limit);
}
{
v8::Locker locker(CcTest::default_isolate());
v8::Locker locker(CcTest::isolate());
CHECK(stack_limit == set_limit);
}
}
......
test/cctest/test-debug.cc
View file @ 15408ba0
......@@ -2727,7 +2727,7 @@ TEST(DebugEvaluateWithoutStack) {
" \"expression\":\"v1\",\"disable_break\":true"
"}}";
v8::Isolate* isolate = CcTest::default_isolate();
v8::Isolate* isolate = CcTest::isolate();
v8::Debug::SendCommand(isolate, buffer, AsciiToUtf16(command_111, buffer));
const char* command_112 = "{\"seq\":112,"
......@@ -4891,7 +4891,7 @@ void MessageQueueDebuggerThread::Run() {
// until the execution of source_2.
// Note: AsciiToUtf16 executes before SendCommand, so command is copied
// to buffer before buffer is sent to SendCommand.
v8::Isolate* isolate = CcTest::default_isolate();
v8::Isolate* isolate = CcTest::isolate();
v8::Debug::SendCommand(isolate, buffer_1, AsciiToUtf16(command_1, buffer_1));
v8::Debug::SendCommand(isolate, buffer_2, AsciiToUtf16(command_2, buffer_2));
v8::Debug::SendCommand(isolate, buffer_2, AsciiToUtf16(command_3, buffer_2));
......
test/cctest/test-lockers.cc
View file @ 15408ba0
......@@ -545,7 +545,7 @@ class LockUnlockLockThread : public JoinableThread {
virtual void Run() {
v8::Locker lock1(isolate_);
CHECK(v8::Locker::IsLocked(isolate_));
CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
CHECK(!v8::Locker::IsLocked(CcTest::isolate()));
{
v8::Isolate::Scope isolate_scope(isolate_);
v8::HandleScope handle_scope(isolate_);
......@@ -557,13 +557,13 @@ class LockUnlockLockThread : public JoinableThread {
{
v8::Unlocker unlock1(isolate_);
CHECK(!v8::Locker::IsLocked(isolate_));
CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
CHECK(!v8::Locker::IsLocked(CcTest::isolate()));
{
v8::Locker lock2(isolate_);
v8::Isolate::Scope isolate_scope(isolate_);
v8::HandleScope handle_scope(isolate_);
CHECK(v8::Locker::IsLocked(isolate_));
CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
CHECK(!v8::Locker::IsLocked(CcTest::isolate()));
v8::Local<v8::Context> context =
v8::Local<v8::Context>::New(isolate_, context_);
v8::Context::Scope context_scope(context);
......@@ -605,24 +605,24 @@ class LockUnlockLockDefaultIsolateThread : public JoinableThread {
public:
explicit LockUnlockLockDefaultIsolateThread(v8::Handle<v8::Context> context)
: JoinableThread("LockUnlockLockDefaultIsolateThread"),
context_(CcTest::default_isolate(), context) {}
context_(CcTest::isolate(), context) {}
virtual void Run() {
v8::Locker lock1(CcTest::default_isolate());
v8::Locker lock1(CcTest::isolate());
{
v8::HandleScope handle_scope(CcTest::default_isolate());
v8::HandleScope handle_scope(CcTest::isolate());
v8::Local<v8::Context> context =
v8::Local<v8::Context>::New(CcTest::default_isolate(), context_);
v8::Local<v8::Context>::New(CcTest::isolate(), context_);
v8::Context::Scope context_scope(context);
CalcFibAndCheck();
}
{
v8::Unlocker unlock1(CcTest::default_isolate());
v8::Unlocker unlock1(CcTest::isolate());
{
v8::Locker lock2(CcTest::default_isolate());
v8::HandleScope handle_scope(CcTest::default_isolate());
v8::Locker lock2(CcTest::isolate());
v8::HandleScope handle_scope(CcTest::isolate());
v8::Local<v8::Context> context =
v8::Local<v8::Context>::New(CcTest::default_isolate(), context_);
v8::Local<v8::Context>::New(CcTest::isolate(), context_);
v8::Context::Scope context_scope(context);
CalcFibAndCheck();
}
......@@ -644,9 +644,9 @@ UNINITIALIZED_TEST(LockUnlockLockDefaultIsolateMultithreaded) {
Local<v8::Context> context;
i::List<JoinableThread*> threads(kNThreads);
{
v8::Locker locker_(CcTest::default_isolate());
v8::HandleScope handle_scope(CcTest::default_isolate());
context = v8::Context::New(CcTest::default_isolate());
v8::Locker locker_(CcTest::isolate());
v8::HandleScope handle_scope(CcTest::isolate());
context = v8::Context::New(CcTest::isolate());
for (int i = 0; i < kNThreads; i++) {
threads.Add(new LockUnlockLockDefaultIsolateThread(context));
}
......
test/cctest/test-threads.cc
View file @ 15408ba0
......@@ -34,7 +34,7 @@
TEST(Preemption) {
v8::Isolate* isolate = CcTest::default_isolate();
v8::Isolate* isolate = CcTest::isolate();
v8::Locker locker(isolate);
v8::V8::Initialize();
v8::HandleScope scope(isolate);
......@@ -69,7 +69,7 @@ class ThreadA : public v8::internal::Thread {
public:
ThreadA() : Thread("ThreadA") { }
void Run() {
v8::Isolate* isolate = CcTest::default_isolate();
v8::Isolate* isolate = CcTest::isolate();
v8::Locker locker(isolate);
v8::HandleScope scope(isolate);
v8::Handle<v8::Context> context = v8::Context::New(isolate);
......@@ -90,7 +90,7 @@ class ThreadA : public v8::internal::Thread {
turn = CLEAN_CACHE;
do {
{
v8::Unlocker unlocker(CcTest::default_isolate());
v8::Unlocker unlocker(CcTest::isolate());
Thread::YieldCPU();
}
} while (turn != SECOND_TIME_FILL_CACHE);
......@@ -109,7 +109,7 @@ class ThreadB : public v8::internal::Thread {
void Run() {
do {
{
v8::Isolate* isolate = CcTest::default_isolate();
v8::Isolate* isolate = CcTest::isolate();
v8::Locker locker(isolate);
if (turn == CLEAN_CACHE) {
v8::HandleScope scope(isolate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment