Github-Mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-03 17:05:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Follow up, unify boost::thread usage.

Browse Source
This commit is contained in:
tamasmeszaros
2019-11-07 12:57:40 +01:00
parent 67f55d3b23
commit ad0a38e419
5 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/BackgroundSlicingProcess.cpp
View File

@@ -261,11 +261,7 @@ bool BackgroundSlicingProcess::start()
if (m_state == STATE_INITIAL) {
// The worker thread is not running yet. Start it.
assert(! m_thread.joinable());
boost::thread::attributes attrs;
// Duplicating the stack allocation size of Thread Building Block worker threads of the thread pool:
// allocate 4MB on a 64bit system, allocate 2MB on a 32bit system by default.
attrs.set_stack_size((sizeof(void*) == 4) ? (2048 * 1024) : (4096 * 1024));
m_thread = boost::thread(attrs, [this]{this->thread_proc_safe();});
m_thread = create_thread([this]{this->thread_proc_safe();});
// Wait until the worker thread is ready to execute the background processing task.
m_condition.wait(lck, [this](){ return m_state == STATE_IDLE; });
}

2
src/slic3r/GUI/BackgroundSlicingProcess.hpp
View File

@@ -6,12 +6,12 @@
#include <mutex>
#include <boost/filesystem.hpp>
#include <boost/thread.hpp>
#include <wx/event.h>
#include "libslic3r/Print.hpp"
#include "slic3r/Utils/PrintHost.hpp"
#include "slic3r/Utils/Thread.hpp"
namespace Slic3r {

6
src/slic3r/GUI/Plater.cpp
View File

@@ -12,7 +12,6 @@
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/log/trivial.hpp>
#include <boost/thread.hpp>
#include <wx/sizer.h>
#include <wx/stattext.h>
@@ -76,6 +75,7 @@
#include "../Utils/PrintHost.hpp"
#include "../Utils/FixModelByWin10.hpp"
#include "../Utils/UndoRedo.hpp"
#include "../Utils/Thread.hpp"
#include <wx/glcanvas.h> // Needs to be last because reasons :-/
#include "WipeTowerDialog.hpp"
@@ -1537,9 +1537,7 @@ struct Plater::priv
wxBeginBusyCursor();
try { // Execute the job
boost::thread::attributes attrs;
attrs.set_stack_size((sizeof(void*) == 4) ? (2048 * 1024) : (4096 * 1024));
m_thread = boost::thread(attrs, [this] { this->run(); });
m_thread = create_thread([this] { this->run(); });
} catch (std::exception &) {
update_status(status_range(),
_(L("ERROR: not enough resources to "