AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix bug 1433: clear the global thread table when an isolate is disposed.

Browse Source 
R=ager@chromium.org
BUG=v8:1433
TEST=test-lockers/Regress1433

Review URL: http://codereview.chromium.org/7129002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8209 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
vitalyr@chromium.org 2011-06-07 18:33:03 +00:00
parent 7ff41d4322
commit 2bc305cd9a
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/isolate.cc
View File

@ -1307,6 +1307,7 @@ char* Isolate::RestoreThread(char* from) {
if (RuntimeProfiler::IsEnabled() && current_vm_state() == JS) {
RuntimeProfiler::IsolateEnteredJS(this);
}
ASSERT(context() == NULL || context()->IsContext());
#endif
return from + sizeof(ThreadLocalTop);
}
@ -1350,6 +1351,16 @@ void Isolate::ThreadDataTable::Remove(Isolate* isolate,
}
void Isolate::ThreadDataTable::RemoveAllThreads(Isolate* isolate) {
PerIsolateThreadData* data = list_;
while (data != NULL) {
PerIsolateThreadData* next = data->next_;
if (data->isolate() == isolate) Remove(data);
data = next;
}
}
#ifdef DEBUG
#define TRACE_ISOLATE(tag) \
do { \
@ -1464,6 +1475,10 @@ void Isolate::TearDown() {
Deinit();
{ ScopedLock lock(process_wide_mutex_);
thread_data_table_->RemoveAllThreads(this);
}
if (!IsDefaultIsolate()) {
delete this;
}

2
src/isolate.h
View File

@ -529,6 +529,7 @@ class Isolate {
// Access to top context (where the current function object was created).
Context* context() { return thread_local_top_.context_; }
void set_context(Context* context) {
ASSERT(context == NULL || context->IsContext());
thread_local_top_.context_ = context;
}
Context** context_address() { return &thread_local_top_.context_; }
@ -1003,6 +1004,7 @@ class Isolate {
void Insert(PerIsolateThreadData* data);
void Remove(Isolate* isolate, ThreadId thread_id);
void Remove(PerIsolateThreadData* data);
void RemoveAllThreads(Isolate* isolate);
private:
PerIsolateThreadData* list_;

20
test/cctest/test-lockers.cc
View File

@ -607,3 +607,23 @@ TEST(LockUnlockLockDefaultIsolateMultithreaded) {
}
StartJoinAndDeleteThreads(threads);
}
TEST(Regress1433) {
for (int i = 0; i < 10; i++) {
v8::Isolate* isolate = v8::Isolate::New();
{
v8::Locker lock(isolate);
v8::Isolate::Scope isolate_scope(isolate);
v8::HandleScope handle_scope;
v8::Persistent<Context> context = v8::Context::New();
v8::Context::Scope context_scope(context);
v8::Handle<String> source = v8::String::New("1+1");
v8::Handle<Script> script = v8::Script::Compile(source);
v8::Handle<Value> result = script->Run();
v8::String::AsciiValue ascii(result);
context.Dispose();
}
isolate->Dispose();
}
}