Commit d78fab45 authored by jochen@chromium.org's avatar jochen@chromium.org

Fix data race in cctest/test-api/RegExpInterruption

BUG=v8:3615
R=yangguo@chromium.org
LOG=n

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24451 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 8617b3ac
......@@ -15400,7 +15400,7 @@ TEST(CompileExternalTwoByteSource) {
#ifndef V8_INTERPRETED_REGEXP
struct RegExpInterruptionData {
int loop_count;
v8::base::Atomic32 loop_count;
UC16VectorResource* string_resource;
v8::Persistent<v8::String> string;
} regexp_interruption_data;
......@@ -15412,9 +15412,10 @@ class RegExpInterruptionThread : public v8::base::Thread {
: Thread(Options("TimeoutThread")), isolate_(isolate) {}
virtual void Run() {
for (regexp_interruption_data.loop_count = 0;
regexp_interruption_data.loop_count < 7;
regexp_interruption_data.loop_count++) {
for (v8::base::NoBarrier_Store(&regexp_interruption_data.loop_count, 0);
v8::base::NoBarrier_Load(&regexp_interruption_data.loop_count) < 7;
v8::base::NoBarrier_AtomicIncrement(
&regexp_interruption_data.loop_count, 1)) {
v8::base::OS::Sleep(50); // Wait a bit before requesting GC.
reinterpret_cast<i::Isolate*>(isolate_)->stack_guard()->RequestGC();
}
......@@ -15428,7 +15429,9 @@ class RegExpInterruptionThread : public v8::base::Thread {
void RunBeforeGC(v8::GCType type, v8::GCCallbackFlags flags) {
if (regexp_interruption_data.loop_count != 2) return;
if (v8::base::NoBarrier_Load(&regexp_interruption_data.loop_count) != 2) {
return;
}
v8::HandleScope scope(CcTest::isolate());
v8::Local<v8::String> string = v8::Local<v8::String>::New(
CcTest::isolate(), regexp_interruption_data.string);
......
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