| Index: src/platform-win32.cc
|
| diff --git a/src/platform-win32.cc b/src/platform-win32.cc
|
| index ab03e3d1107bf438dc68b951a2536ec43ec8afab..f1395262178c026851627ff379ffe1cf72bbc036 100644
|
| --- a/src/platform-win32.cc
|
| +++ b/src/platform-win32.cc
|
| @@ -1468,24 +1468,6 @@ bool VirtualMemory::Uncommit(void* address, size_t size) {
|
|
|
| // Definition of invalid thread handle and id.
|
| static const HANDLE kNoThread = INVALID_HANDLE_VALUE;
|
| -static const DWORD kNoThreadId = 0;
|
| -
|
| -
|
| -class ThreadHandle::PlatformData : public Malloced {
|
| - public:
|
| - explicit PlatformData(ThreadHandle::Kind kind) {
|
| - Initialize(kind);
|
| - }
|
| -
|
| - void Initialize(ThreadHandle::Kind kind) {
|
| - switch (kind) {
|
| - case ThreadHandle::SELF: tid_ = GetCurrentThreadId(); break;
|
| - case ThreadHandle::INVALID: tid_ = kNoThreadId; break;
|
| - }
|
| - }
|
| - DWORD tid_; // Win32 thread identifier.
|
| -};
|
| -
|
|
|
| // Entry point for threads. The supplied argument is a pointer to the thread
|
| // object. The entry function dispatches to the run method in the thread
|
| @@ -1496,41 +1478,12 @@ static unsigned int __stdcall ThreadEntry(void* arg) {
|
| // This is also initialized by the last parameter to _beginthreadex() but we
|
| // don't know which thread will run first (the original thread or the new
|
| // one) so we initialize it here too.
|
| - thread->thread_handle_data()->tid_ = GetCurrentThreadId();
|
| Thread::SetThreadLocal(Isolate::isolate_key(), thread->isolate());
|
| thread->Run();
|
| return 0;
|
| }
|
|
|
|
|
| -// Initialize thread handle to invalid handle.
|
| -ThreadHandle::ThreadHandle(ThreadHandle::Kind kind) {
|
| - data_ = new PlatformData(kind);
|
| -}
|
| -
|
| -
|
| -ThreadHandle::~ThreadHandle() {
|
| - delete data_;
|
| -}
|
| -
|
| -
|
| -// The thread is running if it has the same id as the current thread.
|
| -bool ThreadHandle::IsSelf() const {
|
| - return GetCurrentThreadId() == data_->tid_;
|
| -}
|
| -
|
| -
|
| -// Test for invalid thread handle.
|
| -bool ThreadHandle::IsValid() const {
|
| - return data_->tid_ != kNoThreadId;
|
| -}
|
| -
|
| -
|
| -void ThreadHandle::Initialize(ThreadHandle::Kind kind) {
|
| - data_->Initialize(kind);
|
| -}
|
| -
|
| -
|
| class Thread::PlatformData : public Malloced {
|
| public:
|
| explicit PlatformData(HANDLE thread) : thread_(thread) {}
|
| @@ -1542,8 +1495,7 @@ class Thread::PlatformData : public Malloced {
|
| // handle until it is started.
|
|
|
| Thread::Thread(Isolate* isolate, const Options& options)
|
| - : ThreadHandle(ThreadHandle::INVALID),
|
| - isolate_(isolate),
|
| + : isolate_(isolate),
|
| stack_size_(options.stack_size) {
|
| data_ = new PlatformData(kNoThread);
|
| set_name(options.name);
|
| @@ -1551,8 +1503,7 @@ Thread::Thread(Isolate* isolate, const Options& options)
|
|
|
|
|
| Thread::Thread(Isolate* isolate, const char* name)
|
| - : ThreadHandle(ThreadHandle::INVALID),
|
| - isolate_(isolate),
|
| + : isolate_(isolate),
|
| stack_size_(0) {
|
| data_ = new PlatformData(kNoThread);
|
| set_name(name);
|
| @@ -1582,8 +1533,7 @@ void Thread::Start() {
|
| ThreadEntry,
|
| this,
|
| 0,
|
| - reinterpret_cast<unsigned int*>(
|
| - &thread_handle_data()->tid_)));
|
| + NULL));
|
| ASSERT(IsValid());
|
| }
|
|
|
|
|