3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 04:31:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixes of previous commit on Posix platforms

Browse source
This commit is contained in:
Vojtech Bubnik 2020-10-22 14:29:40 +02:00
parent 81b6883710
commit 6e2a5419cc
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libslic3r/Thread.cpp
View file

@ -16,10 +16,9 @@
#include "Thread.hpp"
#ifdef _WIN32
namespace Slic3r {
#ifdef _WIN32
#ifdef SLIC3R_THREAD_NAME_WIN32_MODERN
static void WindowsSetThreadName(HANDLE hThread, const char *thread_name)
@ -84,7 +83,7 @@ void set_current_thread_name(const char *thread_name)
WindowsSetThreadName(::GetCurrentThread(), thread_name);
}
void std::string get_current_thread_name() const
std::string get_current_thread_name()
{
wchar_t *ptr = nullptr;
::GetThreadDescription(::GetCurrentThread(), &ptr);
@ -96,20 +95,20 @@ void std::string get_current_thread_name() const
// posix
void set_thread_name(std::thread &thread, const char *thread_name)
{
pthread_setname_np(thread->native_handle(), thread_name);
pthread_setname_np(thread.native_handle(), thread_name);
}
void set_thread_name(boost::thread &thread, const char *thread_name)
{
pthread_setname_np(thread->native_handle(), thread_name);
pthread_setname_np(thread.native_handle(), thread_name);
}
void set_current_thread_name(const char *thread_name)
{
set_thread_name(pthread_self(), thread_name);
pthread_setname_np(pthread_self(), thread_name);
}
void std::string get_current_thread_name() const
std::string get_current_thread_name()
{
char buf[16];
return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : "");
@ -133,10 +132,8 @@ void name_tbb_thread_pool_threads()
nthreads = 1;
#endif
if (nthreads != nthreads_hw) {
static tbb::task_scheduler_init *tbb_init = nullptr;
tbb_init = new tbb::task_scheduler_init(nthreads);
}
if (nthreads != nthreads_hw)
new tbb::task_scheduler_init(nthreads);
std::atomic<size_t> nthreads_running(0);
std::condition_variable cv;
@ -163,7 +160,7 @@ void name_tbb_thread_pool_threads()
assert(range.begin() > 0);
std::ostringstream name;
name << "slic3r_tbb_" << range.begin();
set_current_thread_name(name.str());
set_current_thread_name(name.str().c_str());
}
});
}

3
src/libslic3r/Thread.hpp
View file

@ -2,6 +2,7 @@
#define GUI_THREAD_HPP
#include <utility>
#include <string>
#include <thread>
#include <boost/thread.hpp>
@ -16,7 +17,7 @@ inline void set_thread_name(boost::thread &thread, const std::string &thread_nam
void set_current_thread_name(const char *thread_name);
inline void set_current_thread_name(const std::string &thread_name) { set_current_thread_name(thread_name.c_str()); }
void std::string get_current_thread_name() const;
std::string get_current_thread_name();
// To be called somewhere before the TBB threads are spinned for the first time, to
// give them names recognizible in the debugger.