Move Thread Name Mapping into ThreadFunc.

base/threading/thread_id_name_manager.cc

Index: base/threading/thread_id_name_manager.cc
diff --git a/base/threading/thread_id_name_manager.cc b/base/threading/thread_id_name_manager.cc
index 5351ba714c3fa82340496465ef3efa0850e4da48..a4d24da99c2187c30860c47b26c75afb1d9ad958 100644
--- a/base/threading/thread_id_name_manager.cc
+++ b/base/threading/thread_id_name_manager.cc
@@ -17,13 +17,10 @@ namespace {
 static const char kDefaultName[] = "";
 static std::string* g_default_name;
 
-typedef std::map<PlatformThreadId, std::string*>::iterator
-    ThreadIdToInternedNameIterator;
-typedef std::map<std::string, std::string*>::iterator
-    NameToInternedNameIterator;
 }
 
-ThreadIdNameManager::ThreadIdNameManager() {
+ThreadIdNameManager::ThreadIdNameManager()
+    : main_process_id_(kInvalidThreadId) {
   g_default_name = new std::string(kDefaultName);
 
   AutoLock locked(lock_);
@@ -42,11 +39,19 @@ const char* ThreadIdNameManager::GetDefaultInternedString() {
   return g_default_name->c_str();
 }
 
+void ThreadIdNameManager::RegisterThread(PlatformThreadHandle::Handle handle,
+                                         PlatformThreadId id) {
+  AutoLock locked(lock_);
+  thread_id_to_handle_[id] = handle;
+  thread_handle_to_interned_name_[handle] =
+      name_to_interned_name_[kDefaultName];
+}
+
 void ThreadIdNameManager::SetName(PlatformThreadId id, const char* name) {
   std::string str_name(name);
 
   AutoLock locked(lock_);
-  NameToInternedNameIterator iter = name_to_interned_name_.find(str_name);
+  NameToInternedNameMap::iterator iter = name_to_interned_name_.find(str_name);
   std::string* leaked_str = NULL;
   if (iter != name_to_interned_name_.end()) {
     leaked_str = iter->second;
@@ -54,26 +59,54 @@ void ThreadIdNameManager::SetName(PlatformThreadId id, const char* name) {
     leaked_str = new std::string(str_name);
     name_to_interned_name_[str_name] = leaked_str;
   }
-  thread_id_to_interned_name_[id] = leaked_str;
+
+  ThreadIdToHandleMap::iterator id_to_handle_iter =
+      thread_id_to_handle_.find(id);
+
+  // The main thread of a process will not be created as a Thread object which
+  // means there is no PlatformThreadHandler registered.
+  if (id_to_handle_iter == thread_id_to_handle_.end()) {
+    main_process_name_ = leaked_str;
+    main_process_id_ = id;
+    return;
+  }
+  thread_handle_to_interned_name_[id_to_handle_iter->second] = leaked_str;
 }
 
 const char* ThreadIdNameManager::GetName(PlatformThreadId id) {
   AutoLock locked(lock_);
-  ThreadIdToInternedNameIterator iter = thread_id_to_interned_name_.find(id);
-  // A platform thread may not have a name set, so return blank.
-  if (iter == thread_id_to_interned_name_.end())
+
+  if (id == main_process_id_)
+    return main_process_name_->c_str();
+
+  ThreadIdToHandleMap::iterator id_to_handle_iter =
+      thread_id_to_handle_.find(id);
+  if (id_to_handle_iter == thread_id_to_handle_.end())
     return name_to_interned_name_[kDefaultName]->c_str();
-  return iter->second->c_str();
+
+  ThreadHandleToInternedNameMap::iterator handle_to_name_iter =
+      thread_handle_to_interned_name_.find(id_to_handle_iter->second);
+  return handle_to_name_iter->second->c_str();
 }
 
-void ThreadIdNameManager::RemoveName(PlatformThreadId id) {
-  if (id == kInvalidThreadId)
+void ThreadIdNameManager::RemoveName(PlatformThreadHandle::Handle handle,
+                                     PlatformThreadId id) {
+  AutoLock locked(lock_);
+  ThreadHandleToInternedNameMap::iterator handle_to_name_iter =
+      thread_handle_to_interned_name_.find(handle);
+
+  DCHECK(handle_to_name_iter != thread_handle_to_interned_name_.end());
+  thread_handle_to_interned_name_.erase(handle_to_name_iter);
+
+  ThreadIdToHandleMap::iterator id_to_handle_iter =
+      thread_id_to_handle_.find(id);
+  DCHECK((id_to_handle_iter!= thread_id_to_handle_.end()));
+  // The given |id| may have been re-used by the system. Make sure the
+  // mapping points to the provided |handle| before removal.
+  if (id_to_handle_iter->second != handle)
     return;
 
-  AutoLock locked(lock_);
-  ThreadIdToInternedNameIterator iter = thread_id_to_interned_name_.find(id);
-  DCHECK((iter != thread_id_to_interned_name_.end()));
-  thread_id_to_interned_name_.erase(iter);
+  thread_id_to_handle_.erase(id_to_handle_iter);
 }
 
 }  // namespace base