songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Facet_updater parallel 

`vertex_to_proj` was not locked and this was causing seg faults
This commit is contained in:
Jane Tournois 2020-05-18 14:51:42 +02:00
parent 27ba142aa7
commit c6a922c9dc
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -1267,6 +1267,7 @@ private:
class Facet_updater
{
const Self& m_c3t3_helpers;
Vertex_set& vertex_to_proj;
C3T3& c3t3_;
Update_c3t3& c3t3_updater_;
@ -1275,8 +1276,10 @@ private:
typedef Facet& reference;
typedef const Facet& const_reference;
Facet_updater(C3T3& c3t3, Vertex_set& vertex_to_proj, Update_c3t3& c3t3_updater_)
: vertex_to_proj(vertex_to_proj), c3t3_(c3t3), c3t3_updater_(c3t3_updater_)
Facet_updater(const Self& c3t3_helpers,
C3T3& c3t3, Vertex_set& vertex_to_proj, Update_c3t3& c3t3_updater_)
: m_c3t3_helpers(c3t3_helpers),
vertex_to_proj(vertex_to_proj), c3t3_(c3t3), c3t3_updater_(c3t3_updater_)
{}
void
@ -1296,9 +1299,9 @@ private:
const Vertex_handle& v = f.first->vertex((k+i)&3);
if ( c3t3_.in_dimension(v) > 2 )
{
//lock_vertex_to_proj();
m_c3t3_helpers.lock_vertex_to_proj();
vertex_to_proj.insert(v);
//unlock_vertex_to_proj();
m_c3t3_helpers.unlock_vertex_to_proj();
}
}
}
@ -2732,7 +2735,7 @@ rebuild_restricted_delaunay(OutdatedCells& outdated_cells,
// Note: ~42% of rebuild_restricted_delaunay time
// Facet_vector facets;
lock_vertex_to_proj();
Facet_updater facet_updater(c3t3_,vertex_to_proj, updater);
Facet_updater facet_updater(*this, c3t3_,vertex_to_proj, updater);
unlock_vertex_to_proj();
update_facets(outdated_cells_vector, facet_updater);
@ -2761,7 +2764,7 @@ rebuild_restricted_delaunay(OutdatedCells& outdated_cells,
// Get facets (returns each canonical facet only once)
// Note: ~42% of rebuild_restricted_delaunay time
// Facet_vector facets;
Facet_updater facet_updater(c3t3_,vertex_to_proj, updater);
Facet_updater facet_updater(*this, c3t3_,vertex_to_proj, updater);
update_facets(outdated_cells, facet_updater);
// now we can clear
@ -2949,7 +2952,7 @@ move_point(const Vertex_handle& old_vertex,
Cell_vector incident_cells_;
incident_cells_.reserve(64);
tr_.incident_cells(old_vertex, std::back_inserter(incident_cells_));
tr_.incident_cells_threadsafe(old_vertex, std::back_inserter(incident_cells_));
const Weighted_point& position = tr_.point(old_vertex);
const Weighted_point& new_position = cwp(translate(cp(position), move));
@ -3873,7 +3876,7 @@ get_conflict_zone_topo_change(const Vertex_handle& v,
// Get triangulation_vertex incident cells : removal conflict zone
// TODO: hasn't it already been computed in "perturb_vertex" (when getting the slivers)?
// We don't try to lock the incident cells since they've already been locked
tr_.incident_cells(v, removal_conflict_cells);
tr_.incident_cells_threadsafe(v, removal_conflict_cells);
// Get conflict_point conflict zone
int li=0;