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

"thread_id" => "thread_priority"

This commit is contained in:
Clement Jamin 2017-03-09 17:48:50 +01:00
parent 6ea82bbe2a
commit a160851e56
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
STL_Extension/include/CGAL/Spatial_lock_grid_3.h
View File

@ -520,7 +520,7 @@ public:
Spatial_lock_grid_3(const Bbox_3 &bbox, int num_grid_cells_per_axis) Spatial_lock_grid_3(const Bbox_3 &bbox, int num_grid_cells_per_axis)
: Base(bbox, num_grid_cells_per_axis), : Base(bbox, num_grid_cells_per_axis),
m_tls_thread_ids(init_TLS_thread_ids) m_tls_thread_priorities(init_TLS_thread_priorities)
{ {
int num_cells = int num_cells =
num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis; num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis;
@ -545,13 +545,13 @@ public:
template <bool no_spin> template <bool no_spin>
bool try_lock_cell_impl(int cell_index) bool try_lock_cell_impl(int cell_index)
{ {
unsigned int this_thread_id = m_tls_thread_ids.local(); unsigned int this_thread_priority = m_tls_thread_priorities.local();
// NO SPIN // NO SPIN
if (no_spin) if (no_spin)
{ {
unsigned int old_value = unsigned int old_value =
m_grid[cell_index].compare_and_swap(this_thread_id, 0); m_grid[cell_index].compare_and_swap(this_thread_priority, 0);
if (old_value == 0) if (old_value == 0)
{ {
get_thread_local_grid()[cell_index] = true; get_thread_local_grid()[cell_index] = true;
@ -565,14 +565,14 @@ public:
for(;;) for(;;)
{ {
unsigned int old_value = unsigned int old_value =
m_grid[cell_index].compare_and_swap(this_thread_id, 0); m_grid[cell_index].compare_and_swap(this_thread_priority, 0);
if (old_value == 0) if (old_value == 0)
{ {
get_thread_local_grid()[cell_index] = true; get_thread_local_grid()[cell_index] = true;
m_tls_locked_cells.local().push_back(cell_index); m_tls_locked_cells.local().push_back(cell_index);
return true; return true;
} }
else if (old_value > this_thread_id) else if (old_value > this_thread_priority)
{ {
// Another "more prioritary" thread owns the lock, we back off // Another "more prioritary" thread owns the lock, we back off
return false; return false;
@ -593,7 +593,7 @@ public:
} }
private: private:
static unsigned int init_TLS_thread_ids() static unsigned int init_TLS_thread_priorities()
{ {
static tbb::atomic<unsigned int> last_id; static tbb::atomic<unsigned int> last_id;
unsigned int id = ++last_id; unsigned int id = ++last_id;
@ -606,7 +606,7 @@ protected:
std::vector<tbb::atomic<unsigned int> > m_grid; std::vector<tbb::atomic<unsigned int> > m_grid;
typedef tbb::enumerable_thread_specific<unsigned int> TLS_thread_uint_ids; typedef tbb::enumerable_thread_specific<unsigned int> TLS_thread_uint_ids;
TLS_thread_uint_ids m_tls_thread_ids; TLS_thread_uint_ids m_tls_thread_priorities;
}; };
} //namespace CGAL } //namespace CGAL