Move Thread Name Mapping into ThreadFunc.

base/threading/platform_thread_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/threading/platform_thread.h"
 
 #include "base/debug/alias.h"
 #include "base/debug/profiler.h"
 #include "base/logging.h"
 #include "base/threading/thread_id_name_manager.h"
@@ skipping 35 matching lines @@
 struct ThreadParams {
   PlatformThread::Delegate* delegate;
   bool joinable;
 };
 
 DWORD __stdcall ThreadFunc(void* params) {
   ThreadParams* thread_params = static_cast<ThreadParams*>(params);
   PlatformThread::Delegate* delegate = thread_params->delegate;
   if (!thread_params->joinable)
     base::ThreadRestrictions::SetSingletonAllowed(false);
+
+  /* Retrieve a copy of the thread handle to use as the key in the
+   * thread name mapping. */
+  PlatformThreadHandle::Handle platform_handle;
+  DuplicateHandle(
+      GetCurrentProcess(),
+      GetCurrentThread(),
+      GetCurrentProcess(),
+      &platform_handle,
+      0,
+      FALSE,
+      DUPLICATE_SAME_ACCESS);
+
+  ThreadIdNameManager::GetInstance()->RegisterThread(
+      platform_handle,
+      PlatformThread::CurrentId());
+
   delete thread_params;
   delegate->ThreadMain();
+
+  ThreadIdNameManager::GetInstance()->RemoveName(
+      platform_handle,
+      PlatformThread::CurrentId());
   return NULL;
 }
 
 // CreateThreadInternal() matches PlatformThread::Create(), except that
 // |out_thread_handle| may be NULL, in which case a non-joinable thread is
 // created.
 bool CreateThreadInternal(size_t stack_size,
                           PlatformThread::Delegate* delegate,
                           PlatformThreadHandle* out_thread_handle) {
   unsigned int flags = 0;
@@ skipping 136 matching lines @@
     case kThreadPriority_RealtimeAudio:
       ::SetThreadPriority(handle.handle_, THREAD_PRIORITY_TIME_CRITICAL);
       break;
     default:
       NOTREACHED() << "Unknown priority.";
       break;
   }
 }
 
 }  // namespace base