[Isolates] Patch to land http://codereview.chromium.org/3043007 by Maxim.Moss...

src/platform-win32.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1405 matching lines @@
 // 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
 // object. It is important that this function has __stdcall calling
 // convention.
 static unsigned int __stdcall ThreadEntry(void* arg) {
   Thread* thread = reinterpret_cast<Thread*>(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);
 }
 
@@ skipping 23 matching lines @@
 class Thread::PlatformData : public Malloced {
  public:
   explicit PlatformData(HANDLE thread) : thread_(thread) {}
   HANDLE thread_;
 };
 
 
 // Initialize a Win32 thread object. The thread has an invalid thread
 // handle until it is started.
 
-Thread::Thread() : ThreadHandle(ThreadHandle::INVALID) {
+Thread::Thread(Isolate* isolate)
+    : ThreadHandle(ThreadHandle::INVALID),
+      isolate_(isolate) {
   data_ = new PlatformData(kNoThread);
 }
 
 
 // Close our own handle for the thread.
 Thread::~Thread() {
   if (data_->thread_ != kNoThread) CloseHandle(data_->thread_);
   delete data_;
 }
 
@@ skipping 366 matching lines @@
       sampler_->Tick(sample);
     }
   }
 };
 
 
 // Entry point for sampler thread.
 static unsigned int __stdcall SamplerEntry(void* arg) {
   Sampler::PlatformData* data =
       reinterpret_cast<Sampler::PlatformData*>(arg);
+  Thread::SetThreadLocal(Isolate::isolate_key(), data->sampler_->isolate());
   data->Runner();
   return 0;
 }
 
 
 // Initialize a profile sampler.
-Sampler::Sampler(int interval, bool profiling)
-    : interval_(interval), profiling_(profiling), active_(false) {
+Sampler::Sampler(Isolate* isolate, int interval, bool profiling)
+    : isolate_(isolate),
+      interval_(interval),
+      profiling_(profiling),
+      active_(false) {
   data_ = new PlatformData(this);
 }
 
 
 Sampler::~Sampler() {
   delete data_;
 }
 
 
 // Start profiling.
@@ skipping 36 matching lines @@
 
   // Release the thread handles
   CloseHandle(data_->sampler_thread_);
   CloseHandle(data_->profiled_thread_);
 }
 
 
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 } }  // namespace v8::internal