X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fv8%2Ftest%2Fcctest%2Ftest-lockers.cc;h=ed315cea3dc6a399857fcfb9cce1636fef7f7f7b;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=f92a81e6501f1f2078f8a5c0722db6d44491fb96;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/v8/test/cctest/test-lockers.cc b/src/v8/test/cctest/test-lockers.cc index f92a81e..ed315ce 100644 --- a/src/v8/test/cctest/test-lockers.cc +++ b/src/v8/test/cctest/test-lockers.cc @@ -30,11 +30,11 @@ #include "src/v8.h" #include "src/api.h" +#include "src/base/platform/platform.h" #include "src/compilation-cache.h" #include "src/execution.h" #include "src/isolate.h" #include "src/parser.h" -#include "src/platform.h" #include "src/smart-pointers.h" #include "src/snapshot.h" #include "src/unicode-inl.h" @@ -56,10 +56,10 @@ using ::v8::V8; // Migrating an isolate -class KangarooThread : public v8::internal::Thread { +class KangarooThread : public v8::base::Thread { public: KangarooThread(v8::Isolate* isolate, v8::Handle context) - : Thread("KangarooThread"), + : Thread(Options("KangarooThread")), isolate_(isolate), context_(isolate, context) {} @@ -146,12 +146,11 @@ class JoinableThread { virtual void Run() = 0; private: - class ThreadWithSemaphore : public i::Thread { + class ThreadWithSemaphore : public v8::base::Thread { public: explicit ThreadWithSemaphore(JoinableThread* joinable_thread) - : Thread(joinable_thread->name_), - joinable_thread_(joinable_thread) { - } + : Thread(Options(joinable_thread->name_)), + joinable_thread_(joinable_thread) {} virtual void Run() { joinable_thread_->Run(); @@ -163,7 +162,7 @@ class JoinableThread { }; const char* name_; - i::Semaphore semaphore_; + v8::base::Semaphore semaphore_; ThreadWithSemaphore thread_; friend class ThreadWithSemaphore; @@ -223,9 +222,7 @@ TEST(IsolateLockingStress) { class IsolateNonlockingThread : public JoinableThread { public: - explicit IsolateNonlockingThread() - : JoinableThread("IsolateNonlockingThread") { - } + IsolateNonlockingThread() : JoinableThread("IsolateNonlockingThread") {} virtual void Run() { v8::Isolate* isolate = v8::Isolate::New(); @@ -247,6 +244,8 @@ class IsolateNonlockingThread : public JoinableThread { TEST(MultithreadedParallelIsolates) { #if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS const int kNThreads = 10; +#elif V8_TARGET_ARCH_X64 && V8_TARGET_ARCH_32_BIT + const int kNThreads = 4; #else const int kNThreads = 50; #endif @@ -713,6 +712,8 @@ class IsolateGenesisThread : public JoinableThread { TEST(ExtensionsRegistration) { #if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS const int kNThreads = 10; +#elif V8_TARGET_ARCH_X64 && V8_TARGET_ARCH_32_BIT + const int kNThreads = 4; #else const int kNThreads = 40; #endif