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

Rewrite followTrivialPath as iterative 

Remove the recursion that causes stack crash and add an
additional check for if we have already seen either the
current link or the last link before adding them to the line

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16185
This commit is contained in:
Seth Hillbrand 2023-11-28 06:56:00 -08:00
parent 86edba9eb8
commit e1b428609d
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pcbnew/router/pns_topology.cpp
View File

@ -197,22 +197,30 @@ ITEM* TOPOLOGY::NearestUnconnectedItem( const JOINT* aStart, int* aAnchor, int a
} }
bool TOPOLOGY::followTrivialPath( LINE* aLine, bool aLeft, ITEM_SET& aSet, bool TOPOLOGY::followTrivialPath( LINE* aLine2, bool aLeft, ITEM_SET& aSet,
std::set<ITEM*>& aVisited, const JOINT** aTerminalJoint, const JOINT** aTerminalJoint, bool aFollowLockedSegments )
bool aFollowLockedSegments )
{ {
assert( aLine->IsLinked() ); assert( aLine2->IsLinked() );
LINE* curr_line = aLine2;
std::set<ITEM*> visited;
VECTOR2I anchor = aLeft ? aLine->CPoint( 0 ) : aLine->CPoint( -1 ); while( true )
LINKED_ITEM* last = aLeft ? aLine->Links().front() : aLine->Links().back(); {
const JOINT* jt = m_world->FindJoint( anchor, aLine ); VECTOR2I anchor = aLeft ? curr_line->CPoint( 0 ) : curr_line->CPoint( -1 );
LINKED_ITEM* last = aLeft ? curr_line->Links().front() : curr_line->Links().back();
const JOINT* jt = m_world->FindJoint( anchor, curr_line );
assert( jt != nullptr ); assert( jt != nullptr );
aVisited.insert( last ); if( !visited.insert( last ).second
|| ( !jt->IsNonFanoutVia() && !jt->IsTraceWidthChange() ) )
if( jt->IsNonFanoutVia() || jt->IsTraceWidthChange() )
{ {
if( aTerminalJoint )
*aTerminalJoint = jt;
return false;
}
ITEM* via = nullptr; ITEM* via = nullptr;
SEGMENT* next_seg = nullptr; SEGMENT* next_seg = nullptr;
@ -222,7 +230,7 @@ bool TOPOLOGY::followTrivialPath( LINE* aLine, bool aLeft, ITEM_SET& aSet,
{ {
if( link->OfKind( ITEM::VIA_T ) ) if( link->OfKind( ITEM::VIA_T ) )
via = link; via = link;
else if( aVisited.find( link ) == aVisited.end() ) else if( visited.insert( link ).second )
next_seg = static_cast<SEGMENT*>( link ); next_seg = static_cast<SEGMENT*>( link );
} }
@ -235,7 +243,6 @@ bool TOPOLOGY::followTrivialPath( LINE* aLine, bool aLeft, ITEM_SET& aSet,
} }
LINE l = m_world->AssembleLine( next_seg, nullptr, false, aFollowLockedSegments ); LINE l = m_world->AssembleLine( next_seg, nullptr, false, aFollowLockedSegments );
VECTOR2I nextAnchor = ( aLeft ? l.CLine().CPoint( -1 ) : l.CLine().CPoint( 0 ) ); VECTOR2I nextAnchor = ( aLeft ? l.CLine().CPoint( -1 ) : l.CLine().CPoint( 0 ) );
if( nextAnchor != anchor ) if( nextAnchor != anchor )
@ -249,6 +256,7 @@ bool TOPOLOGY::followTrivialPath( LINE* aLine, bool aLeft, ITEM_SET& aSet,
aSet.Prepend( via ); aSet.Prepend( via );
aSet.Prepend( l ); aSet.Prepend( l );
curr_line = static_cast<PNS::LINE*>( aSet[0] );
} }
else else
{ {
@ -256,15 +264,11 @@ bool TOPOLOGY::followTrivialPath( LINE* aLine, bool aLeft, ITEM_SET& aSet,
aSet.Add( via ); aSet.Add( via );
aSet.Add( l ); aSet.Add( l );
curr_line = static_cast<PNS::LINE*>( aSet[aSet.Size() - 1] );
} }
return followTrivialPath( &l, aLeft, aSet, aVisited, aTerminalJoint, aFollowLockedSegments ); continue;
} }
if( aTerminalJoint )
*aTerminalJoint = jt;
return false;
} }
@ -273,7 +277,6 @@ const ITEM_SET TOPOLOGY::AssembleTrivialPath( ITEM* aStart,
bool aFollowLockedSegments ) bool aFollowLockedSegments )
{ {
ITEM_SET path; ITEM_SET path;
std::set<ITEM*> visited;
LINKED_ITEM* seg = nullptr; LINKED_ITEM* seg = nullptr;
if( aStart->Kind() == ITEM::VIA_T ) if( aStart->Kind() == ITEM::VIA_T )
@ -312,8 +315,8 @@ const ITEM_SET TOPOLOGY::AssembleTrivialPath( ITEM* aStart,
const JOINT* jointA = nullptr; const JOINT* jointA = nullptr;
const JOINT* jointB = nullptr; const JOINT* jointB = nullptr;
followTrivialPath( &l, false, path, visited, &jointB, aFollowLockedSegments ); followTrivialPath( &l, false, path, &jointB, aFollowLockedSegments );
followTrivialPath( &l, true, path, visited, &jointA, aFollowLockedSegments ); followTrivialPath( &l, true, path, &jointA, aFollowLockedSegments );
if( aTerminalJoints ) if( aTerminalJoints )
{ {

2
pcbnew/router/pns_topology.h
View File

@ -95,7 +95,7 @@ public:
private: private:
const int DP_PARALLELITY_THRESHOLD = 5; const int DP_PARALLELITY_THRESHOLD = 5;
bool followTrivialPath( LINE* aLine, bool aLeft, ITEM_SET& aSet, std::set<ITEM*>& aVisited, bool followTrivialPath( LINE* aLine, bool aLeft, ITEM_SET& aSet,
const JOINT** aTerminalJoint = nullptr, bool aFollowLockedSegments = false ); const JOINT** aTerminalJoint = nullptr, bool aFollowLockedSegments = false );
NODE *m_world; NODE *m_world;