Don't rename main thread at process level

laanwj · laanwj · commit 07e4bdba3bd4 · 2019-10-03T06:58:47.000+02:00
Set only the internal name. Fixes bitcoin#17036 for both `bitcoind` and `bitcoin-qt`.
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
@@ -45,7 +45,7 @@ static bool AppInit(int argc, char* argv[])
 
     bool fRet = false;
 
-    util::ThreadRename("init");
+    util::ThreadSetInternalName("init");
 
     //
     // Parameters
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -416,7 +416,7 @@ int GuiMain(int argc, char* argv[])
     std::tie(argc, argv) = winArgs.get();
 #endif
     SetupEnvironment();
-    util::ThreadRename("main");
+    util::ThreadSetInternalName("main");
 
     std::unique_ptr<interfaces::Node> node = interfaces::MakeNode();
 
diff --git a/src/util/threadnames.cpp b/src/util/threadnames.cpp
@@ -60,3 +60,8 @@ void util::ThreadRename(std::string&& name)
     SetThreadName(("b-" + name).c_str());
     SetInternalName(std::move(name));
 }
+
+void util::ThreadSetInternalName(std::string&& name)
+{
+    SetInternalName(std::move(name));
+}
diff --git a/src/util/threadnames.h b/src/util/threadnames.h
@@ -10,8 +10,13 @@
 namespace util {
 //! Rename a thread both in terms of an internal (in-memory) name as well
 //! as its system thread name.
+//! @note Do not call this for the main thread, as this will interfere with
+//! UNIX utilities such as top and killall. Use ThreadSetInternalName instead.
 void ThreadRename(std::string&&);
 
+//! Set the internal (in-memory) name of the current thread only.
+void ThreadSetInternalName(std::string&&);
+
 //! Get the thread's internal (in-memory) name; used e.g. for identification in
 //! logging.
 const std::string& ThreadGetInternalName();

Original file line number	Diff line number	Diff line change
`@@ -60,3 +60,8 @@ void util::ThreadRename(std::string&& name)`
`60`	`60`	`SetThreadName(("b-" + name).c_str());`
`61`	`61`	`SetInternalName(std::move(name));`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+void util::ThreadSetInternalName(std::string&& name)`
	`65`	`+{`
	`66`	`+ SetInternalName(std::move(name));`
	`67`	`+}`