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

PrintHost: Fix bad access on bg thread stop

Browse Source
This commit is contained in:
Vojtech Kral 2018-12-21 14:36:05 +01:00
parent 0fd20d4cdc
commit 017b4f3aa1
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/slic3r/Utils/PrintHost.cpp
View File

@ -72,6 +72,7 @@ struct PrintHostJobQueue::priv
void emit_error(wxString error); void emit_error(wxString error);
void emit_cancel(size_t id); void emit_cancel(size_t id);
void start_bg_thread(); void start_bg_thread();
void stop_bg_thread();
void bg_thread_main(); void bg_thread_main();
void progress_fn(Http::Progress progress, bool &cancel); void progress_fn(Http::Progress progress, bool &cancel);
void remove_source(const fs::path &path); void remove_source(const fs::path &path);
@ -87,11 +88,7 @@ PrintHostJobQueue::PrintHostJobQueue(PrintHostQueueDialog *queue_dialog)
PrintHostJobQueue::~PrintHostJobQueue() PrintHostJobQueue::~PrintHostJobQueue()
{ {
if (p && p->bg_thread.joinable()) { if (p) { p->stop_bg_thread(); }
p->bg_exit = true;
p->channel_jobs.push(PrintHostJob()); // Push an empty job to wake up bg_thread in case it's sleeping
p->bg_thread.detach(); // Let the background thread go, it should exit on its own
}
} }
void PrintHostJobQueue::priv::emit_progress(int progress) void PrintHostJobQueue::priv::emit_progress(int progress)
@ -122,6 +119,15 @@ void PrintHostJobQueue::priv::start_bg_thread()
}); });
} }
void PrintHostJobQueue::priv::stop_bg_thread()
{
if (bg_thread.joinable()) {
bg_exit = true;
channel_jobs.push(PrintHostJob()); // Push an empty job to wake up bg_thread in case it's sleeping
bg_thread.detach(); // Let the background thread go, it should exit on its own
}
}
void PrintHostJobQueue::priv::bg_thread_main() void PrintHostJobQueue::priv::bg_thread_main()
{ {
// bg thread entry point // bg thread entry point
@ -130,6 +136,11 @@ void PrintHostJobQueue::priv::bg_thread_main()
// Pick up jobs from the job channel: // Pick up jobs from the job channel:
while (! bg_exit) { while (! bg_exit) {
auto job = channel_jobs.pop(); // Sleeps in a cond var if there are no jobs auto job = channel_jobs.pop(); // Sleeps in a cond var if there are no jobs
if (job.empty()) {
// This happens when the thread is being stopped
break;
}
source_to_remove = job.upload_data.source_path; source_to_remove = job.upload_data.source_path;
BOOST_LOG_TRIVIAL(debug) << boost::format("PrintHostJobQueue/bg_thread: Received job: [%1%]: `%2%` -> `%3%`, cancelled: %4%") BOOST_LOG_TRIVIAL(debug) << boost::format("PrintHostJobQueue/bg_thread: Received job: [%1%]: `%2%` -> `%3%`, cancelled: %4%")
@ -221,8 +232,6 @@ void PrintHostJobQueue::priv::remove_source()
void PrintHostJobQueue::priv::perform_job(PrintHostJob the_job) void PrintHostJobQueue::priv::perform_job(PrintHostJob the_job)
{ {
if (bg_exit || the_job.empty()) { return; }
emit_progress(0); // Indicate the upload is starting emit_progress(0); // Indicate the upload is starting
bool success = the_job.printhost->upload(std::move(the_job.upload_data), bool success = the_job.printhost->upload(std::move(the_job.upload_data),