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

Fixed concurrency issues

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-06-13 19:23:51 +02:00
parent b9de65e174
commit d896ad090b
2 changed files with 54 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/Slic3r.pm
View file

@ -84,6 +84,9 @@ use constant INFILL_OVERLAP_OVER_SPACING => 0.45;
use constant EXTERNAL_INFILL_MARGIN => 3; use constant EXTERNAL_INFILL_MARGIN => 3;
use constant INSET_OVERLAP_TOLERANCE => 0.2; use constant INSET_OVERLAP_TOLERANCE => 0.2;
# keep track of threads we created
my @threads = ();
sub parallelize { sub parallelize {
my %params = @_; my %params = @_;
@ -93,7 +96,13 @@ sub parallelize {
$q->enqueue(@items, (map undef, 1..$params{threads})); $q->enqueue(@items, (map undef, 1..$params{threads}));
my $thread_cb = sub { my $thread_cb = sub {
# ignore threads created by our parent
@threads = ();
# execute thread callback
$params{thread_cb}->($q); $params{thread_cb}->($q);
# cleanup before terminating thread
Slic3r::thread_cleanup(); Slic3r::thread_cleanup();
# This explicit exit avoids an untrappable # This explicit exit avoids an untrappable
@ -111,7 +120,10 @@ sub parallelize {
$params{collect_cb} ||= sub {}; $params{collect_cb} ||= sub {};
@_ = (); @_ = ();
foreach my $th (map threads->create($thread_cb), 1..$params{threads}) { my @my_threads = map threads->create($thread_cb), 1..$params{threads};
push @threads, map $_->tid, @my_threads;
foreach my $th (@my_threads) {
$params{collect_cb}->($th->join); $params{collect_cb}->($th->join);
} }
} else { } else {
@ -131,6 +143,8 @@ sub parallelize {
# object in a thread, make sure the main thread still holds a # object in a thread, make sure the main thread still holds a
# reference so that it won't be destroyed in thread. # reference so that it won't be destroyed in thread.
sub thread_cleanup { sub thread_cleanup {
return if !$Slic3r::have_threads;
# prevent destruction of shared objects # prevent destruction of shared objects
no warnings 'redefine'; no warnings 'redefine';
*Slic3r::Config::DESTROY = sub {}; *Slic3r::Config::DESTROY = sub {};
@ -162,6 +176,10 @@ sub thread_cleanup {
*Slic3r::Surface::DESTROY = sub {}; *Slic3r::Surface::DESTROY = sub {};
*Slic3r::Surface::Collection::DESTROY = sub {}; *Slic3r::Surface::Collection::DESTROY = sub {};
*Slic3r::TriangleMesh::DESTROY = sub {}; *Slic3r::TriangleMesh::DESTROY = sub {};
# detach any running thread created in the current one
$_->detach for grep defined($_), map threads->object($_), @threads;
return undef; # this prevents a "Scalars leaked" warning return undef; # this prevents a "Scalars leaked" warning
} }

54
lib/Slic3r/GUI/Plater.pm
View file

@ -28,7 +28,7 @@ use constant TB_SCALE => &Wx::NewId;
use constant TB_SPLIT => &Wx::NewId; use constant TB_SPLIT => &Wx::NewId;
use constant TB_VIEW => &Wx::NewId; use constant TB_VIEW => &Wx::NewId;
use constant TB_SETTINGS => &Wx::NewId; use constant TB_SETTINGS => &Wx::NewId;
use constant PROCESS_TIMER_EVENT => &Wx::NewId; use constant apply_config_timer_EVENT => &Wx::NewId;
# package variables to avoid passing lexicals to threads # package variables to avoid passing lexicals to threads
our $THUMBNAIL_DONE_EVENT : shared = Wx::NewEventType; our $THUMBNAIL_DONE_EVENT : shared = Wx::NewEventType;
@ -53,7 +53,7 @@ sub new {
$self->{model} = Slic3r::Model->new; $self->{model} = Slic3r::Model->new;
$self->{print} = Slic3r::Print->new; $self->{print} = Slic3r::Print->new;
$self->{objects} = []; $self->{objects} = [];
$self->{process_timer} = Wx::Timer->new($self, PROCESS_TIMER_EVENT) $self->{apply_config_timer} = Wx::Timer->new($self, apply_config_timer_EVENT)
if $Slic3r::have_threads; if $Slic3r::have_threads;
$self->{print}->set_status_cb(sub { $self->{print}->set_status_cb(sub {
@ -168,7 +168,10 @@ sub new {
} }
$self->selection_changed(0); $self->selection_changed(0);
$self->object_list_changed; $self->object_list_changed;
EVT_BUTTON($self, $self->{btn_export_gcode}, \&export_gcode); EVT_BUTTON($self, $self->{btn_export_gcode}, sub {
$self->export_gcode;
Slic3r::thread_cleanup();
});
EVT_BUTTON($self, $self->{btn_export_stl}, \&export_stl); EVT_BUTTON($self, $self->{btn_export_stl}, \&export_stl);
if ($self->{htoolbar}) { if ($self->{htoolbar}) {
@ -231,11 +234,12 @@ sub new {
EVT_COMMAND($self, -1, $PROCESS_COMPLETED_EVENT, sub { EVT_COMMAND($self, -1, $PROCESS_COMPLETED_EVENT, sub {
my ($self, $event) = @_; my ($self, $event) = @_;
$self->on_process_completed($event->GetData); $self->on_process_completed($event->GetData);
Slic3r::thread_cleanup();
}); });
EVT_TIMER($self, PROCESS_TIMER_EVENT, sub { EVT_TIMER($self, apply_config_timer_EVENT, sub {
my ($self, $event) = @_; my ($self, $event) = @_;
$self->start_background_process; $self->async_apply_config;
}); });
$self->{canvas}->update_bed_size; $self->{canvas}->update_bed_size;
@ -460,7 +464,7 @@ sub objects_loaded {
$self->{list}->Select($obj_idxs->[-1], 1); $self->{list}->Select($obj_idxs->[-1], 1);
$self->object_list_changed; $self->object_list_changed;
$self->schedule_background_process; $self->start_background_process;
} }
sub remove { sub remove {
@ -686,16 +690,25 @@ sub split_object {
$self->load_model_objects(@model_objects); $self->load_model_objects(@model_objects);
} }
sub schedule_background_process { sub async_apply_config {
my ($self) = @_; my ($self) = @_;
# TODO: pause process thread before applying new config
# apply new config
my $invalidated = $self->{print}->apply_config($self->skeinpanel->config);
return if !$Slic3r::GUI::Settings->{_}{background_processing}; return if !$Slic3r::GUI::Settings->{_}{background_processing};
if ($invalidated) {
# kill current thread if any # kill current thread if any
$self->stop_background_process; $self->stop_background_process;
# (re)start timer # schedule a new process thread
$self->{process_timer}->Start(PROCESS_DELAY, 1); # 1 = one shot $self->start_background_process;
} else {
# TODO: restore process thread
}
} }
sub start_background_process { sub start_background_process {
@ -753,7 +766,7 @@ sub start_background_process {
sub stop_background_process { sub stop_background_process {
my ($self) = @_; my ($self) = @_;
$self->{process_timer}->Stop; $self->{apply_config_timer}->Stop;
$self->statusbar->SetCancelCallback(undef); $self->statusbar->SetCancelCallback(undef);
$self->statusbar->StopBusy; $self->statusbar->StopBusy;
$self->statusbar->SetStatusText(""); $self->statusbar->SetStatusText("");
@ -840,9 +853,6 @@ sub export_gcode {
my $result = !Slic3r::GUI::catch_error($self); my $result = !Slic3r::GUI::catch_error($self);
$self->on_export_completed($result); $self->on_export_completed($result);
} }
# this method gets executed in a separate thread by wxWidgets since it's a button handler
Slic3r::thread_cleanup() if $Slic3r::have_threads;
} }
# This gets called only if we have threads. # This gets called only if we have threads.
@ -862,6 +872,10 @@ sub on_process_completed {
# if we have an export filename, start a new thread for exporting G-code # if we have an export filename, start a new thread for exporting G-code
if ($self->{export_gcode_output_file}) { if ($self->{export_gcode_output_file}) {
@_ = (); @_ = ();
# workaround for "Attempt to free un referenced scalar..."
our $_thread_self = $self;
$self->{export_thread} = threads->create(sub { $self->{export_thread} = threads->create(sub {
local $SIG{'KILL'} = sub { local $SIG{'KILL'} = sub {
Slic3r::debugf "Export process cancelled; exiting thread...\n"; Slic3r::debugf "Export process cancelled; exiting thread...\n";
@ -870,13 +884,13 @@ sub on_process_completed {
}; };
eval { eval {
$self->{print}->export_gcode(output_file => $self->{export_gcode_output_file}); $_thread_self->{print}->export_gcode(output_file => $_thread_self->{export_gcode_output_file});
}; };
if ($@) { if ($@) {
Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $ERROR_EVENT, shared_clone([ $@ ]))); Wx::PostEvent($_thread_self, Wx::PlThreadEvent->new(-1, $ERROR_EVENT, shared_clone([ $@ ])));
Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $EXPORT_COMPLETED_EVENT, 0)); Wx::PostEvent($_thread_self, Wx::PlThreadEvent->new(-1, $EXPORT_COMPLETED_EVENT, 0));
} else { } else {
Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $EXPORT_COMPLETED_EVENT, 1)); Wx::PostEvent($_thread_self, Wx::PlThreadEvent->new(-1, $EXPORT_COMPLETED_EVENT, 1));
} }
Slic3r::thread_cleanup(); Slic3r::thread_cleanup();
}); });
@ -1044,11 +1058,9 @@ sub on_config_change {
} }
return if !$self->skeinpanel->is_loaded; return if !$self->skeinpanel->is_loaded;
# TODO: pause export thread
# schedule a new process thread if new config invalidates any step # (re)start timer
$self->schedule_background_process $self->{apply_config_timer}->Start(PROCESS_DELAY, 1); # 1 = one shot
if $self->{print}->apply_config($self->skeinpanel->config);
} }
sub list_item_deselected { sub list_item_deselected {