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

Merge pull request #2115 from afabri/Mesh_3-TBB_hash_pair-GF 

Mesh_3: Address TBB performance warning on hashing
This commit is contained in:
Laurent Rineau 2017-05-19 10:26:49 +02:00
parent 819a46e30a d1da889895
commit 631bc832f8
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
View File

@ -41,6 +41,8 @@
#include <CGAL/Mesh_3/io_signature.h>
#include <CGAL/Union_find.h>
#include <boost/functional/hash.hpp>
#ifdef CGAL_LINKED_WITH_TBB
#include <tbb/atomic.h>
#include <tbb/concurrent_hash_map.h>
@ -51,11 +53,36 @@ namespace CGAL {
{
return CGAL::internal::hash_value(it);
}
template < class DSC, bool Const >
std::size_t tbb_hasher(const CGAL::CCC_internal::CCC_iterator<DSC, Const>& it)
{
return CGAL::CCC_internal::hash_value(it);
}
// As Marc Glisse pointed out the TBB hash of a std::pair is
// simplistic and leads to the
// TBB Warning: Performance is not optimal because the hash function
// produces bad randomness in lower bits in class
// tbb::interface5::concurrent_hash_map
template < class DSC, bool Const >
std::size_t tbb_hasher(const std::pair<CGAL::internal::CC_iterator<DSC, Const>,
CGAL::internal::CC_iterator<DSC, Const> >& p)
{
return boost::hash<std::pair<CGAL::internal::CC_iterator<DSC, Const>,
CGAL::internal::CC_iterator<DSC, Const> > >()(p);
}
template < class DSC, bool Const >
std::size_t tbb_hasher(const std::pair<CGAL::CCC_internal::CCC_iterator<DSC, Const>,
CGAL::CCC_internal::CCC_iterator<DSC, Const> >& p)
{
return boost::hash<std::pair<CGAL::CCC_internal::CCC_iterator<DSC, Const>,
CGAL::CCC_internal::CCC_iterator<DSC, Const> > >()(p);
}
}
#endif