3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

The Shiny profiler is not thread safe. Disable parallelization if

Browse source 
SLIC3R_PROFILE is enabled.
This commit is contained in:
bubnikv 2017-03-02 16:31:29 +01:00
parent bc19e97d45
commit dff5bda202
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xs/src/libslic3r/libslic3r.h
View file

@ -121,12 +121,20 @@ template <class T> void
parallelize(std::queue<T> queue, boost::function<void(T)> func, parallelize(std::queue<T> queue, boost::function<void(T)> func,
int threads_count = boost::thread::hardware_concurrency()) int threads_count = boost::thread::hardware_concurrency())
{ {
if (threads_count == 0) threads_count = 2; #ifdef SLIC3R_PROFILE
while (! queue.empty()) {
func(queue.front());
queue.pop();
}
#else
if (threads_count == 0)
threads_count = 2;
boost::mutex queue_mutex; boost::mutex queue_mutex;
boost::thread_group workers; boost::thread_group workers;
for (int i = 0; i < std::min(threads_count, int(queue.size())); ++ i) for (int i = 0; i < std::min(threads_count, int(queue.size())); ++ i)
workers.add_thread(new boost::thread(&_parallelize_do<T>, &queue, &queue_mutex, func)); workers.add_thread(new boost::thread(&_parallelize_do<T>, &queue, &queue_mutex, func));
workers.join_all(); workers.join_all();
#endif
} }
template <class T> void template <class T> void