From 231daa2da1f3e6d172754a19939aa0bf32f21bc0 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 26 Jan 2016 19:35:31 +0100 Subject: [PATCH] Thread: Limit thread name to 15 bytes on linux. --- Source/Core/Common/Thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp index ad0436c3ae..29420dd170 100644 --- a/Source/Core/Common/Thread.cpp +++ b/Source/Core/Common/Thread.cpp @@ -136,7 +136,8 @@ void SetCurrentThreadName(const char* szThreadName) #elif defined __FreeBSD__ pthread_set_name_np(pthread_self(), szThreadName); #else - pthread_setname_np(pthread_self(), szThreadName); + // linux doesn't allow to set more than 16 bytes, including \0. + pthread_setname_np(pthread_self(), std::string(szThreadName).substr(0, 15).c_str()); #endif #ifdef USE_VTUNE // VTune uses OS thread names by default but probably supports longer names when set via its own API.