Move Thread Name Mapping into ThreadFunc.

base/threading/platform_thread_posix.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 <errno.h>
 #include <sched.h>
 
 #include "base/lazy_instance.h"
@@ skipping 28 matching lines @@
 #if defined(OS_MACOSX)
 void InitThreading();
 #endif
 
 namespace {
 
 struct ThreadParams {
   PlatformThread::Delegate* delegate;
   bool joinable;
   ThreadPriority priority;
+  PlatformThreadHandle* thread_handle;
 };
 
 void SetCurrentThreadPriority(ThreadPriority priority) {
 #if defined(OS_LINUX) || defined(OS_ANDROID)
   switch (priority) {
     case kThreadPriority_Normal:
       NOTREACHED() << "Don't reset priority as not all processes can.";
       break;
     case kThreadPriority_RealtimeAudio:
 #if defined(OS_LINUX)
@@ skipping 25 matching lines @@
 #endif
   ThreadParams* thread_params = static_cast<ThreadParams*>(params);
   PlatformThread::Delegate* delegate = thread_params->delegate;
   if (!thread_params->joinable)
     base::ThreadRestrictions::SetSingletonAllowed(false);
 
   // If there is a non-default priority for this thread, set it now.
   if (thread_params->priority != kThreadPriority_Normal)
     SetCurrentThreadPriority(thread_params->priority);
 
+  ThreadIdNameManager::GetInstance()->RegisterThread(
+      thread_params->thread_handle,
+      PlatformThread::CurrentId());
+
   delete thread_params;
   delegate->ThreadMain();
 #if defined(OS_ANDROID)
   base::android::DetachFromVM();
 #endif
   return NULL;
 }
 
 bool CreateThread(size_t stack_size, bool joinable,
                   PlatformThread::Delegate* delegate,
@@ skipping 44 matching lines @@
   }
 #endif  // OS_MACOSX && !OS_IOS
 
   if (stack_size > 0)
     pthread_attr_setstacksize(&attributes, stack_size);
 
   ThreadParams* params = new ThreadParams;
   params->delegate = delegate;
   params->joinable = joinable;
   params->priority = priority;
+  params->thread_handle = thread_handle;
 
   int err = pthread_create(thread_handle, &attributes, ThreadFunc, params);
   success = !err;
   if (!success) {
     errno = err;
     PLOG(ERROR) << "pthread_create";
   }
 
   pthread_attr_destroy(&attributes);
   if (!success)
@@ skipping 127 matching lines @@
 }
 #endif
 
 #if defined(OS_ANDROID)
 bool RegisterThreadUtils(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace base