Egalware/EgtGeomKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtGeomKernel: - aggiunto mutex per l'accesso a m_vnLeaves

Browse Source 
- creazione in parallelo della mappa finale m_mTree.
This commit is contained in:
Daniele Bariletti
2025-04-01 15:14:43 +02:00
parent 562f750200
commit dfec7c3a4c
1 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tree.cpp
+63 -54
View File
@@ -106,7 +106,7 @@ Tree::AdjustLoop( PolyLine& pl, POLYLINEVECTOR& vPl, BOOLVECTOR& vbOrientation)
return true ;
}
mutex map3D ;
mutex map3DMutex ;
//----------------------------------------------------------------------------
bool
@@ -116,18 +116,18 @@ Tree::GetPoint( double dU, double dV, Point3d& pt) const
bool bOk = true ;
bool bCalculated = false ;
{
lock_guard<mutex> lock( map3D) ;
lock_guard<mutex> lock( map3DMutex) ;
bCalculated = m_mPt3d.find( key) != m_mPt3d.end() ;
}
if ( ! bCalculated) {
bOk = bOk && m_pSrfBz->GetPoint( dU / SBZ_TREG_COEFF, dV / SBZ_TREG_COEFF, ISurfBezier::FROM_MINUS, ISurfBezier::FROM_MINUS, pt) ;
{
lock_guard<mutex> lock( map3D) ;
lock_guard<mutex> lock( map3DMutex) ;
m_mPt3d[key] = pt ;
}
}
{
lock_guard<mutex> lock( map3D) ;
lock_guard<mutex> lock( map3DMutex) ;
pt = m_mPt3d[key] ;
}
return bOk ;
@@ -140,11 +140,11 @@ Tree::SavePoint( double dU, double dV, Point3d& pt)
pair<int64_t, int64_t> key (static_cast<int64_t>(dU * pow(2,15)), static_cast<int64_t>(dV * pow(2,15))) ;
bool bCalculated = true ;
{
lock_guard<mutex> lock( map3D) ;
lock_guard<mutex> lock( map3DMutex) ;
bCalculated = m_mPt3d.find( key) != m_mPt3d.end() ;
}
if ( ! bCalculated){
lock_guard<mutex> lock( map3D) ;
lock_guard<mutex> lock( map3DMutex) ;
m_mPt3d[key] = pt ;
}
return true ;
@@ -741,56 +741,59 @@ Tree::BuildTree( double dLinTol, double dSideMin, double dSideMax)
for ( auto& t : workers)
t.join() ;
// debug
for ( int i = 0 ; i < nStartingLeaves ; ++i)
m_mTree.erase( vFirstCells[i]) ;
for ( int i = 0 ; i < nStartingLeaves ; ++i)
m_mTree.insert( vBranches[i].begin(), vBranches[i].end()) ;
return true ;
// debug
//vector<vector<pair<int, Cell>>> vectorBranches( nStartingLeaves);
//// Step 1: Convert each map to a vector in parallel
//for_each(execution::par, vBranches.begin(), vBranches.end(),
// [&](auto& map) {
// size_t index = &map - &vBranches[0]; // Get the index of the current map
// vectorBranches[index].assign( make_move_iterator(map.begin()),
// make_move_iterator(map.end()));
// });
//// Step 2: Precompute total size and allocate final vector
//size_t totalSize = accumulate(vectorBranches.begin(), vectorBranches.end(), 0,
// [](size_t sum, const vector<pair<int, Cell>>& v) {
// return sum + v.size();
// }) ;
//vector<pair<int, Cell>> mergedVector( totalSize) ;
//// Step 3: Assign thread-specific ranges and move elements in parallel
//vector<size_t> offsets( nStartingLeaves + 1, 0) ;
//for (int i = 0; i < nStartingLeaves; ++i)
// offsets[i + 1] = offsets[i] + vectorBranches[i].size() ;
//for_each( execution::par, vectorBranches.begin(), vectorBranches.end(),
// [&]( auto& vec) {
// size_t index = &vec - &vectorBranches[0];
// move( vec.begin(), vec.end(), mergedVector.begin() + offsets[index]) ;
// });
//// Step 4: Construct final unordered_map in one bulk step
////unordered_map<int, Cell> finalMap( mergedVector.begin(), mergedVector.end()) ;
//Cell cRoot = m_mTree.at( -1) ;
//m_mTree.clear() ;
//unordered_map<int,Cell> mContainer( mergedVector.begin(), mergedVector.end()) ;
//m_mTree = std::move( mContainer) ;
//m_mTree.insert( pair<int, Cell>( cRoot.m_nId, cRoot)) ;
//// debug
//for ( int i = 0 ; i < nStartingLeaves ; ++i)
// m_mTree.erase( vFirstCells[i]) ;
//for ( int i = 0 ; i < nStartingLeaves ; ++i)
// m_mTree.insert( vBranches[i].begin(), vBranches[i].end()) ;
//return true ;
//// debug
vector<vector<pair<int, Cell>>> vectorBranches( nStartingLeaves);
// Step 1: Convert each map to a vector in parallel
for_each(execution::par, vBranches.begin(), vBranches.end(),
[&](auto& map) {
size_t index = &map - &vBranches[0]; // Get the index of the current map
vectorBranches[index].assign( make_move_iterator(map.begin()),
make_move_iterator(map.end()));
}) ;
// Step 2: Precompute total size and allocate final vector
size_t totalSize = accumulate(vectorBranches.begin(), vectorBranches.end(), 0,
[](size_t sum, const vector<pair<int, Cell>>& v) {
return sum + v.size();
}) ;
vector<pair<int, Cell>> mergedVector( totalSize) ;
// Step 3: Assign thread-specific ranges and move elements in parallel
vector<size_t> offsets( nStartingLeaves + 1, 0) ;
for (int i = 0; i < nStartingLeaves; ++i)
offsets[i + 1] = offsets[i] + vectorBranches[i].size() ;
for_each( execution::par, vectorBranches.begin(), vectorBranches.end(),
[&]( auto& vec) {
size_t index = &vec - &vectorBranches[0];
move( vec.begin(), vec.end(), mergedVector.begin() + offsets[index]) ;
});
// Step 4: Construct final unordered_map in one bulk step
unordered_map<int, Cell> BranchesStart( m_mTree.begin(), m_mTree.end()) ;
m_mTree.clear() ;
unordered_map<int,Cell> mContainer( mergedVector.begin(), mergedVector.end()) ;
m_mTree = std::move( mContainer) ;
for ( int i = 0 ; i < nStartingLeaves ; ++i)
BranchesStart.erase( vFirstCells[i]) ;
m_mTree.insert( BranchesStart.begin(), BranchesStart.end()) ;
return true ;
}
mutex leavesMutex ;
//----------------------------------------------------------------------------
bool
Tree::BuildBranch( int nFirstCell, unordered_map<int, Cell>& mBranch, double dLinTol, double dSideMin, double dSideMax)
@@ -1068,7 +1071,10 @@ Tree::BuildBranch( int nFirstCell, unordered_map<int, Cell>& mBranch, double dLi
}
else {
// sono arrivato ad una cella Leaf, quindi salvo la cella
m_vnLeaves.push_back( nCToSplit) ;
{
lock_guard<mutex> lock( leavesMutex) ;
m_vnLeaves.push_back( nCToSplit) ;
}
pcToSplit->SetProcessed() ;
// risalgo i parent finché non trovo il primo Child2 da processare
nCToSplit = pcToSplit->m_nParent ;
@@ -1177,7 +1183,10 @@ Tree::BuildBranch( int nFirstCell, unordered_map<int, Cell>& mBranch, double dLi
}
else {
// sono arrivato ad una cella Leaf, quindi salvo la cella
m_vnLeaves.push_back( nCToSplit) ;
{
lock_guard<mutex> lock( leavesMutex) ;
m_vnLeaves.push_back( nCToSplit) ;
}
pcToSplit->SetProcessed() ;
// risalgo i parent finché non trovo il primo Child2 da processare
nCToSplit = pcToSplit->m_nParent ;