Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove TBB usage from hot code paths

Browse Source
This commit is contained in:
Daniel J. Hofmann 2015-09-28 18:28:32 +02:00
parent 6e6b38e8e9
commit 7ed63d2ab5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contractor/contractor.hpp
View File

@ -868,7 +868,7 @@ class Contractor
} }
} }
// eliminate duplicate entries ( forward + backward edges ) // eliminate duplicate entries ( forward + backward edges )
tbb::parallel_sort(neighbours.begin(), neighbours.end()); std::sort(neighbours.begin(), neighbours.end());
neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin()); neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin());
for (const auto i : osrm::irange<std::size_t>(0, neighbours.size())) for (const auto i : osrm::irange<std::size_t>(0, neighbours.size()))
@ -897,7 +897,7 @@ class Contractor
node_data[u].depth = (std::max)(node_data[node].depth + 1, node_data[u].depth); node_data[u].depth = (std::max)(node_data[node].depth + 1, node_data[u].depth);
} }
// eliminate duplicate entries ( forward + backward edges ) // eliminate duplicate entries ( forward + backward edges )
tbb::parallel_sort(neighbours.begin(), neighbours.end()); std::sort(neighbours.begin(), neighbours.end());
neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin()); neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin());
// re-evaluate priorities of neighboring nodes // re-evaluate priorities of neighboring nodes
@ -940,7 +940,7 @@ class Contractor
neighbours.push_back(target); neighbours.push_back(target);
} }
tbb::parallel_sort(neighbours.begin(), neighbours.end()); std::sort(neighbours.begin(), neighbours.end());
neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin()); neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin());
// examine all neighbours that are at most 2 hops away // examine all neighbours that are at most 2 hops away