tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Factor out thread name setter/getter

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2016-06-18 17:08:26 +03:00
parent 6c9e00be3a
commit 77f309e7a0
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mbgl/platform/log.cpp
View File

@@ -1,5 +1,6 @@
#include <mbgl/platform/log.hpp>
#include <mbgl/util/enum.hpp>
#include <mbgl/util/thread.hpp>
#include <cstdio>
#include <cstdarg>
@@ -49,18 +50,7 @@ void Log::record(EventSeverity severity, Event event, int64_t code, const std::s
std::stringstream logStream;
#if defined(__APPLE__)
char name[32];
pthread_getname_np(pthread_self(), name, sizeof(name));
logStream << "{" << name << "}";
#elif defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 12)
char name[32];
pthread_getname_np(pthread_self(), name, sizeof(name));
logStream << "{" << name << "}";
#endif
#endif
logStream << "{" << util::getCurrentThreadName() << "}";
logStream << "[" << Enum<Event>::toString(event) << "]";
if (code >= 0) {

31
src/mbgl/util/thread.hpp
View File

@@ -87,6 +87,29 @@ private:
RunLoop* loop = nullptr;
};
inline std::string getCurrentThreadName() {
char name[32] = "unknown";
#if defined(__APPLE__)
pthread_getname_np(pthread_self(), name, sizeof(name));
#elif defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 12)
pthread_getname_np(pthread_self(), name, sizeof(name));
#endif
#endif
return name;
}
inline void setCurrentThreadName(const std::string& name) {
#if defined(__APPLE__)
pthread_setname_np(name.c_str());
#elif defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 12)
pthread_setname_np(pthread_self(), name.c_str());
#endif
#endif
(void)name;
}
template <class Object>
template <class... Args>
Thread<Object>::Thread(const ThreadContext& context, Args&&... args) {
@@ -95,13 +118,7 @@ Thread<Object>::Thread(const ThreadContext& context, Args&&... args) {
std::tuple<Args...> params = std::forward_as_tuple(::std::forward<Args>(args)...);
thread = std::thread([&] {
#if defined(__APPLE__)
pthread_setname_np(context.name.c_str());
#elif defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 12)
pthread_setname_np(pthread_self(), context.name.c_str());
#endif
#endif
setCurrentThreadName(context.name);
if (context.priority == ThreadPriority::Low) {
platform::makeThreadLowPriority();