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

Reporting must be kept inside the REPORT macro. 

Reporting is run on a single clearance where performance doesn't
matter much.  Doing the string building during a DRC, however, kills
performance.
This commit is contained in:
Jeff Young 2020-09-17 16:27:07 +01:00
parent a3d65a2b43
commit 8e530db633
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pcbnew/drc/drc_engine.cpp
View File

@ -435,6 +435,10 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRulesForItems( DRC_CONSTRAINT_TYPE_T aConstraintI
{ {
#define REPORT( s ) { if( aReporter ) { aReporter->Report( s ); } } #define REPORT( s ) { if( aReporter ) { aReporter->Report( s ); } }
#define UNITS aReporter ? aReporter->GetUnits() : EDA_UNITS::MILLIMETRES #define UNITS aReporter ? aReporter->GetUnits() : EDA_UNITS::MILLIMETRES
/*
* NOTE: all string manipulation MUST be kept inside the REPORT macro. It absolutely
* kills performance when running bulk DRC tests (where aReporter is nullptr).
*/
const BOARD_CONNECTED_ITEM* connectedA = dynamic_cast<const BOARD_CONNECTED_ITEM*>( a ); const BOARD_CONNECTED_ITEM* connectedA = dynamic_cast<const BOARD_CONNECTED_ITEM*>( a );
const BOARD_CONNECTED_ITEM* connectedB = dynamic_cast<const BOARD_CONNECTED_ITEM*>( b ); const BOARD_CONNECTED_ITEM* connectedB = dynamic_cast<const BOARD_CONNECTED_ITEM*>( b );
@ -482,33 +486,25 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRulesForItems( DRC_CONSTRAINT_TYPE_T aConstraintI
// Last matching rule wins, so process in reverse order // Last matching rule wins, so process in reverse order
for( int ii = (int) ruleset->size() - 1; ii >= 0; --ii ) for( int ii = (int) ruleset->size() - 1; ii >= 0; --ii )
{ {
wxString msg;
const CONSTRAINT_WITH_CONDITIONS* rcons = ruleset->at( ii ); const CONSTRAINT_WITH_CONDITIONS* rcons = ruleset->at( ii );
implicit = rcons->parentRule && rcons->parentRule->m_Implicit; implicit = rcons->parentRule && rcons->parentRule->m_Implicit;
REPORT( "" ) REPORT( "" )
if( implicit )
{
msg = wxString::Format( _( "Checking %s;" ),
rcons->constraint.GetName() );
}
else
{
msg = wxString::Format( _( "Checking rule %s;"),
rcons->constraint.GetName() );
}
if( aConstraintId == DRC_CONSTRAINT_TYPE_CLEARANCE ) if( aConstraintId == DRC_CONSTRAINT_TYPE_CLEARANCE )
{ {
int clearance = rcons->constraint.m_Value.Min(); int clearance = rcons->constraint.m_Value.Min();
REPORT( wxString::Format( implicit ? _( "Checking %s; clearance: %s." )
msg += " "; : _( "Checking rule %s; clearance: %s."),
msg += wxString::Format( _( "clearance: %s." ), rcons->constraint.GetName(),
MessageTextFromValue( UNITS, clearance, true ) ); MessageTextFromValue( UNITS, clearance, true ) ) )
}
else
{
REPORT( wxString::Format( implicit ? _( "Checking %s." )
: _( "Checking rule %s."),
rcons->constraint.GetName() ) )
} }
REPORT( msg );
if( aLayer != UNDEFINED_LAYER && !rcons->layerTest.test( aLayer ) ) if( aLayer != UNDEFINED_LAYER && !rcons->layerTest.test( aLayer ) )
{ {