tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-22 21:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

base: Don't set thread name for the first thread.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-09-03 15:44:31 +02:00
parent 4be2105584
commit e05f270459
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icinga-app/icinga.cpp
View File

@ -166,7 +166,7 @@ int main(int argc, char **argv)
#endif /* _WIN32 */ #endif /* _WIN32 */
/* Set thread title. */ /* Set thread title. */
Utility::SetThreadName("Main Thread"); Utility::SetThreadName("Main Thread", false);
/* Set command-line arguments. */ /* Set command-line arguments. */
Application::SetArgC(argc); Application::SetArgC(argc);

5
lib/base/utility.cpp
View File

@ -514,10 +514,13 @@ static void WindowsSetThreadName(const char *name)
} }
#endif /* _WIN32 */ #endif /* _WIN32 */
void Utility::SetThreadName(const String& name) void Utility::SetThreadName(const String& name, bool os)
{ {
m_ThreadName.reset(new String(name)); m_ThreadName.reset(new String(name));
if (!os)
return;
#ifdef _WIN32 #ifdef _WIN32
WindowsSetThreadName(name.CStr()); WindowsSetThreadName(name.CStr());
#endif /* _WIN32 */ #endif /* _WIN32 */

2
lib/base/utility.h
View File

@ -92,7 +92,7 @@ public:
static String EscapeShellCmd(const String& s); static String EscapeShellCmd(const String& s);
static void SetThreadName(const String& name); static void SetThreadName(const String& name, bool os = true);
static String GetThreadName(void); static String GetThreadName(void);
private: private: