ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust mutex scope in walkMapParallel:

Browse Source 
This commit corrects a technical flaw that was introduced with commit
7c12f01358: as written, a mutex that is
intended to help provide synchronization for multiple threads as they
are each walking the map, is declared so that each thread is passed a
dangling reference to a unique mutex.

This commit hoists the mutex outside the thread creation loop, so all
threads use a single mutex and eliminating the dangling reference.
This commit is contained in:
seelabs
2022-01-11 13:56:07 -05:00
committed by Nik Bougalis
parent 44514930f9
commit febbe14e6d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ripple/shamap/impl/SHAMapDelta.cpp
View File

@@ -314,6 +314,10 @@ SHAMap::walkMapParallel(
std::array<std::stack<StackEntry, std::vector<StackEntry>>, 16> nodeStacks; std::array<std::stack<StackEntry, std::vector<StackEntry>>, 16> nodeStacks;
// This mutex is used inside the worker threads to protect `missingNodes`
// and `maxMissing` from race conditions
std::mutex m;
for (int rootChildIndex = 0; rootChildIndex < 16; ++rootChildIndex) for (int rootChildIndex = 0; rootChildIndex < 16; ++rootChildIndex)
{ {
auto const& child = topChildren[rootChildIndex]; auto const& child = topChildren[rootChildIndex];
@@ -324,7 +328,6 @@ SHAMap::walkMapParallel(
std::static_pointer_cast<SHAMapInnerNode>(child)); std::static_pointer_cast<SHAMapInnerNode>(child));
JLOG(journal_.debug()) << "starting worker " << rootChildIndex; JLOG(journal_.debug()) << "starting worker " << rootChildIndex;
std::mutex m;
workers.push_back(std::thread( workers.push_back(std::thread(
[&m, &missingNodes, &maxMissing, this]( [&m, &missingNodes, &maxMissing, this](
std::stack<StackEntry, std::vector<StackEntry>> nodeStack) { std::stack<StackEntry, std::vector<StackEntry>> nodeStack) {