Use SetNameSimple instead of SetName to avoid deadlock

src/brpc/details/usercode_backup_pool.cpp

@@ -92,7 +92,7 @@ UserCodeBackupPool::UserCodeBackupPool()
 }
 
 static void* UserCodeRunner(void* args) {
-    butil::PlatformThread::SetName("brpc_user_code_runner");
+    butil::PlatformThread::SetNameSimple("brpc_user_code_runner");
     static_cast<UserCodeBackupPool*>(args)->UserCodeRunningLoop();
     return NULL;
 }

src/bthread/execution_queue.cpp

@@ -208,7 +208,7 @@ void* ExecutionQueueBase::_execute_tasks(void* arg) {
 }
 
 void* ExecutionQueueBase::_execute_tasks_pthread(void* arg) {
-    butil::PlatformThread::SetName("ExecutionQueue");
+    butil::PlatformThread::SetNameSimple("ExecutionQueue");
     auto head = (TaskNode*)arg;
     auto m = (ExecutionQueueBase*)head->q;
     m->_current_head = head;

src/bthread/task_control.cpp

@@ -103,7 +103,7 @@ void* TaskControl::worker_thread(void* arg) {
         std::string worker_thread_name = butil::string_printf(
             "brpc_wkr:%d-%d", g->tag(),
             c->_next_worker_id.fetch_add(1, butil::memory_order_relaxed));
-        butil::PlatformThread::SetName(worker_thread_name.c_str());
+        butil::PlatformThread::SetNameSimple(worker_thread_name.c_str());
     }
     BT_VLOG << "Created worker=" << pthread_self() << " tid=" << g->_tid
             << " bthread=" << g->main_tid() << " tag=" << g->tag();

src/bthread/timer_thread.cpp

@@ -121,7 +121,7 @@ inline bool task_greater(const TimerThread::Task* a, const TimerThread::Task* b)
 }
 
 void* TimerThread::run_this(void* arg) {
-    butil::PlatformThread::SetName("brpc_timer");
+    butil::PlatformThread::SetNameSimple("brpc_timer");
     static_cast<TimerThread*>(arg)->run();
     return NULL;
 }

src/butil/threading/platform_thread.h

@@ -154,6 +154,7 @@ class BUTIL_EXPORT PlatformThread {
   // otherwise. This name pointer is not copied internally. Thus, it must stay
   // valid until the thread ends.
   static void SetName(const char* name);
+  static void SetNameSimple(const char* name);
 
   // Gets the thread name, if previously set by SetName.
   static const char* GetName();

src/butil/threading/platform_thread_freebsd.cc

@@ -48,6 +48,11 @@ void PlatformThread::SetName(const char* name) {
   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
   tracked_objects::ThreadData::InitializeThreadContext(name);
 
+  SetNameSimple(name);
+}
+
+// static
+void PlatformThread::SetNameSimple(const char* name) {
 #if !defined(OS_NACL)
   // On FreeBSD we can get the thread names to show up in the debugger by
   // setting the process name for the LWP.  We don't want to do this for the

src/butil/threading/platform_thread_linux.cc

@@ -54,6 +54,10 @@ int ThreadNiceValue(ThreadPriority priority) {
 void PlatformThread::SetName(const char* name) {
   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
 
+  SetNameSimple(name);
+}
+// static
+void PlatformThread::SetNameSimple(const char* name) {
 #if !defined(OS_NACL)
   // On linux we can get the thread names to show up in the debugger by setting
   // the process name for the LWP.  We don't want to do this for the main

src/butil/threading/platform_thread_mac.mm

@@ -46,6 +46,11 @@ void InitThreading() {
   // TODO: add tracked_objects related headers
   //tracked_objects::ThreadData::InitializeThreadContext(name);
 
+  SetNameSimple(name);
+}
+
+// static
+void PlatformThread::SetNameSimple(const char* name) {
   // Mac OS X does not expose the length limit of the name, so
   // hardcode it.
   const int kMaxNameLength = 63;

src/bvar/collector.cpp

@@ -77,13 +77,13 @@ class Collector : public bvar::Reducer<Collected*, CombineCollected> {
                             int64_t interval_us);
 
     static void* run_grab_thread(void* arg) {
-        butil::PlatformThread::SetName("bvar_collector_grabber");
+        butil::PlatformThread::SetNameSimple("bvar_collector_grabber");
         static_cast<Collector*>(arg)->grab_thread();
         return NULL;
     }
 
     static void* run_dump_thread(void* arg) {
-        butil::PlatformThread::SetName("bvar_collector_dumper");
+        butil::PlatformThread::SetNameSimple("bvar_collector_dumper");
         static_cast<Collector*>(arg)->dump_thread();
         return NULL;
     }

src/bvar/detail/sampler.cpp

@@ -109,7 +109,7 @@ class SamplerCollector : public bvar::Reducer<Sampler*, CombineSampler> {
     void run();
 
     static void* sampling_thread(void* arg) {
-        butil::PlatformThread::SetName("bvar_sampler");
+        butil::PlatformThread::SetNameSimple("bvar_sampler");
         static_cast<SamplerCollector*>(arg)->run();
         return NULL;
     }

src/bvar/variable.cpp

@@ -730,7 +730,7 @@ static GFlag s_gflag_bvar_dump_interval("bvar_dump_interval");
 static void* dumping_thread(void*) {
     // NOTE: this variable was declared as static <= r34381, which was
     // destructed when program exits and caused coredumps.
-    butil::PlatformThread::SetName("bvar_dumper");
+    butil::PlatformThread::SetNameSimple("bvar_dumper");
     const std::string command_name = read_command_name();
     std::string last_filename;
     std::string mbvar_last_filename;