Move Thread Name Mapping into ThreadFunc.

base/threading/thread_id_name_manager.h

 // 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.
 
 #ifndef BASE_THREADING_THREAD_ID_NAME_MANAGER_H_
 #define BASE_THREADING_THREAD_ID_NAME_MANAGER_H_
 
 #include <map>
 #include <string>
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
 namespace base {
 
 class BASE_EXPORT ThreadIdNameManager {
  public:
   static ThreadIdNameManager* GetInstance();
 
   static const char* GetDefaultInternedString();
 
+  // Register the mapping between a thread |id| and |handle|.
+  void RegisterThread(PlatformThreadHandle::Handle handle, PlatformThreadId id);
+
   // Set the name for the given id.
   void SetName(PlatformThreadId id, const char* name);
 
   // Get the name for the given id.
   const char* GetName(PlatformThreadId id);
 
   // Remove the name for the given id.
-  void RemoveName(PlatformThreadId id);
+  void RemoveName(PlatformThreadHandle::Handle handle, PlatformThreadId id);
 
  private:
   friend struct DefaultSingletonTraits<ThreadIdNameManager>;
 
+  typedef std::map<PlatformThreadId, PlatformThreadHandle::Handle>
+      ThreadIdToHandleMap;
+  typedef std::map<PlatformThreadHandle::Handle, std::string*>
+      ThreadHandleToInternedNameMap;
+  typedef std::map<std::string, std::string*> NameToInternedNameMap;
+
   ThreadIdNameManager();
   ~ThreadIdNameManager();
 
-  // lock_ protects both the thread_id_to_name_ and name_to_interned_name_ maps.
+  // lock_ protects the name_to_interned_name_, thread_id_to_handle_ and
+  // thread_handle_to_interned_name_ maps.
   Lock lock_;
 
-  std::map<PlatformThreadId, std::string*> thread_id_to_interned_name_;
-  std::map<std::string, std::string*> name_to_interned_name_;
+  NameToInternedNameMap name_to_interned_name_;
+  ThreadIdToHandleMap thread_id_to_handle_;
+  ThreadHandleToInternedNameMap thread_handle_to_interned_name_;
+
+  // Treat the main process specially as it doesn't have a PlatformThreadHandle

[jar (doing other things), 2013/05/25 00:25:09]

nit: period at end of sentence... and you might have to wrap the line the line
at 80 columns if you can't be more terns.

[dsinclair, 2013/05/27 18:50:59]

Done.

+  std::string* main_process_name_;
+  PlatformThreadId main_process_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadIdNameManager);
 };
 
 }  // namespace base
 
 #endif  // BASE_THREADING_THREAD_ID_NAME_MANAGER_H_