haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be smarter about canceling fills 

Handles cancellation in main fill loop.  Allows loops to finish without
restarting new ones.  Further enhancement might allow breaking threads
cleanly but this gets 90% of the cases

Fixes https://gitlab.com/kicad/code/kicad/issues/12693
This commit is contained in:
Seth Hillbrand 2022-10-28 10:15:59 -07:00
parent 546e16a002
commit 7a874255c5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/zone_filler.cpp
View File

@ -348,6 +348,10 @@ bool ZONE_FILLER::Fill( std::vector<ZONE*>& aZones, bool aCheck, wxWindow* aPare
auto tesselate_lambda = auto tesselate_lambda =
[&]( std::pair<ZONE*, PCB_LAYER_ID> aFillItem ) -> int [&]( std::pair<ZONE*, PCB_LAYER_ID> aFillItem ) -> int
{ {
if( m_progressReporter && m_progressReporter->IsCancelled() )
return 0;
PCB_LAYER_ID layer = aFillItem.second; PCB_LAYER_ID layer = aFillItem.second;
ZONE* zone = aFillItem.first; ZONE* zone = aFillItem.first;
@ -365,14 +369,14 @@ bool ZONE_FILLER::Fill( std::vector<ZONE*>& aZones, bool aCheck, wxWindow* aPare
std::vector<std::pair<std::future<int>, int>> returns; std::vector<std::pair<std::future<int>, int>> returns;
returns.reserve( toFill.size() ); returns.reserve( toFill.size() );
size_t finished = 0; size_t finished = 0;
bool cancelled = false;
thread_pool& tp = GetKiCadThreadPool(); thread_pool& tp = GetKiCadThreadPool();
for( const std::pair<ZONE*, PCB_LAYER_ID>& fillItem : toFill ) for( const std::pair<ZONE*, PCB_LAYER_ID>& fillItem : toFill )
returns.emplace_back( std::make_pair( tp.submit( fill_lambda, fillItem ), 0 ) ); returns.emplace_back( std::make_pair( tp.submit( fill_lambda, fillItem ), 0 ) );
while( finished != 2 * toFill.size() ) while( !cancelled && finished != 2 * toFill.size() )
{ {
for( size_t ii = 0; ii < returns.size(); ++ii ) for( size_t ii = 0; ii < returns.size(); ++ii )
{ {
@ -389,12 +393,12 @@ bool ZONE_FILLER::Fill( std::vector<ZONE*>& aZones, bool aCheck, wxWindow* aPare
{ {
++finished; ++finished;
if( ret.second == 0 ) if( !cancelled && ret.second == 0 )
returns[ii].first = tp.submit( tesselate_lambda, toFill[ii] ); returns[ii].first = tp.submit( tesselate_lambda, toFill[ii] );
ret.second++; ret.second++;
} }
else else if( !cancelled )
{ {
returns[ii].first = tp.submit( fill_lambda, toFill[ii] ); returns[ii].first = tp.submit( fill_lambda, toFill[ii] );
} }
@ -406,10 +410,10 @@ bool ZONE_FILLER::Fill( std::vector<ZONE*>& aZones, bool aCheck, wxWindow* aPare
if( m_progressReporter ) if( m_progressReporter )
{ {
if( m_progressReporter->IsCancelled() )
break;
m_progressReporter->KeepRefreshing(); m_progressReporter->KeepRefreshing();
if( m_progressReporter->IsCancelled() )
cancelled = true;
} }
} }